From nobody Wed May 04 10:08:05 2022 X-Original-To: dev-commits-src-main@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 ACDE81AAA22D; Wed, 4 May 2022 10:08:05 +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 4KtXZs3SnZz4dX2; Wed, 4 May 2022 10:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658885; 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=f8uF+QFx8Tpxfb5QXc1HoWJTVGBDjS0YjBAKWKNrLLg=; b=JpZoJ8iecCXnJVMJcRsJkzXFZaN/lWw5+THrlxApU7soM7F6Xza57b8HzbcMbPWjknlql/ rljzpe8x8bPQrqlBGSoPbdsJlcTJKhk13HHUsJL7ZS9DWizLkoSGM+PzseCCGhhyQI+jp9 565sQk3tNJWWinsJdGNqdCzWInPNnlrobONKgMHv/z3QHsh49HBOAuVBjm7Hu9A+Hqz+HL WOxoOvc1jIkqaelwZ8okhTV9OUdwsKg9Z8U5J+NF/pmJQZRkf+tJob6fdg7yLQ+ECFIfXu XTt2sKKvXi1PbjEt+tXeKcjyipF0EgZo7hrpEBVPc71pvr2xWkek50BtYBiPLQ== 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 4B7D810FD5; Wed, 4 May 2022 10:08:05 +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 244A85Go000259; Wed, 4 May 2022 10:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244A85do000258; Wed, 4 May 2022 10:08:05 GMT (envelope-from git) Date: Wed, 4 May 2022 10:08:05 GMT Message-Id: <202205041008.244A85do000258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: cdddbb77c30b - main - linux(4): Regen for sched_rr_get_interval_time64 syscall. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cdddbb77c30b7f518f7ac78b113a823c3ca0cd11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658885; 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=f8uF+QFx8Tpxfb5QXc1HoWJTVGBDjS0YjBAKWKNrLLg=; b=e4KgI4tGWaN70f71+pHHj2xH4NkmSINkrzqeE5/6ZjP+0Ib4HU9N4//FNENDpc/u7Bkz0Y yt/hQcJGFSzMxo1gvlMHh69TL2RJFCyRnZiry1k3MzLGPCYojRwVhgRHnxsrDuNbbpYiSX Sayb9rr/co7O02EreaSfSWkmkeh0ylsj+dCaecy1zr69+wXxswMg5ZCFMFdLIfbfnYq2EP dYVYyTEoD1h1jA4hJ7LtR2lB+QwHrHp1ix6fKBnKN8f4TsRIRIWJnsbW32kW+BF5umRAHp Uuj1u5j4/4d1rTA1+M1/SNpm0ITzAhoHvb2WtCwEYE18fqNRIa8CazEQ0hy3QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651658885; a=rsa-sha256; cv=none; b=BBFr686lMnFhD/tCKFV7BV+Q/smF1sfprhg85VWhNu3otQFtkODS+IqWQm6BRzjPHZm4u7 nZZcpVCVipARDMugiIls2UayGSviT1XkJrPd375n42e6fBrcbN/2L3e1pUOARTMjXTHzq6 Jg8qHswsO1R/ZJJlZwELLqSw/vSZgzR5xl39gZClOW5plE5UqjStOXTOA7e49FlORXqBEx t4hVaYg0nWRaI+B6yN2zUviAgt1+kzSF5bvlOyTZioJhvr1Aizqu9J72VnrDY/7uE5k2Ks L0JvjF6ZcOF0pDdDsNjKZKFQqMHsIgOvPAFGkdfkdUfHKfF4XHGt21O4AT/abQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cdddbb77c30b7f518f7ac78b113a823c3ca0cd11 commit cdddbb77c30b7f518f7ac78b113a823c3ca0cd11 Author: Dmitry Chagin AuthorDate: 2022-05-04 10:06:46 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-04 10:06:46 +0000 linux(4): Regen for sched_rr_get_interval_time64 syscall. MFC after: 2 weeks --- sys/amd64/linux32/linux32_proto.h | 5 +++-- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 18 +++++++++++++++++- sys/i386/linux/linux_proto.h | 5 +++-- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 18 +++++++++++++++++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 58dcfc6eaff8..3254c33baaae 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 { - syscallarg_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)]; @@ -2388,7 +2389,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 9954e369ce98..27449f412cb8 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 a0f4c1699d06..8cc88ba300dd 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3107,7 +3107,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[a++] = p->pid; /* l_pid_t */ + uarg[a++] = (intptr_t)p->interval; /* struct l_timespec64 * */ + *n_args = 2; break; } /* linux_pidfd_send_signal */ @@ -8265,6 +8268,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: @@ -10094,6 +10107,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 c3ab9a6dfc64..43e8578ba0c9 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 { - syscallarg_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)]; @@ -2385,7 +2386,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 6ef4a556d9a2..f2c5543d57ce 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 0f1848600a32..660be1e8a9f4 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3146,7 +3146,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[a++] = p->pid; /* l_pid_t */ + uarg[a++] = (intptr_t)p->interval; /* struct l_timespec64 * */ + *n_args = 2; break; } /* linux_pidfd_send_signal */ @@ -8342,6 +8345,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: @@ -10200,6 +10213,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)