From nobody Fri Jun 17 19:28:54 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 D781A846C9F; Fri, 17 Jun 2022 19:28:54 +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 4LPpxf4dXrz3GVG; Fri, 17 Jun 2022 19:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494134; 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=xcq1Bq0+hcCkXNanwJuRLQDiUgcosMuEW+p4Mbc3Mxc=; b=VjlHetSs3EuQXPb59qoOp7B9PvCQT+b+dspZk/fp4Ij2IqL3drtPgtgWFntlcllob0RAJe X9JcP63CzMK1frHRORWltS/uR5Ic6yeiQDt5hHMhfRp+jZAnHzX1tLlthEY4tHW27ZsNHY HhOEpfkqsRsFsudHG1aGHHB/8e4/suNJDL/KsWwhp6FNWMZgVkryrCYrKLoSg+H2NsTAK0 /Nlw1UoQjR9kazyfayJF6Twee6GjDcgVWsR0BxdsRWHPxWyOs5d9X+XA7xL0oG16iTvWpn pMU4qWeOm6IlPOQ32sskD0OrJ0rkGyWSp6ETO3Fw3+OKjrq0xecOmLEXxAXtzw== 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 661532579E; Fri, 17 Jun 2022 19:28:54 +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 25HJSsJt096690; Fri, 17 Jun 2022 19:28:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJSswj096689; Fri, 17 Jun 2022 19:28:54 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:28:54 GMT Message-Id: <202206171928.25HJSswj096689@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: d0bf82e69af8 - stable/13 - Regen for ('e4bffb80bbc6a2e4b3be89aefcbd5bb2c2fc0ba0') Linux utimensat_time64 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: d0bf82e69af8124fdcb6b6b25b7f088e617fcd6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494134; 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=xcq1Bq0+hcCkXNanwJuRLQDiUgcosMuEW+p4Mbc3Mxc=; b=MZu7jygSUA92Y8VQielwaKyS0pNrM8K/VtZ3c2weCuREmmHFHE/+GYFskCa0xapQJ+zfmO +IZ5yNvIvYayekCnhEtbpAB+00+bPagPn0e/+y5guHBL/+v2LN6aypU2yfFiPRKpytgMdd bNq8dVlgkZSj+n9PEv6WPWVhD3s3Vb0PFFK/WyJ9vEnY6hRufTi4v3tmLzXFAeoftGzddl MsNHZC+UnuFEp6JfhtgYA10jbyjIljZfkTr5cYHtCI6WGGhm5Zrkvh0bCKn25B1axXmrIM DTd1TkhgKAAOCz2ZjIOB/xOosK/HVyD3mevV+FiUfdqx+c/sWixR3m4GdSavXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494134; a=rsa-sha256; cv=none; b=YAsR7PK7V2PbpDBicOCzVO1wxwQwdewDg3RpCuggjzBvY/dXnoQeek7ahJWRgEWKRKq8Ip U7u6+tc2gZ5mKNm2ekK5o5iay8xCIWA956m9zoSHFGTr6eRgOo+rhRyKeBsWSDXN2N9I9E d43pGpLDyhVlfDpSGz4P9WvEp87kHBwopo1ydlNPypWgVh8hwUUbk43N3hEBhc0JlSpETS 21Av1AiNOH3+4zCJFllJTeEFPEu3OWVYHFVP9nYx5bJIqJjwG7hNczBeVVjvfOCQ/aWAts erbJg1tyj6IioVqpyOC64EgO2dRjNZRIPekiNmapUZP909/Jz4SaJ/IMjlw7lQ== 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=d0bf82e69af8124fdcb6b6b25b7f088e617fcd6c commit d0bf82e69af8124fdcb6b6b25b7f088e617fcd6c Author: Dmitry Chagin AuthorDate: 2021-06-07 01:56:58 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:27:56 +0000 Regen for ('e4bffb80bbc6a2e4b3be89aefcbd5bb2c2fc0ba0') Linux utimensat_time64 syscall. MFC after: 2 weeks (cherry picked from commit ea7fa5583c407664b278a5f50cb16c7a7c6bcbc0) --- 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 3055651ac382..8d2f74d3f04c 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1546,7 +1546,10 @@ struct linux_timerfd_settime64_args { register_t dummy; }; struct linux_utimensat_time64_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; + char times64_l_[PADL_(const struct l_timespec64 *)]; const struct l_timespec64 * times64; char times64_r_[PADR_(const struct l_timespec64 *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_pselect6_time64_args { register_t dummy; diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index 4c0c0e991244..da751f94b5e6 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -429,7 +429,7 @@ struct sysent linux32_sysent[] = { { .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 */ { .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 = 0, .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_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 = 0, .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 = 0, .sy_call = (sy_call_t *)linux_ppoll_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 414 = linux_ppoll_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 1a1f46412f33..4d6a54e37e11 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3007,7 +3007,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_utimensat_time64 */ case 412: { - *n_args = 0; + struct linux_utimensat_time64_args *p = params; + iarg[0] = p->dfd; /* l_int */ + uarg[1] = (intptr_t)p->pathname; /* const char * */ + uarg[2] = (intptr_t)p->times64; /* const struct l_timespec64 * */ + iarg[3] = p->flags; /* l_int */ + *n_args = 4; break; } /* linux_pselect6_time64 */ @@ -8013,6 +8018,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_utimensat_time64 */ case 412: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "userland const struct l_timespec64 *"; + break; + case 3: + p = "l_int"; + break; + default: + break; + }; break; /* linux_pselect6_time64 */ case 413: @@ -9774,6 +9795,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 411: /* linux_utimensat_time64 */ case 412: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_pselect6_time64 */ case 413: /* linux_ppoll_time64 */ diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index d306e345224a..1a963a49aecd 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1539,7 +1539,10 @@ struct linux_timerfd_settime64_args { register_t dummy; }; struct linux_utimensat_time64_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; + char times64_l_[PADL_(const struct l_timespec64 *)]; const struct l_timespec64 * times64; char times64_r_[PADR_(const struct l_timespec64 *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_pselect6_time64_args { register_t dummy; diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 83e8550b15f6..bb9280580dde 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -429,7 +429,7 @@ struct sysent linux_sysent[] = { { .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 */ { .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 = 0, .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_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 = 0, .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 = 0, .sy_call = (sy_call_t *)linux_ppoll_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 414 = linux_ppoll_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index f2c36cd2dd65..91aa3a9a13eb 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3046,7 +3046,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_utimensat_time64 */ case 412: { - *n_args = 0; + struct linux_utimensat_time64_args *p = params; + iarg[0] = p->dfd; /* l_int */ + uarg[1] = (intptr_t)p->pathname; /* const char * */ + uarg[2] = (intptr_t)p->times64; /* const struct l_timespec64 * */ + iarg[3] = p->flags; /* l_int */ + *n_args = 4; break; } /* linux_pselect6_time64 */ @@ -8090,6 +8095,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_utimensat_time64 */ case 412: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "userland const struct l_timespec64 *"; + break; + case 3: + p = "l_int"; + break; + default: + break; + }; break; /* linux_pselect6_time64 */ case 413: @@ -9880,6 +9901,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 411: /* linux_utimensat_time64 */ case 412: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_pselect6_time64 */ case 413: /* linux_ppoll_time64 */