From nobody Sat Apr 20 10:32:42 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 4VM7BM06Ryz5HVxS; Sat, 20 Apr 2024 10:32:43 +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 4VM7BL4lmjz4Q4R; Sat, 20 Apr 2024 10:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609162; 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=rIbDGK1+iuzvyO7VpVNixn4vdMBtmgtYygcaXfdmun4=; b=ubl8Q5q4yO/heVrm4zaI/yYcoGNvBpcZao5xXnsG+1+SuBOwTpvFhPpycsfgGYLhDW5wgC mrW1KhLQnhRO8U6GTEFXSU3HosP6/WGXtbYn+rtuxBR5raeobVqEJtTclrn0/YyHrM1aZq HQSLTwZOuqRrQ2naGTgV8DrEWgJqdEZ8Zfz+y52fKMWb+hi3fzCI3ht0Xeo96wPGjDyotW U5sGV8CL11izd+g5jSJE1ED67zw2fN/LwaFW2O5PLze6giPfjH9jWo4BTg2ZkjAa8VtRBY xsi5GY79mIic7Yofz+u+U6kPYYufgZ70iSbVjnfW7UKFq7XcW/IG3SW7SDp9hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609162; a=rsa-sha256; cv=none; b=CKu8UxiBtWnZblNfEdvNUVnNA2C1sMW06yGdbrLO6qQrpKT3ZApHn4kc53GNktO9XLXnCV J78P000IXDfkhgxQfIDsnHn+jmIeZU/iWEzp8sZsR8X8CJzG7clyi/mQXh+h1s1uAcFnh+ Nm2QicKGONYLlqWZF0NJ96HukFvj0abnZbKIZnsQJO3eEA302vCEGKtPTrJd3IEcSYnkMk hBkXIlWkM4UJ9nP5h7BmORrM7uTSa7W7xAaQiM0zQ5t/5p8N/4tNcFCGH20gjunldlj6vY u02wFs8l16IkbCBxjoRKz+8o+ebFbrgYOPoKi27fUaQqkBZRzbFy2suM6NdYrQ== 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=1713609162; 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=rIbDGK1+iuzvyO7VpVNixn4vdMBtmgtYygcaXfdmun4=; b=UwJFqmH4qPK8V7trd/TyMs1bP1QqDE/VHYqPMv1NlGkw3SMJzX4DQztVyktzdR64ilDhIN E7czlvosfU5tkVXSD4DiKC5/Uwow38hEP1KDYHImdkTHYcjNUAq6v0p2pzTSyz4sWPhtgy dg5ycTjZwxRqhwgbWFiJ+RN3CaAeFELdS/zhWaZrHeH5FHKNm2vJhfDh1az87QC541w3zR 7H8oiZS5IF9Y0qkaupELrapKu1PKd1hthdV1e1wMGZBxHCS9ST74IJfPRhVvBN/ZJvPkYj 8SEBKGylQro/OGHRTzoMnQFsKH0nkBo835RAQ3HznSg9kEt/Ndd6fDlMthWJ5A== 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 4VM7BL4FrMzZ2t; Sat, 20 Apr 2024 10:32:42 +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 43KAWgHl011681; Sat, 20 Apr 2024 10:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAWgnY011678; Sat, 20 Apr 2024 10:32:42 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:32:42 GMT Message-Id: <202404201032.43KAWgnY011678@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: 924cf780a23a - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 924cf780a23a6c01638ee9865dcd63eb21c72b4a Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=924cf780a23a6c01638ee9865dcd63eb21c72b4a commit 924cf780a23a6c01638ee9865dcd63eb21c72b4a Author: Dimitry Andric AuthorDate: 2024-04-07 17:56:03 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:03:25 +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 | 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