From nobody Wed Feb 23 14:55:56 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 388A419E1D85; Wed, 23 Feb 2022 14:55:57 +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 4K3fHK13swz3vYp; Wed, 23 Feb 2022 14:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645628157; 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=dSuQFqBDhYQhfmrKW7MlWF6b1WAoiWmJWhnKyaSGl+c=; b=pHq51Tdq/h5/GeYpD2iCQgmsBVpNFYtafkpl+MIjVs4EBWvurFJ2+9fDRggU+rwBzRu3qE FoIxtLkcyi1YvikwLsDmShrxZf3sKu5KNgAQPeasO0Z1wW/lphj+yTBg3GdWgvW2QYM9x5 3ybm4nIxDNQgLsePjnFiAwAq0fuJ7ARMYU23FSUwp5gIEZvJVXgdG34MRsIQCDsvAKFqG0 quiwIerCAf9uu6/GodRq73Fbwq35BQfbaTteCqfgeFHbXc/rF5usRyIMyDbHQPAxHWiSVe jRcLaTCmXzQhlvAE/6GE8hgfu+0eFyLkogTfGf2FeTuebgJcUQuPb//jk1eU8w== 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 00A4A1A47C; Wed, 23 Feb 2022 14:55:56 +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 21NEtuIf059883; Wed, 23 Feb 2022 14:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NEtuof059882; Wed, 23 Feb 2022 14:55:56 GMT (envelope-from git) Date: Wed, 23 Feb 2022 14:55:56 GMT Message-Id: <202202231455.21NEtuof059882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d8da59ddf897 - main - Fix the sanitizer header checks on arm64 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8da59ddf89767fdd80f4a7a87549ec3509d9426 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645628157; 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=dSuQFqBDhYQhfmrKW7MlWF6b1WAoiWmJWhnKyaSGl+c=; b=y2+tXWwJU2u4uSx3G3J+baj3gGQJn7lLQGC7QVRuEaYAH+ft9XIOsl9YP5eXW+5CHBfqU0 fUhb2w23goBsLSRK0keh0VhNY2JCuYgn5Tb1vtQKke0i2DsseN6QB/IVeEKwRVtsham5Ig tRr5RQ3fnNZgyHdkPBBngeH/ZjCp7dETslGCsqng2GhvxnEmNFrWXUspUgBHVvMOWIhK89 2HC8seZ/h+/V2gqUOL+KdMPIivzDZ6Dygm+scAXVGN9PDYLSW+4cpGJjyXoSuQ//ZzZrt/ ulZpkucVrXRunbwNwJYNxC+u8KqphZT2LqsIh+9qetWKfc+28ot8TND0s873xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645628157; a=rsa-sha256; cv=none; b=HPO2kceq+eAVyeY/1MzROhNYNGOx8F/nAgZMNdEV5U3E9uY2cDJyRgtEhV/EbwIVHtImxU B1lrkS9X4VGllLfsXV0Wg6/YGUIv1daztjUB/twpsse3IXzrCS9AN+kEHaoP+m8shVBcwP WW3/IWrbljK8uRdRkuoJbF1Fk4LvgMm8uTABjrugO6c5VtkO+FKPqd/MgYI5cYWggYc5YI ptlaoZw2oZkSJ7aRr1KtuFgLgS2hhqt4ulRnjnlxeegTcpc0IwDvgNOU8XE/jeWDLfClxT C5CyhONR7BedDZJxTbHUvjtoSpa1+fhoL4iAztqBnkZTh73uyFQjv6eXsbLkvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d8da59ddf89767fdd80f4a7a87549ec3509d9426 commit d8da59ddf89767fdd80f4a7a87549ec3509d9426 Author: Andrew Turner AuthorDate: 2022-01-12 16:03:41 +0000 Commit: Andrew Turner CommitDate: 2022-02-23 14:50:56 +0000 Fix the sanitizer header checks on arm64 We need to not include the MI _san.h files when builing some parts of the kernel. Fix these checks in the arm64 header files. Sponsored by: The FreeBSD Foundation --- sys/arm64/include/atomic.h | 2 +- sys/arm64/include/bus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/include/atomic.h b/sys/arm64/include/atomic.h index 415322f2a010..0c750f00379c 100644 --- a/sys/arm64/include/atomic.h +++ b/sys/arm64/include/atomic.h @@ -53,7 +53,7 @@ #define wmb() dmb(st) /* Full system memory barrier store */ #define rmb() dmb(ld) /* Full system memory barrier load */ -#if defined(KCSAN) && !defined(KCSAN_RUNTIME) +#if defined(SAN_NEEDS_INTERCEPTORS) && !defined(SAN_RUNTIME) #include #else diff --git a/sys/arm64/include/bus.h b/sys/arm64/include/bus.h index a87577b00f0c..b73106a2fe70 100644 --- a/sys/arm64/include/bus.h +++ b/sys/arm64/include/bus.h @@ -92,7 +92,7 @@ #define BUS_SPACE_BARRIER_READ 0x01 #define BUS_SPACE_BARRIER_WRITE 0x02 -#ifdef SAN_NEEDS_INTERCEPTORS +#if defined(SAN_NEEDS_INTERCEPTORS) && !defined(SAN_RUNTIME) #include #else