From nobody Sun Oct 22 15:04:47 2023 X-Original-To: dev-commits-src-branches@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 4SD1nq46fHz4xR4T; Sun, 22 Oct 2023 15:04:47 +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 4SD1nq3Zw2z4Lvm; Sun, 22 Oct 2023 15:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987087; 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=JS6em8wa5TN3H3zLI+nJsDYyYUS01dkEdLMERT3ZnXo=; b=eOEPC4jVTrXfmb09H9DClyBZCvsEcBpQYtZ0nKVllHwHuXctjzoyCmsqOaQEiafvtCmkZN sM23HL+6kXy9oymwn3pEIgnXmaUVPvQZ6vIAW44YsuGWjwXyxpQQTx1pt39Z7VMiuy9AHN o6E1G65wa1SAJNusSz8COZ/4GF10GFdVwB/qVfBOgQcUAZShST6u4X+vwryHeeUiPkp/C6 MYTlIL42kztGKUSkOOfmNmPH++xfUG4/PtQZM3HfDPGTr6jUpLB1bDv7EH749kMzp9vSmj SdqEo3vIL1m0ZhysuLpN7c+YKaeyGUT4GQ1ZfJ2pyjAPMSCXW1aiLApDvVczNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697987087; a=rsa-sha256; cv=none; b=LLA2PThIwgKvenrtSm5049AbG0fxcRUdkBoC92NeUFs/aFWzgCt6WSfskmOs8KJQMz5o1Z gEzr9Sl/PBENmC6abWhy0kEShzittNhnpFEtAmWCheE83KYwZhBTSRlQl/DY/yoqHhcvgc hZUpnlTaD4RmZemQE9y/KrkqbVF0yx8OBRGnugXGVSa06SCj0Y5NaFKsD76wn4+kTfu9Ih F94m7qlEzav/0zBks1m2yNl41zWXyqZMotCM8WLPJGipk2skzxFoKMqphoPtw4TUQ7TXMA pC35k9v4U5kwgAMXuVDiDE9g9fYrkwQJV2hijE3Ojm1ONkF7Ht/CUESP65+Uvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987087; 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=JS6em8wa5TN3H3zLI+nJsDYyYUS01dkEdLMERT3ZnXo=; b=VvMedqk3pfYLl1CyGLredW9ZnilL4w0BSQBw/BAv2br1rwfXFZcIixz6nBo3tn799U0LsH sapbPz445W/7v9rbOipRvV4iGYI1huYNPCeENAbhzUfJy6SsEW7BnUl8uxnsmtsuLYK02K 9QaysdJY3C5E6sEoQ/f/ZOoM6ONyp7XKfyW0cIW8X/usr4iZTJAKIpJ9oehV6hSeytNoyO gtx/mQtvtV802nODKxOx6x0v2N5gOoSWSrwIMZ/ZzfelkoDYpV4TO5HX316TGoP2JAstzo 2YUvn8I2YgeS9sUKaf1vF+G5QdRbpNXxzlxDB6IIPGckOJMGOYFoa4rvxWPJqw== 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 4SD1nq2fxRz12Cj; Sun, 22 Oct 2023 15:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MF4loS033550; Sun, 22 Oct 2023 15:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MF4lJu033547; Sun, 22 Oct 2023 15:04:47 GMT (envelope-from git) Date: Sun, 22 Oct 2023 15:04:47 GMT Message-Id: <202310221504.39MF4lJu033547@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: 41d1dc7005f0 - releng/14.0 - kmsan: Set -fno-sanitize-memory-param-retval for now List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 41d1dc7005f010074c1e6f7fc8adf44dcbd473cf Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=41d1dc7005f010074c1e6f7fc8adf44dcbd473cf commit 41d1dc7005f010074c1e6f7fc8adf44dcbd473cf Author: Mark Johnston AuthorDate: 2023-10-16 19:45:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-22 15:01:26 +0000 kmsan: Set -fno-sanitize-memory-param-retval for now As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields significantly smaller code, but the KMSAN runtime interceptors need to be updated to stop checking shadow state of parameters. Apply a minimal workaround for now. Approved by: re (gjb) MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit b6c653c9746342b373af01979319b3cb123b2872) (cherry picked from commit c89523d1c4be8f3408fb591261f3093b65dbb675) --- sys/conf/files | 2 +- sys/conf/kern.pre.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 8d38b9cc8a2e..b9763d167812 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3871,7 +3871,7 @@ kern/subr_mchain.c optional libmchain kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ - compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fstack-protector*}" kern/subr_msgbuf.c standard kern/subr_param.c standard kern/subr_pcpu.c standard diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 4d37cd4156f0..158175eb6899 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -122,8 +122,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kcsan \ KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo .if !empty(KMSAN_ENABLED) +# Disable -fno-sanitize-memory-param-retval until interceptors have been +# updated to work properly with it. SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ - -fsanitize=kernel-memory + -fsanitize=kernel-memory \ + -fno-sanitize-memory-param-retval .endif KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo