From nobody Sun Apr 07 18:00:21 2024 X-Original-To: dev-commits-src-main@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 4VCKks5X9wz5HFWG; Sun, 7 Apr 2024 18:00:21 +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 4VCKks50Trz4SRF; Sun, 7 Apr 2024 18:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712512821; 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=kyh0i9VJlVDtGhyQro0bh54VS3qTsxGEuNii8d0K4UI=; b=H2JlPVTdaRWLs8/teKJ1dW70XUEGvaITbKO3HU42dl1c8hW4Fr8LmHKu55qgROdYDvywoB m2ms7D2a3FdTzFUup9GsfnQV9ASEegYOQrR5zhYu54C67QBRX5gUKUOAMGhHT/ZcBXFHdz zGPcF0tiCuiPBnb2MNw3q3g6lE4dQghyXsLng0eefR+0DUHjiSZNV0I2ZWlpQmBo8hjvgq XTNGnET3FKdrXeoC0+Yf2oMTwGEwJwKrNrEW/cne6g/ZQ6XcrUOioQ1vlmX8VrQsimCtAr Z5jHDW+Dsk7EOkE8/hh/rceOZjHDRqrvMV+iC0yeAM1Pom7a5dhPJs7p7G/nFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712512821; a=rsa-sha256; cv=none; b=DJbd9y5oRUDqRavdO+rxJf+Yrh2xfJKaLqwWyFvrXQ6czXKSi9u7yV9GDm6GUO8tIJe+15 vqMPpj773H3HU0YJ4cCdxW0DtWTPGItbHe4dRgLIbcqfBgfesryvab03TDDuVPL0St3QgT ljagCvPso8+d2bBT4YCLAA/rglY7ej03kAWYxMBmjEapJuqZwDH2pQFitE7eGJ4CvA0QW2 yTI2U4Mc+TlwPknlffW8exfeFxg+xchSBpBd77A8XNDs8w9GtCSCxhXb6czQShlODr3v7+ bgFrWh3WSWFlpuH7FfDXZ+eeMVy2osa0gQ5XtthWE2bTyYP0M9DqqjEcAp2nyw== 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=1712512821; 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=kyh0i9VJlVDtGhyQro0bh54VS3qTsxGEuNii8d0K4UI=; b=fZZr/ApX5PsSUelIjfzoWpnzgJEntaOOvwMSpAC71vNylJD8qkiJoIrcwn3VzKv/T9ogNA g4t6pQmZfBSsaNYhamdcW6fH6nmITjKv377xMlc50YIVi2RNFjza7ebRM0mkHXsHCORe6e GaDhp0OXngvQOzk1MAQVUayiXa8QxlsHDlXYACdZzK+RszWCoGVx0lVPTwDT6wbW+EdpUl EnRtc/0Gp1H1v/0zI+G2bLTkbogDSgdvyEmBYjWUrLngprlYx90RA/m2jgvf7Xyc5Ipg1C ke/5z2463vpdwwbQ3OFovWCvZFAMSwJY+BNLoM7M5nNyU/k+9vBrJsytHleUUw== 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 4VCKks4bl2zdS8; Sun, 7 Apr 2024 18:00:21 +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 437I0LOo037793; Sun, 7 Apr 2024 18:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437I0L83037790; Sun, 7 Apr 2024 18:00:21 GMT (envelope-from git) Date: Sun, 7 Apr 2024 18:00:21 GMT Message-Id: <202404071800.437I0L83037790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b811dac2115a - main - Fix GENERIC-KASAN kernel build for amd64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b811dac2115a6ada606c03d7d823a95d11c5f3c9 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b811dac2115a6ada606c03d7d823a95d11c5f3c9 commit b811dac2115a6ada606c03d7d823a95d11c5f3c9 Author: Dimitry Andric AuthorDate: 2024-04-07 17:56:03 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 17:58:52 +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 --- sys/conf/kern.pre.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 6bf647f5c3ea..567c68e5887e 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -111,6 +111,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kasan \ # upstreamed similar to: https://reviews.llvm.org/D98285 # SAN_CFLAGS+= -mllvm -asan-mapping-offset=0xdfff208000000000 +.elif ${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