From nobody Fri Jun 17 19:29:00 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 5EFEA846FEB; Fri, 17 Jun 2022 19:29:03 +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 4LPpxp03dyz3Gtt; Fri, 17 Jun 2022 19:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494142; 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=i/lKin/ogCNXTcffFAb5NBFr+3ETw39FY71nOdecdUk=; b=QxvsMZsIDRUoU4+e4FGfqWDfz0XOUeR9oZP2h843KYYd9Jdr+TAMa/YIed8j6hy6dlglqQ RpVSPDktgbwTlS9ugzfFILXz5J3zXMYOpfGtNo/PLqc9PuQX1SN4Kk1DdFLn1Ux91eA3rp S0JBhSyKarE8N+ZbqrR8KOjITU5iyrSUfDO7XKP9+ZNeOhgohURtkpQb3uMClcyDX2AgUf rsbqyFe3Z5Bs5vjgl0o5Ya7Ad/Webo5grXDoHCK9aaOi6N9MySwTZgG56gNumuFkSy8gDv ekAa+GfEzghHZcqve2judPAEAOOfxnV5Hpyv+TX7/tVyFhr/bQ4UMe0a/GPeIQ== 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 0F3182535B; Fri, 17 Jun 2022 19:29:01 +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 25HJT0Wb096842; Fri, 17 Jun 2022 19:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJT0qr096841; Fri, 17 Jun 2022 19:29:00 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:29:00 GMT Message-Id: <202206171929.25HJT0qr096841@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: fd6647f64a3d - stable/13 - Regen for ('187715a420237e1ed94dd5aef158eada7dcdc559') Linux clock_getres_time64 system call. 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: fd6647f64a3d48d7b10bbbf222bad7a231c84742 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494142; 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=i/lKin/ogCNXTcffFAb5NBFr+3ETw39FY71nOdecdUk=; b=ZX3GRT/Pj7JiH2WqISIYca9SIFvHx4kSTFeKmNXrS00fCMI75zpN7XQcCJsg59bh1xzdkm w9nCpDVBvRN31BkQb6yDGOAq4JD9P3DdmmOxxE5CwM4j/YK1RB8vyFqa/+q811kYDhOoHt qC2xNkMmVgh9dswlp2jAaewcN8rapDl7zzvy95PQtrw02ghCef0Bd5NCFqdP9s3GPpvRAo CczqDrbD9ajsDd359LM6cb3KnjwHNL3vxcwHoN9+iJbqy3wItM3GzT7iDvaIJVZ1lEzHFy wIG7VGsqK8ksZIu0IbhTR3oUyaXuWKnuXxjxaX8J9xrk+8p8xkXTT/lsCxAEtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494142; a=rsa-sha256; cv=none; b=bRiNq/bpMtPcMTkZ8dB4/eAIfQZ5O+BUoGVrIbeOJEmWFlG1JXANRbzd4A/NCLrmqdijUm YLRaZHMtvtYBLlPRYZMVL94cs3O18zlo1ncvj/+4X0wWvvvxTJXn4QmaF5mo/iZECRdtos ZgHfLhyrlTatwv17DSHQxQuHy2B5s6t14h3ao2v5UokK62oFZ+9Q56e+HJxUyUB0ee0An9 5Vh54nAYAkGyClVguYxEk7Xvc22ZkbrPHoaBXr8HtMCO1jxc59VI4Waa4xErxmgdB/svRO aO82MSDS+/xASLI7O8yKEdAvvjQv6/k/4zvTwp8yD2hslsJOpm/x1TX2SCXngg== 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=fd6647f64a3d48d7b10bbbf222bad7a231c84742 commit fd6647f64a3d48d7b10bbbf222bad7a231c84742 Author: Dmitry Chagin AuthorDate: 2021-06-07 02:21:48 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:27:58 +0000 Regen for ('187715a420237e1ed94dd5aef158eada7dcdc559') Linux clock_getres_time64 system call. MFC after: 2 weeks (cherry picked from commit 773d9153c37a709d5c12bc8abe9166e1d044c01b) --- sys/amd64/linux32/linux32_proto.h | 3 ++- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 18 +++++++++++++++++- sys/i386/linux/linux_proto.h | 3 ++- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 18 +++++++++++++++++- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 18b448d57a8d..7c21877c6214 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1530,7 +1530,8 @@ struct linux_clock_adjtime64_args { register_t dummy; }; struct linux_clock_getres_time64_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tp; char tp_r_[PADR_(struct l_timespec64 *)]; }; struct linux_clock_nanosleep_time64_args { register_t dummy; diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index d33fa28f7a32..7f2a3dfec397 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -423,7 +423,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_clock_gettime64_args), .sy_call = (sy_call_t *)linux_clock_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 403 = linux_clock_gettime64 */ { .sy_narg = AS(linux_clock_settime64_args), .sy_call = (sy_call_t *)linux_clock_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 404 = linux_clock_settime64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_adjtime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 405 = linux_clock_adjtime64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */ + { .sy_narg = AS(linux_clock_getres_time64_args), .sy_call = (sy_call_t *)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_nanosleep_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 407 = linux_clock_nanosleep_time64 */ { .sy_narg = 0, .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 = 0, .sy_call = (sy_call_t *)linux_timer_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409 = linux_timer_settime64 */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 6999999399eb..42b963379259 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -2983,7 +2983,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_clock_getres_time64 */ case 406: { - *n_args = 0; + struct linux_clock_getres_time64_args *p = params; + iarg[0] = p->which; /* clockid_t */ + uarg[1] = (intptr_t)p->tp; /* struct l_timespec64 * */ + *n_args = 2; break; } /* linux_clock_nanosleep_time64 */ @@ -8026,6 +8029,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_clock_getres_time64 */ case 406: + switch (ndx) { + case 0: + p = "clockid_t"; + break; + case 1: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_clock_nanosleep_time64 */ case 407: @@ -9815,6 +9828,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 405: /* linux_clock_getres_time64 */ case 406: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_clock_nanosleep_time64 */ case 407: /* linux_timer_gettime64 */ diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 6fc65571cade..b62d91585495 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1523,7 +1523,8 @@ struct linux_clock_adjtime64_args { register_t dummy; }; struct linux_clock_getres_time64_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tp; char tp_r_[PADR_(struct l_timespec64 *)]; }; struct linux_clock_nanosleep_time64_args { register_t dummy; diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 743c541f9277..de0622c464c5 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -423,7 +423,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_clock_gettime64_args), .sy_call = (sy_call_t *)linux_clock_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 403 = linux_clock_gettime64 */ { .sy_narg = AS(linux_clock_settime64_args), .sy_call = (sy_call_t *)linux_clock_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 404 = linux_clock_settime64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_adjtime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 405 = linux_clock_adjtime64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */ + { .sy_narg = AS(linux_clock_getres_time64_args), .sy_call = (sy_call_t *)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_nanosleep_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 407 = linux_clock_nanosleep_time64 */ { .sy_narg = 0, .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 = 0, .sy_call = (sy_call_t *)linux_timer_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409 = linux_timer_settime64 */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index fde853acdeec..304ef643826e 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3022,7 +3022,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_clock_getres_time64 */ case 406: { - *n_args = 0; + struct linux_clock_getres_time64_args *p = params; + iarg[0] = p->which; /* clockid_t */ + uarg[1] = (intptr_t)p->tp; /* struct l_timespec64 * */ + *n_args = 2; break; } /* linux_clock_nanosleep_time64 */ @@ -8103,6 +8106,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_clock_getres_time64 */ case 406: + switch (ndx) { + case 0: + p = "clockid_t"; + break; + case 1: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_clock_nanosleep_time64 */ case 407: @@ -9921,6 +9934,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 405: /* linux_clock_getres_time64 */ case 406: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_clock_nanosleep_time64 */ case 407: /* linux_timer_gettime64 */