From nobody Fri Jun 17 19:39:33 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 39FD685C1DC; Fri, 17 Jun 2022 19:39:34 +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 4LPq9x4kLPz3RBY; Fri, 17 Jun 2022 19:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494773; 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=dJugxBHY9feT1g6T7dZCHg0fgqnxRTiI34dSl6Co6TY=; b=K9AH2Z+ppw49qlyGSwYCe2+CT4XgYbgMje+7XByuqWAXXlBOFnsJEXMfTpfOuYOjrHFKS6 o07Fy0kmU6E1Ur5glQNW2SquUnVZVJrDkUoink3+iM+KmHyQ6NTPRbA3A8XN4TAm8E1zXG KxPaiPl1QBQS+4eUA8VBtvveQFG5F9d5GiDGQzO2YhcqfSOXci+/4o+Npn+i27S+ZO46XR atq49FShzNLJ01f3K1FKtyZIe8/AvJq17KrUHEkj/rVbnQq5tISIRp4ImgBmBUp1Po4rin 0uC7J8LBZaPQsWQYxTYg8YrQ0kFJVZq9W4jijFQ0V3mGMwKjfNdx/YDDoTVn1g== 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 634DD25C56; Fri, 17 Jun 2022 19:39:33 +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 25HJdXrd016160; Fri, 17 Jun 2022 19:39:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdX4f016159; Fri, 17 Jun 2022 19:39:33 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:33 GMT Message-Id: <202206171939.25HJdX4f016159@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: 5c06b4de43cb - stable/13 - linux(4): Regen for sched_rr_get_interval_time64 syscall. 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: 5c06b4de43cb6b53ab60a1a66ea90900bc2805db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494773; 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=dJugxBHY9feT1g6T7dZCHg0fgqnxRTiI34dSl6Co6TY=; b=oWT2aryszNq6ev+bWf1lurcslhk5IpXmv9SuXu+ouw+iqKafKMoz7fIZqPo1Xay6XDTIUL ITUDS41BhXGXXN4R7WbqlbOfxLkx+ajCICwXlYU+PAz1F7tQ3XvjOQJ7/QymYgHWjACTtT PmfzgZhSC7ZrGCsQsrQ7NxqFSZCNqIXKA5GWk5j/iluP2ZQmYKdUk+kNWwwhiSPYNnizax LJ1LkF8XZ0X4DwttIjkyzQnheMs0RW18FYapk/9ESPF1yltRiTkHKwx1zq29oEaUj7TzXI Bt81tacI972CjSsGVOwZWpj8iUAbxhnerAwWSEFZe/UWeuhFDojv7WDxDAQFLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494773; a=rsa-sha256; cv=none; b=ny9DjxOd7cZbNc2pGTkOw3Q6KwDx3yuzYMtmfYv8sM7RlNy+r3BFB/DRxgegAhYM3NMNVv r3LGl954hYRsbVZpqBD9e0Dn/UdU6p5/w/UQOIaMxxfrnyYF1Mau4nzvXMxZH3fglFxwWj cOI5VKqV1x6C3vs8Gdz3b6POFr2RfvztYTpyAWiBXlQao6JBegxW3etwRse1wkuDZrSyZf YKF51z5RxEEjvuKPbgJce/rw/zm+Qhowvr/7iOTP8ohVf9woPhoacc+1LOZdhppri4Neru Q5YzPJKdAhWg1J7FtHYehxS/sYBUPWHpKDVuSMBtfY2JPWJGLbTOalrDIVGSHg== 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=5c06b4de43cb6b53ab60a1a66ea90900bc2805db commit 5c06b4de43cb6b53ab60a1a66ea90900bc2805db Author: Dmitry Chagin AuthorDate: 2022-06-17 19:34:15 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:15 +0000 linux(4): Regen for sched_rr_get_interval_time64 syscall. MFC after: 2 weeks (cherry picked from commit cdddbb77c30b7f518f7ac78b113a823c3ca0cd11) --- sys/amd64/linux32/linux32_proto.h | 10 +++------- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 30 +++++++++++++++++++++++------- sys/i386/linux/linux_proto.h | 10 +++------- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 30 +++++++++++++++++++++++------- 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 5edcadb59a2e..eef0f3f45315 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1610,7 +1610,8 @@ struct linux_sys_futex_time64_args { char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)]; }; struct linux_sched_rr_get_interval_time64_args { - register_t dummy; + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char interval_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * interval; char interval_r_[PADR_(struct l_timespec64 *)]; }; struct linux_pidfd_send_signal_args { char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)]; @@ -1670,10 +1671,6 @@ struct linux_faccessat2_args { struct linux_process_madvise_args { register_t dummy; }; -<<<<<<< HEAD -struct linux_epoll_pwait2_args { - register_t dummy; -======= struct linux_epoll_pwait2_64_args { char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; char events_l_[PADL_(struct epoll_event *)]; struct epoll_event * events; char events_r_[PADR_(struct epoll_event *)]; @@ -1681,7 +1678,6 @@ struct linux_epoll_pwait2_64_args { char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; ->>>>>>> df377f1fb8dd (linux(4): Regen for epoll_pwait2 syscall.) }; struct linux_mount_setattr_args { register_t dummy; @@ -2442,7 +2438,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX32_SYS_AUE_linux_semtimedop_time64 AUE_NULL #define LINUX32_SYS_AUE_linux_rt_sigtimedwait_time64 AUE_NULL #define LINUX32_SYS_AUE_linux_sys_futex_time64 AUE_NULL -#define LINUX32_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_NULL +#define LINUX32_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_SCHED_RR_GET_INTERVAL #define LINUX32_SYS_AUE_linux_pidfd_send_signal AUE_NULL #define LINUX32_SYS_AUE_linux_io_uring_setup AUE_NULL #define LINUX32_SYS_AUE_linux_io_uring_enter AUE_NULL diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index c601e8fc6c5d..dda017bd2243 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -440,7 +440,7 @@ struct sysent linux32_sysent[] = { { .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_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 = 0, .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_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 */ { .sy_narg = AS(linux_pidfd_send_signal_args), .sy_call = (sy_call_t *)linux_pidfd_send_signal, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 424 = linux_pidfd_send_signal */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 425 = linux_io_uring_setup */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_enter, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 426 = linux_io_uring_enter */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index c32f0e382911..cde87cff5a57 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3106,7 +3106,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_sched_rr_get_interval_time64 */ case 423: { - *n_args = 0; + struct linux_sched_rr_get_interval_time64_args *p = params; + iarg[0] = p->pid; /* l_pid_t */ + uarg[1] = (intptr_t)p->interval; /* struct l_timespec64 * */ + *n_args = 2; break; } /* linux_pidfd_send_signal */ @@ -3210,12 +3213,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_epoll_pwait2_64 */ case 441: { struct linux_epoll_pwait2_64_args *p = params; - iarg[a++] = p->epfd; /* l_int */ - uarg[a++] = (intptr_t)p->events; /* struct epoll_event * */ - iarg[a++] = p->maxevents; /* l_int */ - uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec64 * */ - uarg[a++] = (intptr_t)p->mask; /* l_sigset_t * */ - iarg[a++] = p->sigsetsize; /* l_size_t */ + iarg[0] = p->epfd; /* l_int */ + uarg[1] = (intptr_t)p->events; /* struct epoll_event * */ + iarg[2] = p->maxevents; /* l_int */ + uarg[3] = (intptr_t)p->timeout; /* struct l_timespec64 * */ + uarg[4] = (intptr_t)p->mask; /* l_sigset_t * */ + iarg[5] = p->sigsetsize; /* l_size_t */ *n_args = 6; break; } @@ -8264,6 +8267,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_sched_rr_get_interval_time64 */ case 423: + switch (ndx) { + case 0: + p = "l_pid_t"; + break; + case 1: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_pidfd_send_signal */ case 424: @@ -10093,6 +10106,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_sched_rr_get_interval_time64 */ case 423: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_pidfd_send_signal */ case 424: if (ndx == 0 || ndx == 1) diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index ccc194f84425..f4dcc9bdc635 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1603,7 +1603,8 @@ struct linux_sys_futex_time64_args { char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)]; }; struct linux_sched_rr_get_interval_time64_args { - register_t dummy; + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char interval_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * interval; char interval_r_[PADR_(struct l_timespec64 *)]; }; struct linux_pidfd_send_signal_args { char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)]; @@ -1663,10 +1664,6 @@ struct linux_faccessat2_args { struct linux_process_madvise_args { register_t dummy; }; -<<<<<<< HEAD -struct linux_epoll_pwait2_args { - register_t dummy; -======= struct linux_epoll_pwait2_64_args { char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; char events_l_[PADL_(struct epoll_event *)]; struct epoll_event * events; char events_r_[PADR_(struct epoll_event *)]; @@ -1674,7 +1671,6 @@ struct linux_epoll_pwait2_64_args { char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; ->>>>>>> df377f1fb8dd (linux(4): Regen for epoll_pwait2 syscall.) }; struct linux_mount_setattr_args { register_t dummy; @@ -2439,7 +2435,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_semtimedop_time64 AUE_NULL #define LINUX_SYS_AUE_linux_rt_sigtimedwait_time64 AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex_time64 AUE_NULL -#define LINUX_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_NULL +#define LINUX_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_SCHED_RR_GET_INTERVAL #define LINUX_SYS_AUE_linux_pidfd_send_signal AUE_NULL #define LINUX_SYS_AUE_linux_io_uring_setup AUE_NULL #define LINUX_SYS_AUE_linux_io_uring_enter AUE_NULL diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 10d764ee82dc..337f722bbe1e 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -440,7 +440,7 @@ struct sysent linux_sysent[] = { { .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_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 = 0, .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_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 */ { .sy_narg = AS(linux_pidfd_send_signal_args), .sy_call = (sy_call_t *)linux_pidfd_send_signal, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 424 = linux_pidfd_send_signal */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 425 = linux_io_uring_setup */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_enter, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 426 = linux_io_uring_enter */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 14379e085fce..256e006a443c 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3145,7 +3145,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_sched_rr_get_interval_time64 */ case 423: { - *n_args = 0; + struct linux_sched_rr_get_interval_time64_args *p = params; + iarg[0] = p->pid; /* l_pid_t */ + uarg[1] = (intptr_t)p->interval; /* struct l_timespec64 * */ + *n_args = 2; break; } /* linux_pidfd_send_signal */ @@ -3249,12 +3252,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_epoll_pwait2_64 */ case 441: { struct linux_epoll_pwait2_64_args *p = params; - iarg[a++] = p->epfd; /* l_int */ - uarg[a++] = (intptr_t)p->events; /* struct epoll_event * */ - iarg[a++] = p->maxevents; /* l_int */ - uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec64 * */ - uarg[a++] = (intptr_t)p->mask; /* l_sigset_t * */ - iarg[a++] = p->sigsetsize; /* l_size_t */ + iarg[0] = p->epfd; /* l_int */ + uarg[1] = (intptr_t)p->events; /* struct epoll_event * */ + iarg[2] = p->maxevents; /* l_int */ + uarg[3] = (intptr_t)p->timeout; /* struct l_timespec64 * */ + uarg[4] = (intptr_t)p->mask; /* l_sigset_t * */ + iarg[5] = p->sigsetsize; /* l_size_t */ *n_args = 6; break; } @@ -8341,6 +8344,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_sched_rr_get_interval_time64 */ case 423: + switch (ndx) { + case 0: + p = "l_pid_t"; + break; + case 1: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_pidfd_send_signal */ case 424: @@ -10199,6 +10212,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_sched_rr_get_interval_time64 */ case 423: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_pidfd_send_signal */ case 424: if (ndx == 0 || ndx == 1)