From nobody Fri Jun 17 19:39:58 2022 X-Original-To: dev-commits-src-branches@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 0986185C985; Fri, 17 Jun 2022 19:40:01 +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 4LPqBR62Hpz3h33; Fri, 17 Jun 2022 19:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494800; 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=/DXukHGUJUAdmolGkBn9v78ZJBRFsvCNJlg8AYtG8No=; b=Zij0IK1SB4UUwEDtDwWyC+x4RI6Cu8rbxfuTSCEKMU0xP4NKzX7iMenGDb8y9PJ9CchkXZ OR3yKvcrQcMRbVvJAHyxnbN744BTCFdudx+UMbX1bwqAZiFogRDhFPVHVGJrXOnzM0Uupr VPbICehzi70HdOAb+WKkXySuG0+uhy4XHkjoyzUO3isUWfPhTroyh+dgF7d/9L0F83Jj+k HKaYlsO4168zQo/T3hRq2meUFALzc+3GijsY6z2t/cI1Z5xpeUXfBcLWZuCPLFGuNo240H 3oEpsPF2EYhCsSCZy4ELUEATyHBAysyKjQmKxoad9dPG6RPvUKMk/PEaTUlXUw== 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 62910259CA; Fri, 17 Jun 2022 19:39:58 +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 25HJdwn4016724; Fri, 17 Jun 2022 19:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdw7g016723; Fri, 17 Jun 2022 19:39:58 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:58 GMT Message-Id: <202206171939.25HJdw7g016723@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: 639c685d259d - stable/13 - linux(4): Regen for semtimedop syscalls. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 639c685d259d1a4aad2901455a2bdea07dd01569 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494800; 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=/DXukHGUJUAdmolGkBn9v78ZJBRFsvCNJlg8AYtG8No=; b=RDRbYUKVGziJ94KXGECA4AzR0tCzS0DPscjoYkr9MxY4LOqjai+aTBpmOMQCGmdYb4+6Du E7A8bw5HGfXDbz8Brbv0ddNxUtzVuLUzB/DTqa8rsa+/ySRwmZ+n8E5Cy0aQNKUm6svJno 2PfIYWjgEQeevYWXZhh9zmUkVVPJond8Wjh3nqu8L5BeZeocq1sWp1ckFhA7d7QgGvaqF+ 3+1o1LF8tGXh7Hv1cRn7H8CWW1IskURZbsunLhadYW9aOmfdf0lUlyszVZwc/93i4KZWap sClBGQQLH1sC223NlSUMo7EjqTW2aT65WaBqaEi46t+UhHIXS5QD/7/NkXqwuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494800; a=rsa-sha256; cv=none; b=SR37Q6dAneNyTnhB4wGwlljWlSHwblKce1+6ZBEGcU0ppOnqEW2SPnHGbtLvNcbxYEyExv xe0oWL4a/FQjBxCR9nmHxl29t7TO+9ay+HT2hlRGSw7Ysb9JGOu3Yhyd5Q04ejLYUpEHoB UaUxrmf9CExXyV/U4mFnOOoE0T8DgtSTCa6E982kbMO8jGwLbnd5Wf7Y2w6adlkFE7xtOV zoFALT0232NLqziTaIUiQl+EiSoLSkVx8SMXT9Ra8NKYhzRThcLnaYQGLhke7V0D0ekgaW 7E/vhl/gpXAppr5rLsOCgJcRukdTGp8ahazgMyhafaWDPvVh7+B214QqPhoR8Q== 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=639c685d259d1a4aad2901455a2bdea07dd01569 commit 639c685d259d1a4aad2901455a2bdea07dd01569 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:34:53 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:53 +0000 linux(4): Regen for semtimedop syscalls. MFC after: 2 weeks (cherry picked from commit 430460d7178285a26087d294177627e6c88ad369) --- sys/amd64/linux/linux_proto.h | 5 +++- sys/amd64/linux/linux_sysent.c | 2 +- sys/amd64/linux/linux_systrace_args.c | 39 ++++++++++++++++++++++--------- sys/amd64/linux32/linux32_proto.h | 5 +++- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 26 ++++++++++++++++++++- sys/arm64/linux/linux_proto.h | 5 +++- sys/arm64/linux/linux_sysent.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 39 ++++++++++++++++++++++--------- sys/i386/linux/linux_proto.h | 5 +++- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 26 ++++++++++++++++++++- 12 files changed, 126 insertions(+), 32 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index a84f85a282e6..de8456e16562 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -759,7 +759,10 @@ struct linux_restart_syscall_args { register_t dummy; }; struct linux_semtimedop_args { - register_t dummy; + char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; + char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)]; + char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; }; struct linux_fadvise64_args { char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c index 5e1464bb1144..708ae7e50c72 100644 --- a/sys/amd64/linux/linux_sysent.c +++ b/sys/amd64/linux/linux_sysent.c @@ -237,7 +237,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_getdents64_args), .sy_call = (sy_call_t *)linux_getdents64, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 217 = linux_getdents64 */ { .sy_narg = AS(linux_set_tid_address_args), .sy_call = (sy_call_t *)linux_set_tid_address, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 218 = linux_set_tid_address */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_restart_syscall, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 219 = linux_restart_syscall */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 220 = linux_semtimedop */ + { .sy_narg = AS(linux_semtimedop_args), .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 220 = linux_semtimedop */ { .sy_narg = AS(linux_fadvise64_args), .sy_call = (sy_call_t *)linux_fadvise64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 221 = linux_fadvise64 */ { .sy_narg = AS(linux_timer_create_args), .sy_call = (sy_call_t *)linux_timer_create, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 222 = linux_timer_create */ { .sy_narg = AS(linux_timer_settime_args), .sy_call = (sy_call_t *)linux_timer_settime, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 223 = linux_timer_settime */ diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index 45aedf237ddb..44d2b92b066c 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -578,17 +578,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* 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.) + iarg[0] = p->semid; /* l_int */ + uarg[1] = (intptr_t)p->sops; /* struct sembuf * */ + iarg[2] = p->nsops; /* l_size_t */ *n_args = 3; break; } @@ -1662,7 +1655,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_semtimedop */ case 220: { - *n_args = 0; + struct linux_semtimedop_args *p = params; + iarg[0] = p->semid; /* l_int */ + uarg[1] = (intptr_t)p->tsops; /* struct sembuf * */ + iarg[2] = p->nsops; /* l_size_t */ + uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ + *n_args = 4; break; } /* linux_fadvise64 */ @@ -5379,6 +5377,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_semtimedop */ case 220: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct sembuf *"; + break; + case 2: + p = "l_size_t"; + break; + case 3: + p = "userland struct l_timespec *"; + break; + default: + break; + }; break; /* linux_fadvise64 */ case 221: @@ -8065,6 +8079,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 219: /* linux_semtimedop */ case 220: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_fadvise64 */ case 221: if (ndx == 0 || ndx == 1) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 34cc1f4b8857..6d366ae9137b 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1605,7 +1605,10 @@ struct linux_mq_timedreceive_time64_args { register_t dummy; }; struct linux_semtimedop_time64_args { - register_t dummy; + char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; + char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)]; + char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)]; + char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)]; }; struct linux_rt_sigtimedwait_time64_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index ee4c6296d299..9e24074d30ed 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -437,7 +437,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedreceive_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 419 = linux_mq_timedreceive_time64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 420 = linux_semtimedop_time64 */ + { .sy_narg = AS(linux_semtimedop_time64_args), .sy_call = (sy_call_t *)linux_semtimedop_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 420 = linux_semtimedop_time64 */ { .sy_narg = AS(linux_rt_sigtimedwait_time64_args), .sy_call = (sy_call_t *)linux_rt_sigtimedwait_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 421 = linux_rt_sigtimedwait_time64 */ { .sy_narg = AS(linux_sys_futex_time64_args), .sy_call = (sy_call_t *)linux_sys_futex_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 422 = linux_sys_futex_time64 */ { .sy_narg = AS(linux_sched_rr_get_interval_time64_args), .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_SCHED_RR_GET_INTERVAL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_time64 */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 1c9ebdca2ea4..009716bbc29f 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3101,7 +3101,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_semtimedop_time64 */ case 420: { - *n_args = 0; + struct linux_semtimedop_time64_args *p = params; + iarg[0] = p->semid; /* l_int */ + uarg[1] = (intptr_t)p->tsops; /* struct sembuf * */ + iarg[2] = p->nsops; /* l_size_t */ + uarg[3] = (intptr_t)p->timeout; /* struct l_timespec64 * */ + *n_args = 4; break; } /* linux_rt_sigtimedwait_time64 */ @@ -8313,6 +8318,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_semtimedop_time64 */ case 420: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct sembuf *"; + break; + case 2: + p = "l_size_t"; + break; + case 3: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_rt_sigtimedwait_time64 */ case 421: @@ -10202,6 +10223,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 419: /* linux_semtimedop_time64 */ case 420: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_rt_sigtimedwait_time64 */ case 421: if (ndx == 0 || ndx == 1) diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index c6848d9ba763..1bff7e30c71f 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -731,7 +731,10 @@ struct linux_semctl_args { char arg_l_[PADL_(union l_semun)]; union l_semun arg; char arg_r_[PADR_(union l_semun)]; }; struct linux_semtimedop_args { - register_t dummy; + char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; + char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)]; + char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; }; struct linux_shmget_args { char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)]; diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 944f2d068d23..45cf61a5a6e2 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -209,7 +209,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_msgsnd_args), .sy_call = (sy_call_t *)linux_msgsnd, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 189 = linux_msgsnd */ { .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_semtimedop_args), .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(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 */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 0c487c72171d..3e87921a99a4 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1511,22 +1511,20 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_semtimedop */ case 192: { - *n_args = 0; + struct linux_semtimedop_args *p = params; + iarg[0] = p->semid; /* l_int */ + uarg[1] = (intptr_t)p->tsops; /* struct sembuf * */ + iarg[2] = p->nsops; /* l_size_t */ + uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ + *n_args = 4; break; } /* 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.) + iarg[0] = p->semid; /* l_int */ + uarg[1] = (intptr_t)p->sops; /* struct sembuf * */ + iarg[2] = p->nsops; /* l_size_t */ *n_args = 3; break; } @@ -4841,6 +4839,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_semtimedop */ case 192: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct sembuf *"; + break; + case 2: + p = "l_size_t"; + break; + case 3: + p = "userland struct l_timespec *"; + break; + default: + break; + }; break; /* semop */ case 193: @@ -7044,6 +7058,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_semtimedop */ case 192: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* semop */ case 193: if (ndx == 0 || ndx == 1) diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index a123bfebe3e0..dbca5ec9a28b 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1598,7 +1598,10 @@ struct linux_mq_timedreceive_time64_args { register_t dummy; }; struct linux_semtimedop_time64_args { - register_t dummy; + char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)]; + char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)]; + char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)]; + char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)]; }; struct linux_rt_sigtimedwait_time64_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index f7f0691eb50b..4328cae47f0c 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -437,7 +437,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedreceive_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 419 = linux_mq_timedreceive_time64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 420 = linux_semtimedop_time64 */ + { .sy_narg = AS(linux_semtimedop_time64_args), .sy_call = (sy_call_t *)linux_semtimedop_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 420 = linux_semtimedop_time64 */ { .sy_narg = AS(linux_rt_sigtimedwait_time64_args), .sy_call = (sy_call_t *)linux_rt_sigtimedwait_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 421 = linux_rt_sigtimedwait_time64 */ { .sy_narg = AS(linux_sys_futex_time64_args), .sy_call = (sy_call_t *)linux_sys_futex_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 422 = linux_sys_futex_time64 */ { .sy_narg = AS(linux_sched_rr_get_interval_time64_args), .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_SCHED_RR_GET_INTERVAL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_time64 */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index fb7f7a9f8b3a..ae655f26842d 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3140,7 +3140,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_semtimedop_time64 */ case 420: { - *n_args = 0; + struct linux_semtimedop_time64_args *p = params; + iarg[0] = p->semid; /* l_int */ + uarg[1] = (intptr_t)p->tsops; /* struct sembuf * */ + iarg[2] = p->nsops; /* l_size_t */ + uarg[3] = (intptr_t)p->timeout; /* struct l_timespec64 * */ + *n_args = 4; break; } /* linux_rt_sigtimedwait_time64 */ @@ -8390,6 +8395,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_semtimedop_time64 */ case 420: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct sembuf *"; + break; + case 2: + p = "l_size_t"; + break; + case 3: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_rt_sigtimedwait_time64 */ case 421: @@ -10308,6 +10329,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 419: /* linux_semtimedop_time64 */ case 420: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_rt_sigtimedwait_time64 */ case 421: if (ndx == 0 || ndx == 1)