From nobody Mon Nov 14 19:42:10 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 4NB07k3hp6z4d9Ym; Mon, 14 Nov 2022 19:42:10 +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 4NB07k2td3z3JjZ; Mon, 14 Nov 2022 19:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668454930; 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=zkQ98Uiy3w+40xhyBjTRoEHy2KoypoXq9bhrAp53Ct4=; b=G2oS540uRfuASagG5i6JtBey8q+y93GHs6RiEZgr2Z/eQq5PA0Z/aatrbPOS+c/opC9viv 5FITHcVjR26uviV/peB2qqCM38fNkTBD5JfNZAE4DyuF43ncB9cKRelsUubs9cVFi+hM3P tJVxgHnAGVKmJ7M+lP4ND/mValQm1AUOZDjHv4gpTXCZO0h+OdlUpIHwtT0y+090n9FNiD /9ZfP0xq+Cx55EuVHsNpHfhvp60oeX9m35DAB614DPKwHD3AJdvDIHvwPGfj9wpDE4GHkA lO6h5s2N7Io0Zp9u8PoR6EwiZQh/B3BzARNe5fMemrXSWO1wwbLqoUYDoxkD2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668454930; 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=zkQ98Uiy3w+40xhyBjTRoEHy2KoypoXq9bhrAp53Ct4=; b=eVb1Nw3LXUSAtgPrf8K4ZUH7DE5IDMyokmL1ClvzcEjGnZ8R25/r44f+CvOgbt3BgL+kll LTzYgIRij0rdqunSABfn6vZS/nzpVBq2nPsoXYOp7Wz9CL28xYRhXOmKzLXBq2DW7OetQC FlsJ89Ygk6FDX6o7qmFZFnkj3Zq4Ppfd6cNpH+HYcq8RhycklvUTy5LQ1h6RWHGft4d3Jc V4S/J9+xi6+BZmKECO73HA+zv5vquZ5svzexf2a1ekMucnxPiG2hpHNOxGMuYevVVz7hl5 wnFByT4m+Izmf7AfPB5H8z9tRFcItEshH9cYyZpnVoLKWFUU01vlP4OnbMrGYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668454930; a=rsa-sha256; cv=none; b=bl+UlI1LXWFXuWLO40+W9enlqwdPDJOsW8C9wGdylSZbfIrkHsefAuUU+OrOltyt28hmHP oQDSaKQrKBnzTWdoc5fxit8FGt2++0GgEOPaqbiwNcHNds5Y/b8UE2HOZg+t9W/Xhwa2bv Tvt1ITFRUNGBcCDxVtfuoO3jcRGi/2kEcoaEJvN08oEaMa38c+IJxHYoJUpNqgKdJ1+i8H a5/N0pv/hKJaknnihFnA27wI3sXCY/xpdii9Vwq+dwaV3LXLb+La+zq2oRqA4Qzf+uQ6sW d/SQzLp+PuxcDCX/JSCx+omDhizM2yM+lvFzvs4gcDhqr5a+Q0HfeOQpVCoOIQ== 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 4NB07k1WVjztXD; Mon, 14 Nov 2022 19:42:10 +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 2AEJgAp1050751; Mon, 14 Nov 2022 19:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AEJgApS050750; Mon, 14 Nov 2022 19:42:10 GMT (envelope-from git) Date: Mon, 14 Nov 2022 19:42:10 GMT Message-Id: <202211141942.2AEJgApS050750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1e3927b93b57 - stable/13 - Only define sanitizer wrappers for atomic fences once. 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e3927b93b575d648fe69858782794f4a717bacd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1e3927b93b575d648fe69858782794f4a717bacd commit 1e3927b93b575d648fe69858782794f4a717bacd Author: John Baldwin AuthorDate: 2021-09-15 16:03:17 +0000 Commit: Mark Johnston CommitDate: 2022-11-14 19:24:15 +0000 Only define sanitizer wrappers for atomic fences once. Previously, this was defining duplicate definitions for each type. This fixes a redundat definition warning from GCC. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D31965 (cherry picked from commit 45cb7671133efa52b63f301e8439a71259abe478) --- sys/sys/atomic_san.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h index 30bd01c97cf2..b0790962d8bd 100644 --- a/sys/sys/atomic_san.h +++ b/sys/sys/atomic_san.h @@ -76,13 +76,16 @@ int sp##_atomic_##op##_##name(volatile type *, u_int); \ int sp##_atomic_##op##_acq_##name(volatile type *, u_int) -#define ATOMIC_SAN_THREAD_FENCE(sp) \ +#define _ATOMIC_SAN_THREAD_FENCE(sp) \ void sp##_atomic_thread_fence_acq(void); \ void sp##_atomic_thread_fence_rel(void); \ void sp##_atomic_thread_fence_acq_rel(void); \ void sp##_atomic_thread_fence_seq_cst(void); \ void sp##_atomic_interrupt_fence(void) +#define ATOMIC_SAN_THREAD_FENCE(sp) \ + _ATOMIC_SAN_THREAD_FENCE(sp) + #define _ATOMIC_SAN_FUNCS(sp, name, type) \ ATOMIC_SAN_FUNC_1(sp, add, name, type); \ ATOMIC_SAN_FUNC_1(sp, clear, name, type); \ @@ -96,8 +99,7 @@ ATOMIC_SAN_STORE(sp, name, type); \ ATOMIC_SAN_READ(sp, swap, name, type); \ ATOMIC_SAN_TEST(sp, testandclear, name, type); \ - ATOMIC_SAN_TEST(sp, testandset, name, type); \ - ATOMIC_SAN_THREAD_FENCE(sp); + ATOMIC_SAN_TEST(sp, testandset, name, type) #define ATOMIC_SAN_FUNCS(name, type) \ _ATOMIC_SAN_FUNCS(SAN_INTERCEPTOR_PREFIX, name, type) @@ -111,6 +113,7 @@ ATOMIC_SAN_FUNCS(8, uint8_t); ATOMIC_SAN_FUNCS(16, uint16_t); ATOMIC_SAN_FUNCS(32, uint32_t); ATOMIC_SAN_FUNCS(64, uint64_t); +ATOMIC_SAN_THREAD_FENCE(SAN_INTERCEPTOR_PREFIX); #ifndef SAN_RUNTIME