From nobody Fri Jun 17 19:31:47 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 09E5D852C93; Fri, 17 Jun 2022 19:31:49 +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 4LPq102hBpz3JtV; Fri, 17 Jun 2022 19:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494308; 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=LrGMH3RSWVhH2CUn1JxCpWboKXNcYg9nfb6mZRiiVZE=; b=x/KAlFsF+tl5GIien+guwkEznLmdxX3xx1kFyanrUgIcOCLbzdxzWuKu9AAi3wMGh8sXAA +1/wA11/9vCSKwyurba64LNYDRrXhr98M9PusF8Gc7zgc3CKkICvLgaLt/v+crp1xfp7vP nyeyfrr9QHGHZSjd+Ma1Dew8SZU12tW99utCykgkpyLqUyWwnvBLikqW7oAuPkdOdVeUPV AuU7YK+oDFtXo1aQ+kUKQLB49s13s4cknbKPoWdmXhuFspdt7ipTuxuyy8dfFzIg+8yTMb dGE8713ceBht6zGbl0vwoLH5k87XOi2wDM0FYAMhMp3DoFIZ/FxND5EPli7JuQ== 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 1876025A1F; Fri, 17 Jun 2022 19:31:48 +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 25HJVm5S007606; Fri, 17 Jun 2022 19:31:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJVlDv007605; Fri, 17 Jun 2022 19:31:47 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:31:47 GMT Message-Id: <202206171931.25HJVlDv007605@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: 92b1cf857241 - stable/13 - linux(4): Regen for futex system call. 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: 92b1cf857241d48691a4c09e7b58802257ea2b6d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494309; 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=LrGMH3RSWVhH2CUn1JxCpWboKXNcYg9nfb6mZRiiVZE=; b=c26tEmt0myGRV3U6w4d2kC/PQonXodAnpu91rbaRJ0I+zFk5OZP9DtcPndyoUPMRPgcjSW BDepqhZWa/3a+VbjbiNoqFDBFz8skHtzqHTEJET6O/gi9xUecFiWVs1PEUmvZfH1oMid+Q Wu8/xd9MqKOryiaPtJ03xOvCG4juASKisBs47FHwKp1WR94C0hI8sCLQ5Mm0boccQfzgZb 0AUgjrnZUliWhmqOupkjN1ZQy2pIU6G8ERHfDykKqBlsJ6b/e3HS1EHMMPb7h/iqhz0lR4 APF0v9xprEvFejt66X8nTzE0hVe2WzO3EgkYBTcvn/VInC4xUelV4zPM+sk8Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494309; a=rsa-sha256; cv=none; b=QpRUp6JejfDqRmt/20AFmSbsb9eXaMZ/KvU7peiK8DrVxaQDqvqSaJ3O7vMnT5YCM+K769 44i+Pvs8HC1YO5fc7N+PfcEATl1NmsUsSuJK0TWdm8hrZ1Tw4f2Rh4QXZbLFCrToW36tZ3 HroRIeP/rqKYEN2pvnKRdwxeXEJ+LIlnqENeZhFmfcxx8BbRfXU469y4Oo4TLiG+4rFJH+ us73DcYLiT4gUbRJKJUWfHg/8G4TJVPRHJ2z07wCd7BO+YKmqFde3ZgiQbP3UKatnVN2DD xQCaznohsSq8dThjFWqX9fYtRrw1NvlR1+xP74X+tMM1SGngO8CR2THB0hpqRQ== 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=92b1cf857241d48691a4c09e7b58802257ea2b6d commit 92b1cf857241d48691a4c09e7b58802257ea2b6d Author: Dmitry Chagin AuthorDate: 2021-06-10 11:16:40 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:14 +0000 linux(4): Regen for futex system call. MFC after: 2 weeks (cherry picked from commit ee64d982049544b1e8a77acc01fd230c906fb305) --- sys/amd64/linux/linux_proto.h | 8 ++++---- sys/amd64/linux/linux_systrace_args.c | 16 ++++++++-------- sys/amd64/linux32/linux32_proto.h | 4 ++-- sys/amd64/linux32/linux32_systrace_args.c | 8 ++++---- sys/arm/linux/linux_proto.h | 4 ++-- sys/arm/linux/linux_systrace_args.c | 8 ++++---- sys/arm64/linux/linux_proto.h | 10 +++++----- sys/arm64/linux/linux_systrace_args.c | 20 ++++++++++---------- sys/i386/linux/linux_proto.h | 4 ++-- sys/i386/linux/linux_systrace_args.c | 8 ++++---- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 60e880d891e8..cfd2f0cf2ca7 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -706,12 +706,12 @@ struct linux_time_args { char tm_l_[PADL_(l_time_t *)]; l_time_t * tm; char tm_r_[PADR_(l_time_t *)]; }; struct linux_sys_futex_args { - char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)]; char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; - char val_l_[PADL_(l_int)]; l_int val; char val_r_[PADR_(l_int)]; + char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; - char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; - char val3_l_[PADL_(l_int)]; l_int val3; char val3_r_[PADR_(l_int)]; + char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; + char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)]; }; struct linux_sched_setaffinity_args { char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index d1f2f30f60e0..a4c861b789fd 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -1563,12 +1563,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_sys_futex */ case 202: { struct linux_sys_futex_args *p = params; - uarg[0] = (intptr_t)p->uaddr; /* void * */ + uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */ iarg[1] = p->op; /* l_int */ - iarg[2] = p->val; /* l_int */ + uarg[2] = p->val; /* uint32_t */ uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ - uarg[4] = (intptr_t)p->uaddr2; /* void * */ - iarg[5] = p->val3; /* l_int */ + uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */ + uarg[5] = p->val3; /* uint32_t */ *n_args = 6; break; } @@ -5237,22 +5237,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 202: switch (ndx) { case 0: - p = "userland void *"; + p = "userland uint32_t *"; break; case 1: p = "l_int"; break; case 2: - p = "l_int"; + p = "uint32_t"; break; case 3: p = "userland struct l_timespec *"; break; case 4: - p = "userland void *"; + p = "userland uint32_t *"; break; case 5: - p = "l_int"; + p = "uint32_t"; break; default: break; diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index d8ac24f8492b..aa48b0b50b89 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -782,8 +782,8 @@ struct linux_sendfile64_args { char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_sys_futex_args { - char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; - char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 9eb9bfc15390..bd6201cf4469 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1692,8 +1692,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_sys_futex */ case 240: { struct linux_sys_futex_args *p = params; - uarg[0] = (intptr_t)p->uaddr; /* void * */ - iarg[1] = p->op; /* int */ + uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */ + iarg[1] = p->op; /* l_int */ uarg[2] = p->val; /* uint32_t */ uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */ @@ -5851,10 +5851,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 240: switch (ndx) { case 0: - p = "userland void *"; + p = "userland uint32_t *"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: p = "uint32_t"; diff --git a/sys/arm/linux/linux_proto.h b/sys/arm/linux/linux_proto.h index e458adb30a10..b07dc8290016 100644 --- a/sys/arm/linux/linux_proto.h +++ b/sys/arm/linux/linux_proto.h @@ -648,8 +648,8 @@ struct linux_sendfile64_args { char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_sys_futex_args { - char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; - char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; diff --git a/sys/arm/linux/linux_systrace_args.c b/sys/arm/linux/linux_systrace_args.c index 608d8c1ed238..87608f6992bf 100644 --- a/sys/arm/linux/linux_systrace_args.c +++ b/sys/arm/linux/linux_systrace_args.c @@ -1477,8 +1477,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_sys_futex */ case 240: { struct linux_sys_futex_args *p = params; - uarg[0] = (intptr_t)p->uaddr; /* void * */ - iarg[1] = p->op; /* int */ + uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */ + iarg[1] = p->op; /* l_int */ uarg[2] = p->val; /* uint32_t */ uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */ @@ -4741,10 +4741,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 240: switch (ndx) { case 0: - p = "userland void *"; + p = "userland uint32_t *"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: p = "uint32_t"; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 59904e0c2fe0..47d4c812364f 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -408,12 +408,12 @@ struct linux_unshare_args { register_t dummy; }; struct linux_sys_futex_args { - char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; - char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; - char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)]; + char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; + char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; - char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; - char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; + char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; + char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)]; }; struct linux_set_robust_list_args { char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)]; diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index b8be9e91c823..929b70270045 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -772,12 +772,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_sys_futex */ case 98: { struct linux_sys_futex_args *p = params; - uarg[0] = (intptr_t)p->uaddr; /* void * */ - iarg[1] = p->op; /* int */ - iarg[2] = p->val; /* int */ + uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */ + iarg[1] = p->op; /* l_int */ + uarg[2] = p->val; /* uint32_t */ uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ - uarg[4] = (intptr_t)p->uaddr2; /* void * */ - iarg[5] = p->val3; /* int */ + uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */ + uarg[5] = p->val3; /* uint32_t */ *n_args = 6; break; } @@ -3633,22 +3633,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 98: switch (ndx) { case 0: - p = "userland void *"; + p = "userland uint32_t *"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: - p = "int"; + p = "uint32_t"; break; case 3: p = "userland struct l_timespec *"; break; case 4: - p = "userland void *"; + p = "userland uint32_t *"; break; case 5: - p = "int"; + p = "uint32_t"; break; default: break; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 1b3512c5b890..a417f7804c3b 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -779,8 +779,8 @@ struct linux_sendfile64_args { char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_sys_futex_args { - char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; - char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index b8e07e3cc985..37dcd1db59d8 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1731,8 +1731,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* linux_sys_futex */ case 240: { struct linux_sys_futex_args *p = params; - uarg[0] = (intptr_t)p->uaddr; /* void * */ - iarg[1] = p->op; /* int */ + uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */ + iarg[1] = p->op; /* l_int */ uarg[2] = p->val; /* uint32_t */ uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */ uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */ @@ -5939,10 +5939,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 240: switch (ndx) { case 0: - p = "userland void *"; + p = "userland uint32_t *"; break; case 1: - p = "int"; + p = "l_int"; break; case 2: p = "uint32_t";