From nobody Wed May 4 10:08:22 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 6F8F11AAB68E; Wed, 4 May 2022 10:08:23 +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 4KtXbB6FSYz4dZv; Wed, 4 May 2022 10:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658903; 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=4IONQfIP4yfDAIradLfJc0vZTacMi8RYmthWDaxATnY=; b=qxBEroSzuUrLhWshIFYH+4R0kfrWtchbRqYalT+9ZUVSnxeddp336zATI5dasGHXwzQz64 H+J51wMpeIUdloSi2bMI2yaAxK8dmT8HGYptEJblBMhycy1PTVuH2Nio0VCEFlRBxN7RQR PQFZBTwDPzIRNBmK7/Ss5cz8tUuJvA6s5hFbRV9Sf7R8m6iw78aDtRh6PW9xH26QblEeMX 8fRzcf+8/vxQRjNLqVBFkew4eki85k/+zC6b6qpLBm7q3FRR3aK0VjDhCSzJ4+yaeyhA/x FeNT7LlxyYBRIeOC86jBkDBmOsEfgsjABy1Aze0suJ9lJdjf6U7i6e/AiGNdkw== 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 9191C10E47; Wed, 4 May 2022 10:08:22 +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 244A8MFX000642; Wed, 4 May 2022 10:08:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244A8MTS000641; Wed, 4 May 2022 10:08:22 GMT (envelope-from git) Date: Wed, 4 May 2022 10:08:22 GMT Message-Id: <202205041008.244A8MTS000641@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: 79695e9585fa - main - linux(4): Regen for recvmmsg_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/main X-Git-Reftype: branch X-Git-Commit: 79695e9585fafb4fd7240d8183839852f6c5d43a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658903; 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=4IONQfIP4yfDAIradLfJc0vZTacMi8RYmthWDaxATnY=; b=SgaXeUuQOfUEwvxVTLSljBxd7hIo28TK3f//GBhAAiuiyNal3KO8K7Y6iti0XsdOvEDU50 SRSI5d4pmxpqq1Z3Z9D5xcom6ukVgopGmmPOs4zniJVFXhakB6Xk0LErxRZE4G6RlVBzzl sUHcohr2dbis7UvObeROG0bocGk7B/V1v98TU2US99iE4fpq/KwjHvzHBTumF2UG3S1e/N 8Vd+Yjv4/1dxXfOAY/kL6pQd4CHj0UnYT1GehnWSzNDHdw5T129ko7vJ432/ouVrSbn4CZ u0bpIi9G+6CoPGgN9J0+GtSIS8zp1KmHYzSiLxOpEuJ2B279XWYs+cX9hQGZzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651658903; a=rsa-sha256; cv=none; b=Noi/lvYYiFriNf5Jq/bbTkdP/SCFq+n6rvM92JYQDDJefqFt5A7lWuVYZ4y3ZnTgkD5bzW 97b0LCo9N5j6pHqIFk8BV845u1UgpMNc8UJYvZHeiGehrjik5DllQN1UgycXQVjPhai3Qx FEQ2Wbhro3bzClFdMDbUWvELq9laSzutOv+Sje5RPOqguyCliVMcK37I5HtRJpXo1AsKxt ckp5I7C4A19hjiR3x3IfryFBBUTlzg8vk6k3bphybZMkgU4VPG96DzOB5+gkvm7lwUB4NQ 1p2Qer3Uz1hk+JaqDGQkB7yNM3SsZM0PE/bPUtd+EsOuQE0jDRqk5taz5hiF+w== 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=79695e9585fafb4fd7240d8183839852f6c5d43a commit 79695e9585fafb4fd7240d8183839852f6c5d43a Author: Dmitry Chagin AuthorDate: 2022-05-04 10:06:52 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-04 10:06:52 +0000 linux(4): Regen for recvmmsg_time64 syscall. MFC after: 2 weeks --- sys/amd64/linux32/linux32_proto.h | 6 +++++- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 30 +++++++++++++++++++++++++++++- sys/i386/linux/linux_proto.h | 6 +++++- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 30 +++++++++++++++++++++++++++++- 6 files changed, 70 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index fc40376eea99..70a9f4bbe872 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1592,7 +1592,11 @@ struct linux_io_pgetevents_time64_args { syscallarg_t dummy; }; struct linux_recvmmsg_time64_args { - syscallarg_t dummy; + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char msg_l_[PADL_(struct l_mmsghdr *)]; struct l_mmsghdr * msg; char msg_r_[PADR_(struct l_mmsghdr *)]; + char vlen_l_[PADL_(l_uint)]; l_uint vlen; char vlen_r_[PADR_(l_uint)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; + char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)]; }; struct linux_mq_timedsend_time64_args { syscallarg_t dummy; diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index e2f77bbc7cb3..3160aa060089 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -434,7 +434,7 @@ struct sysent linux32_sysent[] = { { .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 */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 416 = linux_io_pgetevents_time64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ + { .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedreceive_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 419 = linux_mq_timedreceive_time64 */ { .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 */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index a719cddbdabb..49173e835be6 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3081,7 +3081,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_recvmmsg_time64 */ case 417: { - *n_args = 0; + struct linux_recvmmsg_time64_args *p = params; + iarg[a++] = p->s; /* l_int */ + uarg[a++] = (intptr_t)p->msg; /* struct l_mmsghdr * */ + iarg[a++] = p->vlen; /* l_uint */ + iarg[a++] = p->flags; /* l_uint */ + uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec64 * */ + *n_args = 5; break; } /* linux_mq_timedsend_time64 */ @@ -8280,6 +8286,25 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_recvmmsg_time64 */ case 417: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct l_mmsghdr *"; + break; + case 2: + p = "l_uint"; + break; + case 3: + p = "l_uint"; + break; + case 4: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_mq_timedsend_time64 */ case 418: @@ -10169,6 +10194,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 416: /* linux_recvmmsg_time64 */ case 417: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_mq_timedsend_time64 */ case 418: /* linux_mq_timedreceive_time64 */ diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index ed6765b1bd3c..efecc4e7cdf7 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1585,7 +1585,11 @@ struct linux_io_pgetevents_time64_args { syscallarg_t dummy; }; struct linux_recvmmsg_time64_args { - syscallarg_t dummy; + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char msg_l_[PADL_(struct l_mmsghdr *)]; struct l_mmsghdr * msg; char msg_r_[PADR_(struct l_mmsghdr *)]; + char vlen_l_[PADL_(l_uint)]; l_uint vlen; char vlen_r_[PADR_(l_uint)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; + char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)]; }; struct linux_mq_timedsend_time64_args { syscallarg_t dummy; diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index ac71fe2e6b96..56f43e4d94c8 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -434,7 +434,7 @@ struct sysent linux_sysent[] = { { .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 */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 416 = linux_io_pgetevents_time64 */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ + { .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedreceive_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 419 = linux_mq_timedreceive_time64 */ { .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 */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 72e8564c8b4f..0daf807599a0 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3120,7 +3120,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_recvmmsg_time64 */ case 417: { - *n_args = 0; + struct linux_recvmmsg_time64_args *p = params; + iarg[a++] = p->s; /* l_int */ + uarg[a++] = (intptr_t)p->msg; /* struct l_mmsghdr * */ + iarg[a++] = p->vlen; /* l_uint */ + iarg[a++] = p->flags; /* l_uint */ + uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec64 * */ + *n_args = 5; break; } /* linux_mq_timedsend_time64 */ @@ -8357,6 +8363,25 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_recvmmsg_time64 */ case 417: + switch (ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "userland struct l_mmsghdr *"; + break; + case 2: + p = "l_uint"; + break; + case 3: + p = "l_uint"; + break; + case 4: + p = "userland struct l_timespec64 *"; + break; + default: + break; + }; break; /* linux_mq_timedsend_time64 */ case 418: @@ -10275,6 +10300,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 416: /* linux_recvmmsg_time64 */ case 417: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_mq_timedsend_time64 */ case 418: /* linux_mq_timedreceive_time64 */