From nobody Sat Apr 20 10:34:48 2024 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 4VM7Dn3LSfz5HWPP; Sat, 20 Apr 2024 10:34:49 +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 4VM7Dm6gs8z4T8N; Sat, 20 Apr 2024 10:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609288; 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=HTiDrbNL2OTFfdRZz/jrEDt5cuatR9JOgbeym73t1N4=; b=FD6jbRe7cucf+NcKlhznQjNDPDshNnmZiCnhq39OwH+EwROJmNjkioVEjnoH+IhyWw+2Uq 5pHctL1GNcLXAl/F4NZh3rRGFgQ0aM+i92WLxAiu7dRoAzD45w/wglY2itWQnvT+0gj624 vgkl1h/uHMz83b+q/0Ud5kagY6+Ss+khqU6xBp8yx94XfK6Kn/AoH/yLL+jzrm4uTh2dYz 8ekWd8vIiGN/lP7T32Te4HPgS6kvJVt/L4onnf9SGiU85c+s3Po6vBsY8Ev8+K9zEPPfRC yUYeSP+VIkuIPRb3Bnb/fDID9X9xl6HYUiTrfai1Qnf00j80kfWFUa/6538VVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609288; a=rsa-sha256; cv=none; b=lBM72wZ40oucb4WkparA0Fvsdb0llueHsNigRR6PyTLtd9PcIJdXVujMbkGZ/y5XsYss9O HR0Uh98ynDJXHHQVOOU4UGBKKewANJM0R0zG/VI+YfZPxcuaLjehHUdXQ4cNDbh+gzTwAx aqHLTf4/mV0qkz9BOwtYx8Pu70xQSNmqqZ9AcJWsrSioCIE6PbE+tGbDSeg1dhOXXhpbVl u1AzApAjp4ZDHhgk6TolLFAyKec6Pn+ZjocwXK08avvcXPLSLXnGaXItWmgWEkJSSrDSTY D7i+YhzNSPx6A46+wdseOhmMMISIKaUxkd/5CSlYK7Vdk99hFFTj5ILx18+/Xw== 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=1713609288; 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=HTiDrbNL2OTFfdRZz/jrEDt5cuatR9JOgbeym73t1N4=; b=tya+g8ZTmcKUIV6v30Lu73NyCE6tdY6RHzfZA5LpijTe6tmLaRZQBHDTwqOvaPm2sWPw7B +CGk2WaaYSwWXPRswogBdj1lLdX039PZ3CFaduPUOIb0o5S3GiwcKy8Hz/0V1x2akxEe+i Jz64GR4T7YRT1g2aKz9OQ+Xd8Rj13F2rcfxxaJZlVmwi0mBLexg1OiInCnxWZAb0WUmKcv f9+ybuK1+cmf8l8g1ze1sM9MBLd962boHBYmVqgsBVIpQZ8W6TnQnmueg1f0OcJJNoT47P KsrFv8iphskUfexBKRuF/WcQN03P4Qo8S/BzN1ujzlcUJDbXt97dA5X+SWsFhA== 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 4VM7Dm5xGRzZJY; Sat, 20 Apr 2024 10:34:48 +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 43KAYmnh014338; Sat, 20 Apr 2024 10:34:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYm7f014334; Sat, 20 Apr 2024 10:34:48 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:48 GMT Message-Id: <202404201034.43KAYm7f014334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 89cc83362f4d - stable/13 - Fix GENERIC-KASAN kernel build for amd64 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 89cc83362f4d4d5733a2a7446b0b4be63596e09c Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=89cc83362f4d4d5733a2a7446b0b4be63596e09c commit 89cc83362f4d4d5733a2a7446b0b4be63596e09c Author: Dimitry Andric AuthorDate: 2024-04-07 17:56:03 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:29:09 +0000 Fix GENERIC-KASAN kernel build for amd64 Work around https://github.com/llvm/llvm-project/issues/87923, which leads to an assertion failure compiling several kernel source files with asan enabled. PR: 276104 MFC after: 1 month (cherry picked from commit b811dac2115a6ada606c03d7d823a95d11c5f3c9) --- sys/conf/kern.pre.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index b47b89daa008..ea3cc1986575 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -119,6 +119,13 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kasan \ -mllvm -asan-use-after-scope=true \ -mllvm -asan-instrumentation-with-call-threshold=0 \ -mllvm -asan-instrument-byval=false + +.if ${MACHINE_CPUARCH} == "amd64" && \ + ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 180000 +# Work around https://github.com/llvm/llvm-project/issues/87923, which leads to +# an assertion failure compiling dtrace.c with asan enabled. +SAN_CFLAGS+= -mllvm -asan-use-stack-safety=0 +.endif .endif KCSAN_ENABLED!= grep KCSAN opt_global.h || true ; echo