From nobody Wed Nov 03 13:15:32 2021 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 076811833CDC; Wed, 3 Nov 2021 13:15:33 +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 4HknM83CsYz4d6J; Wed, 3 Nov 2021 13:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 20064195D2; Wed, 3 Nov 2021 13:15:32 +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 1A3DFWXK055345; Wed, 3 Nov 2021 13:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A3DFW1j055344; Wed, 3 Nov 2021 13:15:32 GMT (envelope-from git) Date: Wed, 3 Nov 2021 13:15:32 GMT Message-Id: <202111031315.1A3DFW1j055344@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: 5fdfe78b42d0 - stable/13 - conf: Add a KMSAN kernel option 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: 5fdfe78b42d0995e3b6849c43cbe94eeb3c308d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5fdfe78b42d0995e3b6849c43cbe94eeb3c308d4 commit 5fdfe78b42d0995e3b6849c43cbe94eeb3c308d4 Author: Mark Johnston AuthorDate: 2021-08-10 19:51:03 +0000 Commit: Mark Johnston CommitDate: 2021-11-02 22:17:58 +0000 conf: Add a KMSAN kernel option Sponsored by: The FreeBSD Foundation (cherry picked from commit 30d00832d7733e60f5e030d335c129bfa77dd77a) --- sys/conf/kern.pre.mk | 6 ++++++ sys/conf/options | 1 + 2 files changed, 7 insertions(+) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 8cab54d0763a..daba78135c79 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -122,6 +122,12 @@ KCSAN_ENABLED!= grep KCSAN opt_global.h || true ; echo SAN_CFLAGS+= -fsanitize=thread .endif +KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo +.if !empty(KMSAN_ENABLED) +SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ + -fsanitize=kernel-memory +.endif + KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo .if !empty(KUBSAN_ENABLED) SAN_CFLAGS+= -fsanitize=undefined diff --git a/sys/conf/options b/sys/conf/options index 774850158221..c7fbbec08a9f 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -232,6 +232,7 @@ COVERAGE opt_global.h KASAN opt_global.h KCOV KCSAN opt_global.h +KMSAN opt_global.h KUBSAN opt_global.h # POSIX kernel options