From nobody Wed Feb 01 18:57:23 2023 X-Original-To: dev-commits-src-main@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 4P6WPb472tz3bV9j; Wed, 1 Feb 2023 18:57: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 4P6WPb3WsRz3n82; Wed, 1 Feb 2023 18:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675277843; 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=fAWXNAMTb2fjV9xNKNGoNeyyYaFLAd3FGgwHzlX/PZo=; b=HHe9O5JpTABlUzTYd0upm+Z3yKn2iKBoUDZAWU5140rlF0WPwzWdzMHC0z5GzQl40917k0 txuXYF5J6Uxu5NehPJ2T9lARo2b9HfUzZHmgz8jhdyoGW5CBO74cJzVUrv6R/AKNPY+ydr eit7AeA9q1AGtSXbydle02yT6GGtiYrxkk4LT55TSqwzSqq9VIX/zMsF5nJvgSJCjV+TqF gZcvO+9z9kKb3I8Hn1hYVZPn1UWTFDHEoZr9+dKlImoyY7hcNWP8wwgLprDu6JqZ9fR9uc X9JXSUJlWKQ/m4vwycnydMxhLxo/Ga10cOBKskgcoTBTT5GsapaKUeb8Rlro5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675277843; 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=fAWXNAMTb2fjV9xNKNGoNeyyYaFLAd3FGgwHzlX/PZo=; b=olEI9VZ1XLZjrJWsbcnz2iOGZIKIlFMPMzH0JujqYukm49Y9+sEyDcl0r3/9BFjQ1x/Yfm 3RHn6v2oh+bMdqUp4/++U1+2ed+Kj5ckoZStZEaGe7uqZ5HgZjUfQKDUdsPoX3nadbvHdS sG0yYnuBXpSKazrLpR1Qy4Vnw7MULpEfaQo5HbGZa1MN5ZDJI4QhiaV4KMbAOK3diDYrWj hYjNAuzhBDam9+nUuL2lD2nAZLNntS464EuK3HnyAfJsibl2mHeU+kJmm3Woqgbpq2nN93 G25pqQ+ntzCsB4yaJvKaDuy5U10FjemAQjYpFb1r4m6hXHmzWoFU0Me99wJ69w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675277843; a=rsa-sha256; cv=none; b=NtzWGKEK4RkAldJwglsx7sbJEDqe7X/0XS7UEm3N1MWKLLIZkSnh4oHC8+AZBBOgQ/ek5c bFBNaAZcWrlKzxEv2Z/5XkE2GC7z804Gm1WSOgjEQSHwo1HP+A186YJpyQtJfowOB37x8I nqGeY+oDXEVfzWqyTpR0DTMflF5ekNU4ohFrP+bMwDwCcKuTdpH0TVlVeanHBDPMvMcx6A 9y6ARgkYRldmCWwqUJ1OFm97Umfav3Rwvj/cq7DtWVPOt2vCN0vIAv8J5a9/yFnTyc35/k z5Q7oBp1MAKH2CSZD1OLMS5HSQt85xzNf2HuaHnA2unvWMBUPZrMrwxKZ4LqdQ== 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 4P6WPb2ZfzzQ7t; Wed, 1 Feb 2023 18:57:23 +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 311IvNtC072583; Wed, 1 Feb 2023 18:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311IvNEX072582; Wed, 1 Feb 2023 18:57:23 GMT (envelope-from git) Date: Wed, 1 Feb 2023 18:57:23 GMT Message-Id: <202302011857.311IvNEX072582@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: 575e48f1c4eb - main - linux(4): Deduplicate MI futex structures. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 575e48f1c4eb05fe8df6aaeb5f55e17c63a02639 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=575e48f1c4eb05fe8df6aaeb5f55e17c63a02639 commit 575e48f1c4eb05fe8df6aaeb5f55e17c63a02639 Author: Dmitry Chagin AuthorDate: 2023-02-01 18:57:04 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-01 18:57:04 +0000 linux(4): Deduplicate MI futex structures. MFC after: 1 week --- sys/amd64/linux/linux.h | 11 ----------- sys/amd64/linux32/linux.h | 11 ----------- sys/arm64/linux/linux.h | 11 ----------- sys/compat/linux/linux_futex.h | 11 +++++++++++ sys/i386/linux/linux.h | 11 ----------- sys/i386/linux/linux_copyout.c | 1 + 6 files changed, 12 insertions(+), 44 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index c9e28f20ef94..b31b520cb573 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -277,17 +277,6 @@ struct l_ifconf { #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) -/* robust futexes */ -struct linux_robust_list { - l_uintptr_t next; -}; - -struct linux_robust_list_head { - struct linux_robust_list list; - l_long futex_offset; - l_uintptr_t pending_list; -}; - /* This corresponds to 'struct user_regs_struct' in Linux. */ struct linux_pt_regset { l_ulong r15; diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 7909c9c2081b..c77897344506 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -442,17 +442,6 @@ int linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, int linux_copyout_rusage(struct rusage *ru, void *uaddr); #endif /* _KERNEL */ -/* robust futexes */ -struct linux_robust_list { - l_uintptr_t next; -}; - -struct linux_robust_list_head { - struct linux_robust_list list; - l_long futex_offset; - l_uintptr_t pending_list; -}; - /* This corresponds to 'struct user_regs_struct32' in Linux. */ struct linux_pt_regset32 { l_uint ebx; diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index fe9c9b23e552..8ecadff2e220 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -217,17 +217,6 @@ struct l_ifreq { #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) -/* robust futexes */ -struct linux_robust_list { - l_uintptr_t next; -}; - -struct linux_robust_list_head { - struct linux_robust_list list; - l_long futex_offset; - l_uintptr_t pending_list; -}; - struct linux_pt_regset { l_ulong x[31]; l_ulong sp; diff --git a/sys/compat/linux/linux_futex.h b/sys/compat/linux/linux_futex.h index 189db4e17c4f..53fe1bfd0955 100644 --- a/sys/compat/linux/linux_futex.h +++ b/sys/compat/linux/linux_futex.h @@ -79,6 +79,17 @@ #define FUTEX_TID_MASK 0x3fffffff #define FUTEX_BITSET_MATCH_ANY 0xffffffff +/* robust futexes */ +struct linux_robust_list { + l_uintptr_t next; +}; + +struct linux_robust_list_head { + struct linux_robust_list list; + l_long futex_offset; + l_uintptr_t pending_list; +}; + int futex_xchgl(int oparg, uint32_t *uaddr, int *oldval); int futex_addl(int oparg, uint32_t *uaddr, int *oldval); int futex_orl(int oparg, uint32_t *uaddr, int *oldval); diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 86fca2976f83..c651da6b5857 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -395,15 +395,4 @@ struct l_desc_struct { #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) -/* robust futexes */ -struct linux_robust_list { - struct linux_robust_list *next; -}; - -struct linux_robust_list_head { - struct linux_robust_list list; - l_long futex_offset; - struct linux_robust_list *pending_list; -}; - #endif /* !_I386_LINUX_H_ */ diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c index 6dc98bc8bf5d..5672787d5df7 100644 --- a/sys/i386/linux/linux_copyout.c +++ b/sys/i386/linux/linux_copyout.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include