From owner-svn-src-stable-12@freebsd.org Mon Aug 24 17:29:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53AAC3C8C63; Mon, 24 Aug 2020 17:29:42 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZzdf1xKcz40Bp; Mon, 24 Aug 2020 17:29:42 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 257AB1C380; Mon, 24 Aug 2020 17:29:42 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07OHTgsf012741; Mon, 24 Aug 2020 17:29:42 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07OHTbgA012720; Mon, 24 Aug 2020 17:29:37 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008241729.07OHTbgA012720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 24 Aug 2020 17:29:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364716 - in stable/12/sys: amd64/linux amd64/linux32 arm64/linux i386/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in stable/12/sys: amd64/linux amd64/linux32 arm64/linux i386/linux X-SVN-Commit-Revision: 364716 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 17:29:42 -0000 Author: trasz Date: Mon Aug 24 17:29:37 2020 New Revision: 364716 URL: https://svnweb.freebsd.org/changeset/base/364716 Log: MFC r362441: Regen after r362440. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/amd64/linux/linux_proto.h stable/12/sys/amd64/linux/linux_syscall.h stable/12/sys/amd64/linux/linux_syscalls.c stable/12/sys/amd64/linux/linux_sysent.c stable/12/sys/amd64/linux/linux_systrace_args.c stable/12/sys/amd64/linux32/linux32_proto.h stable/12/sys/amd64/linux32/linux32_syscall.h stable/12/sys/amd64/linux32/linux32_syscalls.c stable/12/sys/amd64/linux32/linux32_sysent.c stable/12/sys/amd64/linux32/linux32_systrace_args.c stable/12/sys/arm64/linux/linux_proto.h stable/12/sys/arm64/linux/linux_syscall.h stable/12/sys/arm64/linux/linux_syscalls.c stable/12/sys/arm64/linux/linux_sysent.c stable/12/sys/arm64/linux/linux_systrace_args.c stable/12/sys/i386/linux/linux_proto.h stable/12/sys/i386/linux/linux_syscall.h stable/12/sys/i386/linux/linux_syscalls.c stable/12/sys/i386/linux/linux_sysent.c stable/12/sys/i386/linux/linux_systrace_args.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/linux/linux_proto.h ============================================================================== --- stable/12/sys/amd64/linux/linux_proto.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux/linux_proto.h Mon Aug 24 17:29:37 2020 (r364716) @@ -136,6 +136,11 @@ struct linux_mincore_args { char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char *)]; }; +struct linux_madvise_args { + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)]; +}; struct linux_shmget_args { char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)]; char size_l_[PADL_(l_size_t)]; l_size_t size; char size_r_[PADR_(l_size_t)]; @@ -1292,6 +1297,7 @@ int linux_select(struct thread *, struct linux_select_ int linux_mremap(struct thread *, struct linux_mremap_args *); int linux_msync(struct thread *, struct linux_msync_args *); int linux_mincore(struct thread *, struct linux_mincore_args *); +int linux_madvise(struct thread *, struct linux_madvise_args *); int linux_shmget(struct thread *, struct linux_shmget_args *); int linux_shmat(struct thread *, struct linux_shmat_args *); int linux_shmctl(struct thread *, struct linux_shmctl_args *); @@ -1615,6 +1621,7 @@ int linux_io_uring_register(struct thread *, struct li #define LINUX_SYS_AUE_linux_mremap AUE_NULL #define LINUX_SYS_AUE_linux_msync AUE_MSYNC #define LINUX_SYS_AUE_linux_mincore AUE_MINCORE +#define LINUX_SYS_AUE_linux_madvise AUE_MADVISE #define LINUX_SYS_AUE_linux_shmget AUE_NULL #define LINUX_SYS_AUE_linux_shmat AUE_NULL #define LINUX_SYS_AUE_linux_shmctl AUE_NULL Modified: stable/12/sys/amd64/linux/linux_syscall.h ============================================================================== --- stable/12/sys/amd64/linux/linux_syscall.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux/linux_syscall.h Mon Aug 24 17:29:37 2020 (r364716) @@ -33,7 +33,7 @@ #define LINUX_SYS_linux_mremap 25 #define LINUX_SYS_linux_msync 26 #define LINUX_SYS_linux_mincore 27 -#define LINUX_SYS_madvise 28 +#define LINUX_SYS_linux_madvise 28 #define LINUX_SYS_linux_shmget 29 #define LINUX_SYS_linux_shmat 30 #define LINUX_SYS_linux_shmctl 31 Modified: stable/12/sys/amd64/linux/linux_syscalls.c ============================================================================== --- stable/12/sys/amd64/linux/linux_syscalls.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux/linux_syscalls.c Mon Aug 24 17:29:37 2020 (r364716) @@ -35,7 +35,7 @@ const char *linux_syscallnames[] = { "linux_mremap", /* 25 = linux_mremap */ "linux_msync", /* 26 = linux_msync */ "linux_mincore", /* 27 = linux_mincore */ - "madvise", /* 28 = madvise */ + "linux_madvise", /* 28 = linux_madvise */ "linux_shmget", /* 29 = linux_shmget */ "linux_shmat", /* 30 = linux_shmat */ "linux_shmctl", /* 31 = linux_shmctl */ Modified: stable/12/sys/amd64/linux/linux_sysent.c ============================================================================== --- stable/12/sys/amd64/linux/linux_sysent.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux/linux_sysent.c Mon Aug 24 17:29:37 2020 (r364716) @@ -45,7 +45,7 @@ struct sysent linux_sysent[] = { { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 25 = linux_mremap */ { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 26 = linux_msync */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 27 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 28 = madvise */ + { AS(linux_madvise_args), (sy_call_t *)linux_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 28 = linux_madvise */ { AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 29 = linux_shmget */ { AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 30 = linux_shmat */ { AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 31 = linux_shmctl */ Modified: stable/12/sys/amd64/linux/linux_systrace_args.c ============================================================================== --- stable/12/sys/amd64/linux/linux_systrace_args.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux/linux_systrace_args.c Mon Aug 24 17:29:37 2020 (r364716) @@ -258,9 +258,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 3; break; } - /* madvise */ + /* linux_madvise */ case 28: { - struct madvise_args *p = params; + struct linux_madvise_args *p = params; uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->behav; /* int */ @@ -2983,7 +2983,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* madvise */ + /* linux_madvise */ case 28: switch(ndx) { case 0: @@ -6649,7 +6649,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * if (ndx == 0 || ndx == 1) p = "int"; break; - /* madvise */ + /* linux_madvise */ case 28: if (ndx == 0 || ndx == 1) p = "int"; Modified: stable/12/sys/amd64/linux32/linux32_proto.h ============================================================================== --- stable/12/sys/amd64/linux32/linux32_proto.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux32/linux32_proto.h Mon Aug 24 17:29:37 2020 (r364716) @@ -684,6 +684,11 @@ struct linux_mincore_args { char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char *)]; }; +struct linux_madvise_args { + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)]; +}; struct linux_getdents64_args { char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; char dirent_l_[PADL_(void *)]; void * dirent; char dirent_r_[PADR_(void *)]; @@ -1682,6 +1687,7 @@ int linux_setfsuid(struct thread *, struct linux_setfs int linux_setfsgid(struct thread *, struct linux_setfsgid_args *); int linux_pivot_root(struct thread *, struct linux_pivot_root_args *); int linux_mincore(struct thread *, struct linux_mincore_args *); +int linux_madvise(struct thread *, struct linux_madvise_args *); int linux_getdents64(struct thread *, struct linux_getdents64_args *); int linux_fcntl64(struct thread *, struct linux_fcntl64_args *); int linux_gettid(struct thread *, struct linux_gettid_args *); @@ -2069,6 +2075,7 @@ int linux_io_uring_register(struct thread *, struct li #define LINUX32_SYS_AUE_linux_setfsgid AUE_SETFSGID #define LINUX32_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT #define LINUX32_SYS_AUE_linux_mincore AUE_MINCORE +#define LINUX32_SYS_AUE_linux_madvise AUE_MADVISE #define LINUX32_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX32_SYS_AUE_linux_fcntl64 AUE_FCNTL #define LINUX32_SYS_AUE_linux_gettid AUE_NULL Modified: stable/12/sys/amd64/linux32/linux32_syscall.h ============================================================================== --- stable/12/sys/amd64/linux32/linux32_syscall.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux32/linux32_syscall.h Mon Aug 24 17:29:37 2020 (r364716) @@ -199,7 +199,7 @@ #define LINUX32_SYS_linux_setfsgid 216 #define LINUX32_SYS_linux_pivot_root 217 #define LINUX32_SYS_linux_mincore 218 -#define LINUX32_SYS_madvise 219 +#define LINUX32_SYS_linux_madvise 219 #define LINUX32_SYS_linux_getdents64 220 #define LINUX32_SYS_linux_fcntl64 221 #define LINUX32_SYS_linux_gettid 224 Modified: stable/12/sys/amd64/linux32/linux32_syscalls.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_syscalls.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux32/linux32_syscalls.c Mon Aug 24 17:29:37 2020 (r364716) @@ -226,7 +226,7 @@ const char *linux32_syscallnames[] = { "linux_setfsgid", /* 216 = linux_setfsgid */ "linux_pivot_root", /* 217 = linux_pivot_root */ "linux_mincore", /* 218 = linux_mincore */ - "madvise", /* 219 = madvise */ + "linux_madvise", /* 219 = linux_madvise */ "linux_getdents64", /* 220 = linux_getdents64 */ "linux_fcntl64", /* 221 = linux_fcntl64 */ "#222", /* 222 = */ Modified: stable/12/sys/amd64/linux32/linux32_sysent.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_sysent.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux32/linux32_sysent.c Mon Aug 24 17:29:37 2020 (r364716) @@ -236,7 +236,7 @@ struct sysent linux32_sysent[] = { { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 216 = linux_setfsgid */ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 217 = linux_pivot_root */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 219 = madvise */ + { AS(linux_madvise_args), (sy_call_t *)linux_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 219 = linux_madvise */ { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 220 = linux_getdents64 */ { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 222 = */ Modified: stable/12/sys/amd64/linux32/linux32_systrace_args.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_systrace_args.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/amd64/linux32/linux32_systrace_args.c Mon Aug 24 17:29:37 2020 (r364716) @@ -1520,9 +1520,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 3; break; } - /* madvise */ + /* linux_madvise */ case 219: { - struct madvise_args *p = params; + struct linux_madvise_args *p = params; uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->behav; /* int */ @@ -5332,7 +5332,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* madvise */ + /* linux_madvise */ case 219: switch(ndx) { case 0: @@ -8432,7 +8432,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * if (ndx == 0 || ndx == 1) p = "int"; break; - /* madvise */ + /* linux_madvise */ case 219: if (ndx == 0 || ndx == 1) p = "int"; Modified: stable/12/sys/arm64/linux/linux_proto.h ============================================================================== --- stable/12/sys/arm64/linux/linux_proto.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/arm64/linux/linux_proto.h Mon Aug 24 17:29:37 2020 (r364716) @@ -854,6 +854,11 @@ struct linux_mincore_args { char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char *)]; }; +struct linux_madvise_args { + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)]; +}; struct linux_remap_file_pages_args { register_t dummy; }; @@ -1240,6 +1245,7 @@ int linux_swapoff(struct thread *, struct linux_swapof int linux_mprotect(struct thread *, struct linux_mprotect_args *); int linux_msync(struct thread *, struct linux_msync_args *); int linux_mincore(struct thread *, struct linux_mincore_args *); +int linux_madvise(struct thread *, struct linux_madvise_args *); int linux_remap_file_pages(struct thread *, struct linux_remap_file_pages_args *); int linux_mbind(struct thread *, struct linux_mbind_args *); int linux_get_mempolicy(struct thread *, struct linux_get_mempolicy_args *); @@ -1507,6 +1513,7 @@ int linux_pkey_free(struct thread *, struct linux_pkey #define LINUX_SYS_AUE_linux_mprotect AUE_MPROTECT #define LINUX_SYS_AUE_linux_msync AUE_MSYNC #define LINUX_SYS_AUE_linux_mincore AUE_MINCORE +#define LINUX_SYS_AUE_linux_madvise AUE_MADVISE #define LINUX_SYS_AUE_linux_remap_file_pages AUE_NULL #define LINUX_SYS_AUE_linux_mbind AUE_NULL #define LINUX_SYS_AUE_linux_get_mempolicy AUE_NULL Modified: stable/12/sys/arm64/linux/linux_syscall.h ============================================================================== --- stable/12/sys/arm64/linux/linux_syscall.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/arm64/linux/linux_syscall.h Mon Aug 24 17:29:37 2020 (r364716) @@ -227,7 +227,7 @@ #define LINUX_SYS_mlockall 230 #define LINUX_SYS_munlockall 231 #define LINUX_SYS_linux_mincore 232 -#define LINUX_SYS_madvise 233 +#define LINUX_SYS_linux_madvise 233 #define LINUX_SYS_linux_remap_file_pages 234 #define LINUX_SYS_linux_mbind 235 #define LINUX_SYS_linux_get_mempolicy 236 Modified: stable/12/sys/arm64/linux/linux_syscalls.c ============================================================================== --- stable/12/sys/arm64/linux/linux_syscalls.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/arm64/linux/linux_syscalls.c Mon Aug 24 17:29:37 2020 (r364716) @@ -240,7 +240,7 @@ const char *linux_syscallnames[] = { "mlockall", /* 230 = mlockall */ "munlockall", /* 231 = munlockall */ "linux_mincore", /* 232 = linux_mincore */ - "madvise", /* 233 = madvise */ + "linux_madvise", /* 233 = linux_madvise */ "linux_remap_file_pages", /* 234 = linux_remap_file_pages */ "linux_mbind", /* 235 = linux_mbind */ "linux_get_mempolicy", /* 236 = linux_get_mempolicy */ Modified: stable/12/sys/arm64/linux/linux_sysent.c ============================================================================== --- stable/12/sys/arm64/linux/linux_sysent.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/arm64/linux/linux_sysent.c Mon Aug 24 17:29:37 2020 (r364716) @@ -250,7 +250,7 @@ struct sysent linux_sysent[] = { { AS(mlockall_args), (sy_call_t *)sys_mlockall, AUE_MLOCKALL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 230 = mlockall */ { 0, (sy_call_t *)sys_munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 231 = munlockall */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 232 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 233 = madvise */ + { AS(linux_madvise_args), (sy_call_t *)linux_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 233 = linux_madvise */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 234 = linux_remap_file_pages */ { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 235 = linux_mbind */ { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 236 = linux_get_mempolicy */ Modified: stable/12/sys/arm64/linux/linux_systrace_args.c ============================================================================== --- stable/12/sys/arm64/linux/linux_systrace_args.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/arm64/linux/linux_systrace_args.c Mon Aug 24 17:29:37 2020 (r364716) @@ -1766,9 +1766,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 3; break; } - /* madvise */ + /* linux_madvise */ case 233: { - struct madvise_args *p = params; + struct linux_madvise_args *p = params; uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->behav; /* int */ @@ -4898,7 +4898,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* madvise */ + /* linux_madvise */ case 233: switch(ndx) { case 0: @@ -6449,7 +6449,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * if (ndx == 0 || ndx == 1) p = "int"; break; - /* madvise */ + /* linux_madvise */ case 233: if (ndx == 0 || ndx == 1) p = "int"; Modified: stable/12/sys/i386/linux/linux_proto.h ============================================================================== --- stable/12/sys/i386/linux/linux_proto.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/i386/linux/linux_proto.h Mon Aug 24 17:29:37 2020 (r364716) @@ -681,6 +681,11 @@ struct linux_mincore_args { char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char *)]; }; +struct linux_madvise_args { + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)]; +}; struct linux_getdents64_args { char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; char dirent_l_[PADL_(void *)]; void * dirent; char dirent_r_[PADR_(void *)]; @@ -1690,6 +1695,7 @@ int linux_setfsuid(struct thread *, struct linux_setfs int linux_setfsgid(struct thread *, struct linux_setfsgid_args *); int linux_pivot_root(struct thread *, struct linux_pivot_root_args *); int linux_mincore(struct thread *, struct linux_mincore_args *); +int linux_madvise(struct thread *, struct linux_madvise_args *); int linux_getdents64(struct thread *, struct linux_getdents64_args *); int linux_fcntl64(struct thread *, struct linux_fcntl64_args *); int linux_gettid(struct thread *, struct linux_gettid_args *); @@ -2079,6 +2085,7 @@ int linux_io_uring_register(struct thread *, struct li #define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID #define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT #define LINUX_SYS_AUE_linux_mincore AUE_MINCORE +#define LINUX_SYS_AUE_linux_madvise AUE_MADVISE #define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL #define LINUX_SYS_AUE_linux_gettid AUE_NULL Modified: stable/12/sys/i386/linux/linux_syscall.h ============================================================================== --- stable/12/sys/i386/linux/linux_syscall.h Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/i386/linux/linux_syscall.h Mon Aug 24 17:29:37 2020 (r364716) @@ -205,7 +205,7 @@ #define LINUX_SYS_linux_setfsgid 216 #define LINUX_SYS_linux_pivot_root 217 #define LINUX_SYS_linux_mincore 218 -#define LINUX_SYS_madvise 219 +#define LINUX_SYS_linux_madvise 219 #define LINUX_SYS_linux_getdents64 220 #define LINUX_SYS_linux_fcntl64 221 #define LINUX_SYS_linux_gettid 224 Modified: stable/12/sys/i386/linux/linux_syscalls.c ============================================================================== --- stable/12/sys/i386/linux/linux_syscalls.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/i386/linux/linux_syscalls.c Mon Aug 24 17:29:37 2020 (r364716) @@ -226,7 +226,7 @@ const char *linux_syscallnames[] = { "linux_setfsgid", /* 216 = linux_setfsgid */ "linux_pivot_root", /* 217 = linux_pivot_root */ "linux_mincore", /* 218 = linux_mincore */ - "madvise", /* 219 = madvise */ + "linux_madvise", /* 219 = linux_madvise */ "linux_getdents64", /* 220 = linux_getdents64 */ "linux_fcntl64", /* 221 = linux_fcntl64 */ "#222", /* 222 = */ Modified: stable/12/sys/i386/linux/linux_sysent.c ============================================================================== --- stable/12/sys/i386/linux/linux_sysent.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/i386/linux/linux_sysent.c Mon Aug 24 17:29:37 2020 (r364716) @@ -236,7 +236,7 @@ struct sysent linux_sysent[] = { { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 216 = linux_setfsgid */ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 217 = linux_pivot_root */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 219 = madvise */ + { AS(linux_madvise_args), (sy_call_t *)linux_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 219 = linux_madvise */ { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 220 = linux_getdents64 */ { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 222 = */ Modified: stable/12/sys/i386/linux/linux_systrace_args.c ============================================================================== --- stable/12/sys/i386/linux/linux_systrace_args.c Mon Aug 24 17:25:26 2020 (r364715) +++ stable/12/sys/i386/linux/linux_systrace_args.c Mon Aug 24 17:29:37 2020 (r364716) @@ -1559,9 +1559,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 3; break; } - /* madvise */ + /* linux_madvise */ case 219: { - struct madvise_args *p = params; + struct linux_madvise_args *p = params; uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->behav; /* int */ @@ -5446,7 +5446,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* madvise */ + /* linux_madvise */ case 219: switch(ndx) { case 0: @@ -8643,7 +8643,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * if (ndx == 0 || ndx == 1) p = "int"; break; - /* madvise */ + /* linux_madvise */ case 219: if (ndx == 0 || ndx == 1) p = "int";