From nobody Fri Jun 17 19:39:50 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 D620985C78D;
Fri, 17 Jun 2022 19:39:51 +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 4LPqBG6tkJz3h6f;
Fri, 17 Jun 2022 19:39:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1655494791;
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=WfUk6ZeNSI0D8mPV/88VM2mVUgLMykuJ8egYHYk32Lw=;
b=Uldi+9dCpCbrpmQOvl50PmmnQHVlE2GZrwXsiT1AFrO6mNfmBGGk07EduLDfQo7FHt71Y/
g+7PIk11bn1DFU95ISHUdGF6fyvR1dOq1N0yVbtF1MahsecR+kb1xUA1N870alwSCtEIDm
p8lHnihN7pyse0bfnE5S4TNbQs4Qw15ioO4yYiuKxTNdCY1lsmzEylua/Fk1Npcvt4GgFi
eRXhIk5EjGJb2D0LgVJr8R2EHjahyziVxD2L9vHTPc8Kpv88en6wiAvNBkOFPawmOvq0r/
KcpwyxL4vesZOjhVaxflqo2A8MVMhntINgU3XP1w9K2+vfEsyWVXRqLLuaeoHg==
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 73060257E1;
Fri, 17 Jun 2022 19:39:50 +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 25HJdohR016540;
Fri, 17 Jun 2022 19:39:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdola016539;
Fri, 17 Jun 2022 19:39:50 GMT
(envelope-from git)
Date: Fri, 17 Jun 2022 19:39:50 GMT
Message-Id: <202206171939.25HJdola016539@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Dmitry Chagin <dchagin@FreeBSD.org>
Subject: git: 3f3b7fb1820f - stable/13 - linux(4): Regen for recvmmsg_time64 syscall.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 3f3b7fb1820f59fea5c2c8614dc9195d4cbe2379
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1655494791;
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=WfUk6ZeNSI0D8mPV/88VM2mVUgLMykuJ8egYHYk32Lw=;
b=c9jNpWqvyzI94xy74HFkMwngFleyzQAMRKkWIcE46/DWHrffo0bvaJXwryrHLnFJK1472j
yWUM3A+/nhBYAN+wiDpEET4a/W2A/aRM1RgLsz6dnr3tQhu/mGgCa+Gq3G6Y+swOSQIsEN
ce38Ijt2F8bimKIgnHLLteZ1Xz+1dRCVyVeloDCQXk5jPEHmeel6q2bJyYsRGkiccq7ZJv
Ao5Rak22iOVbTTU8kHFvwGNGPiFDHMa1NGCwiGnmduABQDsjk4w0FM41zZN1BYDI2nzO3l
Gdccys3u+Pcj0M9eYQhB4bKS1BEZLBALfrFq/84eIwwu6b/orj+/Qxz0pwzxNg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494791; a=rsa-sha256; cv=none;
b=vbc1OarDo4VfDz9JVHPeHtQVFkqXupMbawrZ5pdolEvBemyMcICL8AC4HnkqVuS0Mc4/VR
hlj4QE1tQxy+Dam06AVcwcr9F5LNcpdOtS7BX7B5luvsy3z+9MvAgFpt9DIFC7NOO0L1rv
KVb0qLne2SqXbAew0QkZ7YkTjmIut0ys5WApQxLVycX0nGkcvb5errLz4+gbynRbnXr7TZ
XqKiGdGFS74k5PWQqq6UcWh/rPCpwXPrVzoPgvC1iq08x9Gd+GS0ACFblEJVZw9LlFIEh/
YJE/7vopz1gyz9y3oqaR81WgRmn4X83KJytIQPLI39c/WzWpE+sUlA3tHMEU0g==
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=3f3b7fb1820f59fea5c2c8614dc9195d4cbe2379
commit 3f3b7fb1820f59fea5c2c8614dc9195d4cbe2379
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2022-06-17 19:34:42 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-17 19:34:42 +0000
linux(4): Regen for recvmmsg_time64 syscall.
MFC after: 2 weeks
(cherry picked from commit 79695e9585fafb4fd7240d8183839852f6c5d43a)
---
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 1b4e814d6a7a..34cc1f4b8857 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 {
register_t dummy;
};
struct linux_recvmmsg_time64_args {
- register_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 {
register_t dummy;
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index e42c9479d6f3..ee4c6296d299 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 f3dead6b423a..1c9ebdca2ea4 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -3080,7 +3080,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[0] = p->s; /* l_int */
+ uarg[1] = (intptr_t)p->msg; /* struct l_mmsghdr * */
+ iarg[2] = p->vlen; /* l_uint */
+ iarg[3] = p->flags; /* l_uint */
+ uarg[4] = (intptr_t)p->timeout; /* struct l_timespec64 * */
+ *n_args = 5;
break;
}
/* linux_mq_timedsend_time64 */
@@ -8279,6 +8285,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:
@@ -10168,6 +10193,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 439dc318f7fe..a123bfebe3e0 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 {
register_t dummy;
};
struct linux_recvmmsg_time64_args {
- register_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 {
register_t dummy;
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 78ceba5e2d62..f7f0691eb50b 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 16cc7e47f7b0..fb7f7a9f8b3a 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -3119,7 +3119,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[0] = p->s; /* l_int */
+ uarg[1] = (intptr_t)p->msg; /* struct l_mmsghdr * */
+ iarg[2] = p->vlen; /* l_uint */
+ iarg[3] = p->flags; /* l_uint */
+ uarg[4] = (intptr_t)p->timeout; /* struct l_timespec64 * */
+ *n_args = 5;
break;
}
/* linux_mq_timedsend_time64 */
@@ -8356,6 +8362,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:
@@ -10274,6 +10299,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 */