From nobody Fri Jun 17 19:39:54 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CF64285C914; Fri, 17 Jun 2022 19:39:57 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPqBN4xrzz3hFq; Fri, 17 Jun 2022 19:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekefAH4Y0/lB12nFlyu0HIAhMbC6J+YPyTWknzsK5iY=; b=xJBe4M+m+oYl2bKTL++4Rbs/peStUc1QrfaWgbEmylKf2Y1razx7SSpUTV6Xiz7yfE9hqS 6OK9/2/ntA2E6BfGlymvrHBaAf9A1HJQTxwjhWx83OoBO0ZWU3U/MYCo6ykgS1VMtAxBem rf2z36YgMgMA88XdMrrlze/uGFBdtmCH8V7KeL3JCTWDQMvZdB/pIiXX9c7As38QG2Tb43 M7vTvcvm0W5aG5buJoV0rh7eerUy5IBG6kDHke293d6u1y6izDwE5KUBDw2lo6MtUt9bTQ aij7qSoOat+IOyxww2LBEIQEH6b0/oS3+02tRHAD6XZBny6fKCVnDdoGM31G8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00BBC25C5C; Fri, 17 Jun 2022 19:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJds1s016642; Fri, 17 Jun 2022 19:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdsXY016641; Fri, 17 Jun 2022 19:39:54 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:54 GMT Message-Id: <202206171939.25HJdsXY016641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 2f5e4f652a35 - stable/13 - linux(4): Regen for semop syscall. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2f5e4f652a350022260d7f45339f21aced0c94b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekefAH4Y0/lB12nFlyu0HIAhMbC6J+YPyTWknzsK5iY=; b=JI5r0p4o9RW4lZ3FdEGy3Qg/h60Yr9/JWcHOHZXDcX3TyOrO3Q6wwl1Xltr4JKuC6Qz1tk TpbYTclf2PnubvDqUH3urxO4evwDvGbBsm5tcUuge4ORwd+nd2bkcVyLMMhBRj12ysMvqs M9bpmKHolSL3Czy/j929AVHSpx/Be9fr4iiQcTTmf7WFnNSlwTHrLqddYyAvuXD6HpP4f2 DyAGtRcD6qxJIHeKp5tNKoDrovT51HypNnYkFYOx8EOhbzcrgtlagEXOX/Od4H/NtD1tnz mJY7jMfKW9OEbcXHwvMK9B98PeWWFce2kwCEYJubroUtuBkCWfOb6fs4hSulsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494797; a=rsa-sha256; cv=none; b=CKYcBoJksFyjrukWiw0OAIOzfVW0Zo2wcS+yjwECCwx2u9RCL8EXKtLRQxMcKLn5gK9PUZ r3ht8JEToDlwYfcKz04nGAG+wNms++W3m0RErItdfr14lIpLetrroRj81XksOjnzzKAvr4 BUeZ9A6K5HZtfZMn8ckNFHs+xo3Ym2rgRJrzGAQW2aF7NPyYwPFrEC85i+y1j2gNu1GwX+ w6EWy//bJkcMmVDrtqQ09Z5ha6hhZ80gXUW293XIgJe0HY6NhZC5A8yu9uKBVQr/09kZcK t76fePrs1FCtq6euU4bzurK5WJCIpraEfM8grLkMKqc6c5mX2RzeslLuODUG0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2f5e4f652a350022260d7f45339f21aced0c94b9 commit 2f5e4f652a350022260d7f45339f21aced0c94b9 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:34:47 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:47 +0000 linux(4): Regen for semop syscall. MFC after: 2 weeks (cherry picked from commit cd875998dc236eb531753bba7296a834de57d99d) --- sys/amd64/linux/linux_proto.h | 7 ------- sys/amd64/linux/linux_syscall.h | 2 +- sys/amd64/linux/linux_syscalls.c | 2 +- sys/amd64/linux/linux_sysent.c | 2 +- sys/amd64/linux/linux_systrace_args.c | 17 ++++++++++++----- sys/arm64/linux/linux_proto.h | 7 ------- sys/arm64/linux/linux_syscall.h | 2 +- sys/arm64/linux/linux_syscalls.c | 2 +- sys/arm64/linux/linux_sysent.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 17 ++++++++++++----- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 7fdce58d24bd..a84f85a282e6 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -312,11 +312,6 @@ struct linux_semget_args { char nsems_l_[PADL_(l_int)]; l_int nsems; char nsems_r_[PADR_(l_int)]; char semflg_l_[PADL_(l_int)]; l_int semflg; char semflg_r_[PADR_(l_int)]; }; -struct linux_semop_args { - char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; - char tsops_l_[PADL_(struct l_sembuf *)]; struct l_sembuf * tsops; char tsops_r_[PADR_(struct l_sembuf *)]; - char nsops_l_[PADL_(l_uint)]; l_uint nsops; char nsops_r_[PADR_(l_uint)]; -}; struct linux_semctl_args { char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; char semnum_l_[PADL_(l_int)]; l_int semnum; char semnum_r_[PADR_(l_int)]; @@ -1450,7 +1445,6 @@ int linux_wait4(struct thread *, struct linux_wait4_args *); int linux_kill(struct thread *, struct linux_kill_args *); int linux_newuname(struct thread *, struct linux_newuname_args *); int linux_semget(struct thread *, struct linux_semget_args *); -int linux_semop(struct thread *, struct linux_semop_args *); int linux_semctl(struct thread *, struct linux_semctl_args *); int linux_shmdt(struct thread *, struct linux_shmdt_args *); int linux_msgget(struct thread *, struct linux_msgget_args *); @@ -1797,7 +1791,6 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_kill AUE_KILL #define LINUX_SYS_AUE_linux_newuname AUE_NULL #define LINUX_SYS_AUE_linux_semget AUE_NULL -#define LINUX_SYS_AUE_linux_semop AUE_NULL #define LINUX_SYS_AUE_linux_semctl AUE_NULL #define LINUX_SYS_AUE_linux_shmdt AUE_NULL #define LINUX_SYS_AUE_linux_msgget AUE_NULL diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h index ca83b9d33483..9fc5e8ca877f 100644 --- a/sys/amd64/linux/linux_syscall.h +++ b/sys/amd64/linux/linux_syscall.h @@ -70,7 +70,7 @@ #define LINUX_SYS_linux_kill 62 #define LINUX_SYS_linux_newuname 63 #define LINUX_SYS_linux_semget 64 -#define LINUX_SYS_linux_semop 65 +#define LINUX_SYS_semop 65 #define LINUX_SYS_linux_semctl 66 #define LINUX_SYS_linux_shmdt 67 #define LINUX_SYS_linux_msgget 68 diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c index 285e9d47c461..68d3561e5fa7 100644 --- a/sys/amd64/linux/linux_syscalls.c +++ b/sys/amd64/linux/linux_syscalls.c @@ -72,7 +72,7 @@ const char *linux_syscallnames[] = { "linux_kill", /* 62 = linux_kill */ "linux_newuname", /* 63 = linux_newuname */ "linux_semget", /* 64 = linux_semget */ - "linux_semop", /* 65 = linux_semop */ + "semop", /* 65 = semop */ "linux_semctl", /* 66 = linux_semctl */ "linux_shmdt", /* 67 = linux_shmdt */ "linux_msgget", /* 68 = linux_msgget */ diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c index 418e791facdb..5e1464bb1144 100644 --- a/sys/amd64/linux/linux_sysent.c +++ b/sys/amd64/linux/linux_sysent.c @@ -82,7 +82,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_kill_args), .sy_call = (sy_call_t *)linux_kill, .sy_auevent = AUE_KILL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 62 = linux_kill */ { .sy_narg = AS(linux_newuname_args), .sy_call = (sy_call_t *)linux_newuname, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = linux_newuname */ { .sy_narg = AS(linux_semget_args), .sy_call = (sy_call_t *)linux_semget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 64 = linux_semget */ - { .sy_narg = AS(linux_semop_args), .sy_call = (sy_call_t *)linux_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 65 = linux_semop */ + { .sy_narg = AS(semop_args), .sy_call = (sy_call_t *)sys_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 65 = semop */ { .sy_narg = AS(linux_semctl_args), .sy_call = (sy_call_t *)linux_semctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = linux_semctl */ { .sy_narg = AS(linux_shmdt_args), .sy_call = (sy_call_t *)linux_shmdt, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 67 = linux_shmdt */ { .sy_narg = AS(linux_msgget_args), .sy_call = (sy_call_t *)linux_msgget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 68 = linux_msgget */ diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index b0927605b027..45aedf237ddb 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -576,12 +576,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* linux_semop */ + /* semop */ case 65: { +<<<<<<< HEAD struct linux_semop_args *p = params; iarg[0] = p->semid; /* l_int */ uarg[1] = (intptr_t)p->tsops; /* struct l_sembuf * */ iarg[2] = p->nsops; /* l_uint */ +======= + struct semop_args *p = params; + iarg[a++] = p->semid; /* l_int */ + uarg[a++] = (intptr_t)p->sops; /* struct sembuf * */ + iarg[a++] = p->nsops; /* l_size_t */ +>>>>>>> cd875998dc23 (linux(4): Regen for semop syscall.) *n_args = 3; break; } @@ -3718,17 +3725,17 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* linux_semop */ + /* semop */ case 65: switch (ndx) { case 0: p = "l_int"; break; case 1: - p = "userland struct l_sembuf *"; + p = "userland struct sembuf *"; break; case 2: - p = "l_uint"; + p = "l_size_t"; break; default: break; @@ -7435,7 +7442,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* linux_semop */ + /* semop */ case 65: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 6df5364edf81..c6848d9ba763 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -733,11 +733,6 @@ struct linux_semctl_args { struct linux_semtimedop_args { register_t dummy; }; -struct linux_semop_args { - char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; - char tsops_l_[PADL_(struct l_sembuf *)]; struct l_sembuf * tsops; char tsops_r_[PADR_(struct l_sembuf *)]; - char nsops_l_[PADL_(l_uint)]; l_uint nsops; char nsops_r_[PADR_(l_uint)]; -}; 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)]; @@ -1355,7 +1350,6 @@ int linux_msgsnd(struct thread *, struct linux_msgsnd_args *); int linux_semget(struct thread *, struct linux_semget_args *); int linux_semctl(struct thread *, struct linux_semctl_args *); int linux_semtimedop(struct thread *, struct linux_semtimedop_args *); -int linux_semop(struct thread *, struct linux_semop_args *); int linux_shmget(struct thread *, struct linux_shmget_args *); int linux_shmctl(struct thread *, struct linux_shmctl_args *); int linux_shmat(struct thread *, struct linux_shmat_args *); @@ -1653,7 +1647,6 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_semget AUE_NULL #define LINUX_SYS_AUE_linux_semctl AUE_NULL #define LINUX_SYS_AUE_linux_semtimedop AUE_NULL -#define LINUX_SYS_AUE_linux_semop AUE_NULL #define LINUX_SYS_AUE_linux_shmget AUE_NULL #define LINUX_SYS_AUE_linux_shmctl AUE_NULL #define LINUX_SYS_AUE_linux_shmat AUE_NULL diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h index ab4fb534a8cb..b3d01a89d0a1 100644 --- a/sys/arm64/linux/linux_syscall.h +++ b/sys/arm64/linux/linux_syscall.h @@ -188,7 +188,7 @@ #define LINUX_SYS_linux_semget 190 #define LINUX_SYS_linux_semctl 191 #define LINUX_SYS_linux_semtimedop 192 -#define LINUX_SYS_linux_semop 193 +#define LINUX_SYS_semop 193 #define LINUX_SYS_linux_shmget 194 #define LINUX_SYS_linux_shmctl 195 #define LINUX_SYS_linux_shmat 196 diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c index 21bb3ccf88f6..6dbb988814ea 100644 --- a/sys/arm64/linux/linux_syscalls.c +++ b/sys/arm64/linux/linux_syscalls.c @@ -200,7 +200,7 @@ const char *linux_syscallnames[] = { "linux_semget", /* 190 = linux_semget */ "linux_semctl", /* 191 = linux_semctl */ "linux_semtimedop", /* 192 = linux_semtimedop */ - "linux_semop", /* 193 = linux_semop */ + "semop", /* 193 = semop */ "linux_shmget", /* 194 = linux_shmget */ "linux_shmctl", /* 195 = linux_shmctl */ "linux_shmat", /* 196 = linux_shmat */ diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 5efb01778595..944f2d068d23 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -210,7 +210,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_semget_args), .sy_call = (sy_call_t *)linux_semget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 190 = linux_semget */ { .sy_narg = AS(linux_semctl_args), .sy_call = (sy_call_t *)linux_semctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 191 = linux_semctl */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 192 = linux_semtimedop */ - { .sy_narg = AS(linux_semop_args), .sy_call = (sy_call_t *)linux_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 193 = linux_semop */ + { .sy_narg = AS(semop_args), .sy_call = (sy_call_t *)sys_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 193 = semop */ { .sy_narg = AS(linux_shmget_args), .sy_call = (sy_call_t *)linux_shmget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 194 = linux_shmget */ { .sy_narg = AS(linux_shmctl_args), .sy_call = (sy_call_t *)linux_shmctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 195 = linux_shmctl */ { .sy_narg = AS(linux_shmat_args), .sy_call = (sy_call_t *)linux_shmat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 196 = linux_shmat */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 98d4cb860b1c..0c487c72171d 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1514,12 +1514,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 0; break; } - /* linux_semop */ + /* semop */ case 193: { +<<<<<<< HEAD struct linux_semop_args *p = params; iarg[0] = p->semid; /* l_int */ uarg[1] = (intptr_t)p->tsops; /* struct l_sembuf * */ iarg[2] = p->nsops; /* l_uint */ +======= + struct semop_args *p = params; + iarg[a++] = p->semid; /* l_int */ + uarg[a++] = (intptr_t)p->sops; /* struct sembuf * */ + iarg[a++] = p->nsops; /* l_size_t */ +>>>>>>> cd875998dc23 (linux(4): Regen for semop syscall.) *n_args = 3; break; } @@ -4835,17 +4842,17 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* linux_semtimedop */ case 192: break; - /* linux_semop */ + /* semop */ case 193: switch (ndx) { case 0: p = "l_int"; break; case 1: - p = "userland struct l_sembuf *"; + p = "userland struct sembuf *"; break; case 2: - p = "l_uint"; + p = "l_size_t"; break; default: break; @@ -7037,7 +7044,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_semtimedop */ case 192: - /* linux_semop */ + /* semop */ case 193: if (ndx == 0 || ndx == 1) p = "int";