From nobody Wed May 4 10:08:15 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 C99681AAAB9B; Wed, 4 May 2022 10:08:16 +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 4KtXb43RMLz4dY0; Wed, 4 May 2022 10:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658896; 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=pSedY0XtWxN7dEWtIn25CzxhjK0emp4NKmywAQQ9LeY=; b=uoBzeCK/AOvsAqvUQle0IyPFHAGEl+acJ4fMQP6VFFySIahBtxliCPBoEHoYCUqe1ttNQV A2Ll8zCZ8Ss36W/bBj4zwbF5FRXhJoqPqTuV44XbfmHOy+z7Y/W2x+csJO6Pa1MvqXx/Vp fiHeLq3I/DvVk7mZ2LJazzKb/ov3GJ8b9BlbwduoRWjBarQYR/o8+H6KoK+Ee2o1IY4qx3 nIV9gfQhSbYy/L2s3zULppFlt+1WGFfDy+4Bf+YiM4HVIhKHssAxkCyS2FuxyaLTrRN5cQ a+tkd5bLTtlqat2p0J4OeMfPDHHPBGxsMUOtuP3iqQrkGzht46vZaQbapIKP7g== 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 84E59108E7; Wed, 4 May 2022 10:08:15 +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 244A8FGu000492; Wed, 4 May 2022 10:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244A8F6u000491; Wed, 4 May 2022 10:08:15 GMT (envelope-from git) Date: Wed, 4 May 2022 10:08:15 GMT Message-Id: <202205041008.244A8F6u000491@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: f4228fbb4eb8 - main - linux(4): Regen for timerfd_settime64 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/main X-Git-Reftype: branch X-Git-Commit: f4228fbb4eb85601e4e857446642372f7d74d6e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658896; 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=pSedY0XtWxN7dEWtIn25CzxhjK0emp4NKmywAQQ9LeY=; b=dcnGgPSXJ9A3UUFApLfg39LWq/LpfEu/OjC3pXYx0KYVZdUE7CNpLO/obEwbAE9Mu16Rf5 3FEj2GcSecR4dXtCnJaB0ESTr3soJksHimuq/MfitDyd4UUvN7RFrpfgoWeRmJkHATx0pv G9nAub3t9k/GOUk36R9YcH9NPmCcgtEkKoR4TYcQeEDiFKJVgoZNbT3Rd4s15YCCNJDx+b BZrNSgRF9T9pndPwiueIRTTo0FVnnUNwaq6v2mzOhbBU2E1pW4FyeDDKghxrgQkIsFEAyc /fRoMGFBjru0OIBXheG5VNMEMluohXfI1WbcA2mm3b9pUnlmEVr283tB3ia0Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651658896; a=rsa-sha256; cv=none; b=lSa6/tC3Nr7IXq9YqLv4DNASJf1hqORgF7truGlVSHfB4kE2f2qokn8FeQIrjHRSohJ0+g Wgo1FnIWLhCmj/+JIoPtAecpO8MnfqThReB6ut5KBFo4fSmtzm38AyrN2pzkfe7I0n6pOh laPkJBM8NCW5oA2OndgoSZZwzpChkvaa5TkGce8h7w0b2LVXIk7+ZysBF4OtIrnTGyWVbl SxF//phHXJoETt8D0ffSRzmb8gmNY38E/3+Kt/KdJ6jCWPfbnfKDjPgDbOlhB4ENLPUqw2 HQ7/EGt1JWRAQSHzGdEBMeIaV04r0ingwFjfHe+1EW8YY8CsL24XjABEPD80xQ== 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=f4228fbb4eb85601e4e857446642372f7d74d6e9 commit f4228fbb4eb85601e4e857446642372f7d74d6e9 Author: Dmitry Chagin AuthorDate: 2022-05-04 10:06:50 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-04 10:06:50 +0000 linux(4): Regen for timerfd_settime64 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 | 26 +++++++++++++++++++++++++- sys/i386/linux/linux_proto.h | 5 ++++- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 26 +++++++++++++++++++++++++- 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index b68ad92f286f..a23b0afe3740 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1561,7 +1561,10 @@ struct linux_timerfd_gettime64_args { syscallarg_t dummy; }; struct linux_timerfd_settime64_args { - syscallarg_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec64 *)]; const struct l_itimerspec64 * new_value; char new_value_r_[PADR_(const struct l_itimerspec64 *)]; + char old_value_l_[PADL_(struct l_itimerspec64 *)]; struct l_itimerspec64 * old_value; char old_value_r_[PADR_(struct l_itimerspec64 *)]; }; struct linux_utimensat_time64_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index 3932a600d8f4..bff497aef77e 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -428,7 +428,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_timer_gettime64_args), .sy_call = (sy_call_t *)linux_timer_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408 = linux_timer_gettime64 */ { .sy_narg = AS(linux_timer_settime64_args), .sy_call = (sy_call_t *)linux_timer_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409 = linux_timer_settime64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 410 = linux_timerfd_gettime64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */ + { .sy_narg = AS(linux_timerfd_settime64_args), .sy_call = (sy_call_t *)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */ { .sy_narg = AS(linux_utimensat_time64_args), .sy_call = (sy_call_t *)linux_utimensat_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 412 = linux_utimensat_time64 */ { .sy_narg = AS(linux_pselect6_time64_args), .sy_call = (sy_call_t *)linux_pselect6_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 413 = linux_pselect6_time64 */ { .sy_narg = AS(linux_ppoll_time64_args), .sy_call = (sy_call_t *)linux_ppoll_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 414 = linux_ppoll_time64 */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 96623cea9068..3879c2dcbd9c 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3030,7 +3030,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_timerfd_settime64 */ case 411: { - *n_args = 0; + struct linux_timerfd_settime64_args *p = params; + iarg[a++] = p->fd; /* l_int */ + iarg[a++] = p->flags; /* l_int */ + uarg[a++] = (intptr_t)p->new_value; /* const struct l_itimerspec64 * */ + uarg[a++] = (intptr_t)p->old_value; /* struct l_itimerspec64 * */ + *n_args = 4; break; } /* linux_utimensat_time64 */ @@ -8174,6 +8179,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_timerfd_settime64 */ case 411: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "userland const struct l_itimerspec64 *"; + break; + case 3: + p = "userland struct l_itimerspec64 *"; + break; + default: + break; + }; break; /* linux_utimensat_time64 */ case 412: @@ -10110,6 +10131,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 410: /* linux_timerfd_settime64 */ case 411: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_utimensat_time64 */ case 412: if (ndx == 0 || ndx == 1) diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 2379c078f708..fd7b9b5730c7 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1554,7 +1554,10 @@ struct linux_timerfd_gettime64_args { syscallarg_t dummy; }; struct linux_timerfd_settime64_args { - syscallarg_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec64 *)]; const struct l_itimerspec64 * new_value; char new_value_r_[PADR_(const struct l_itimerspec64 *)]; + char old_value_l_[PADL_(struct l_itimerspec64 *)]; struct l_itimerspec64 * old_value; char old_value_r_[PADR_(struct l_itimerspec64 *)]; }; struct linux_utimensat_time64_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index e5cdf2187ab6..a6a1f34ef990 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -428,7 +428,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_timer_gettime64_args), .sy_call = (sy_call_t *)linux_timer_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408 = linux_timer_gettime64 */ { .sy_narg = AS(linux_timer_settime64_args), .sy_call = (sy_call_t *)linux_timer_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409 = linux_timer_settime64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 410 = linux_timerfd_gettime64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */ + { .sy_narg = AS(linux_timerfd_settime64_args), .sy_call = (sy_call_t *)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */ { .sy_narg = AS(linux_utimensat_time64_args), .sy_call = (sy_call_t *)linux_utimensat_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 412 = linux_utimensat_time64 */ { .sy_narg = AS(linux_pselect6_time64_args), .sy_call = (sy_call_t *)linux_pselect6_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 413 = linux_pselect6_time64 */ { .sy_narg = AS(linux_ppoll_time64_args), .sy_call = (sy_call_t *)linux_ppoll_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 414 = linux_ppoll_time64 */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index fa48caacc11d..75657bd992cd 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3069,7 +3069,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_timerfd_settime64 */ case 411: { - *n_args = 0; + struct linux_timerfd_settime64_args *p = params; + iarg[a++] = p->fd; /* l_int */ + iarg[a++] = p->flags; /* l_int */ + uarg[a++] = (intptr_t)p->new_value; /* const struct l_itimerspec64 * */ + uarg[a++] = (intptr_t)p->old_value; /* struct l_itimerspec64 * */ + *n_args = 4; break; } /* linux_utimensat_time64 */ @@ -8251,6 +8256,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_timerfd_settime64 */ case 411: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "userland const struct l_itimerspec64 *"; + break; + case 3: + p = "userland struct l_itimerspec64 *"; + break; + default: + break; + }; break; /* linux_utimensat_time64 */ case 412: @@ -10216,6 +10237,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 410: /* linux_timerfd_settime64 */ case 411: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_utimensat_time64 */ case 412: if (ndx == 0 || ndx == 1)