From nobody Fri Jun 17 19:39:43 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 71C0185C628; Fri, 17 Jun 2022 19:39:45 +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 4LPqB83j4Fz3RFN; Fri, 17 Jun 2022 19:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494784; 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=ysDPpDFnt9nVSMmQN0FRQjB71tSFH+QjTAOznJ4XTWE=; b=xLy9hVeXU23H9vJgrDKwL6qsZP/WyxC+Zc1zXUyOQlxa+UDsQ+fXdOh+ltXXkyL7Rj0Hr0 jgdKyTAv+bWpa79Kv3GvpPa9TMETu5x1d1ODtBnQ/5sY4iAcnMxORdjJKRJrWfdJwk81D4 1LCITF+ZzhM4Dfn4f19ntcHqa79Dmu1D/HsDrX50CpnBIwOfovDCTvN4+QiUnBiMc9sOzw vpf6BWg8WRduYnV9uNr4JpCfzYrMKyP+r5Tmt2DvynW5emurePlAk/3PHf/+J8Sv1V1SwP 2S0epQZO0qej6e68y1ww2GswPP5lHz+3g1d4njxxT0+mUwxNzuCEEmi8u5ardw== 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 9F9AB259C9; Fri, 17 Jun 2022 19:39:43 +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 25HJdhnp016389; Fri, 17 Jun 2022 19:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdhXW016388; Fri, 17 Jun 2022 19:39:43 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:43 GMT Message-Id: <202206171939.25HJdhXW016388@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: e24e36605456 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e24e36605456505b9443e3c44b23b5c959954717 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494784; 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=ysDPpDFnt9nVSMmQN0FRQjB71tSFH+QjTAOznJ4XTWE=; b=gGYb6opYqfdxFDgA72vOGR3DhlxZpHJfAug70/MLPzxBsCPVzHnfop5GKEYpyTgtrH/S29 5CsNeNgMR5gHx0AWnjQ1UNYod+0A1lQZfUQVyKbQhGKquku/qhUSTDg9grCofp+m8m2Xiw I0cy7yHzpyqBttudH/3Qx6hF+DqxY8fQKVXD8CiNVw2B9MjMK4MsKyKTreMakJdUOedC8U DT1fZ7YtdPE0c8Fdmd1elVsVwDp/vA/jF4qVGOflltKDT+Nd7C6Z/bVVh4DE7K6VDuJi3H hrry+FmSKOnmPqcb51RKVE0R5ZkzWAyyjILtjHLqSLwwDu9cQ9YcxtoTePsTzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494784; a=rsa-sha256; cv=none; b=PrLWmD2AyYA1+LvOJzoxW5EdnqT0L5ebGQAT1r+EbqmpqxujfEnzxxDkGshxMX4Prfsehh WWPbF6v9wIOCeYfUIxD68jaD2JFWUhWxMltsJFGYBIxxtzBRsImTjH5PheiM0TP+vzEnWR ENVnRYokc++Ae93IByx0rnGnsgj+Cgk3Ke7xJ48M0tdeML7EQuxY/8F7pSyfNhlCgbwXpJ n3mBH8h1or++Zd4zwQiM6+HJHyXqBJprKPteEX9g+hMp6MzWPrYvpx+U2QSnAbrmRnUCWx M3ObN8CSQjJvrGohjlzZLKeSBvsSQJMxEMmmZsLmM0hVBdZkxggi+YI7KUVuNw== 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=e24e36605456505b9443e3c44b23b5c959954717 commit e24e36605456505b9443e3c44b23b5c959954717 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:34:31 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:31 +0000 linux(4): Regen for timerfd_settime64 syscall. MFC after: 2 weeks (cherry picked from commit f4228fbb4eb85601e4e857446642372f7d74d6e9) --- 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 1416b339cc6f..283f53a12751 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1561,7 +1561,10 @@ struct linux_timerfd_gettime64_args { register_t dummy; }; struct linux_timerfd_settime64_args { - register_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 b7ca6a5a29f1..0c1be5f02210 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 05d88c7a13b3..ce5fb272242d 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3029,7 +3029,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[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t)p->new_value; /* const struct l_itimerspec64 * */ + uarg[3] = (intptr_t)p->old_value; /* struct l_itimerspec64 * */ + *n_args = 4; break; } /* linux_utimensat_time64 */ @@ -8173,6 +8178,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: @@ -10109,6 +10130,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 3f60a49ef629..9861074fc446 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1554,7 +1554,10 @@ struct linux_timerfd_gettime64_args { register_t dummy; }; struct linux_timerfd_settime64_args { - register_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 412cd53b5ed9..b5101fa132ee 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 74e705cccc62..8db5e9f59384 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3068,7 +3068,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[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t)p->new_value; /* const struct l_itimerspec64 * */ + uarg[3] = (intptr_t)p->old_value; /* struct l_itimerspec64 * */ + *n_args = 4; break; } /* linux_utimensat_time64 */ @@ -8250,6 +8255,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: @@ -10215,6 +10236,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)