From nobody Tue Oct 24 14:37:43 2023 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 4SFF5h1BTXz4y6Ln; Tue, 24 Oct 2023 14:37:44 +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 4SFF5g4wMLz4l2D; Tue, 24 Oct 2023 14:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158263; 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=P507d6Lj+1sRsXDjVxgWlWxf+e44ep4OyaBX6uNTAXI=; b=rHldZcaUFEFbLQVjBHKjedppA7JHQWJf506S1bFHk6u1lQqQCcMSpfKsqNY8AZxpSovk+z jmqZLPf/YY1UReCSLtd7g82nfZcSSwefQGCiAitRf6aIMxjE0WMQfY2jAN0jegWYJQqKg/ fTtOCEwEWpaCRPpKQKjUr4eyX7oDDz0sKnvLeTEj9o6SGPZmgy+szI3tUhh82jGWBAxGYn wmFpuWL8cMvVz1xuciBbt2t1XZaBtjG6ABxaHAHmsul/XorYcEPOa/QswGYwJScQSUiWVn n9i2JX0bswljsVzyOhfN79m2rN9CN8PHPA/lDrFPWPeQIUtaVwRaTcIWO2qW3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158263; a=rsa-sha256; cv=none; b=c1NR2Bfz/VHnD0DkhOOKV83uG3wWmNLnRLyo+fYlVTeNvw+cyXcW/UCDRFONeogM0QYk5h 5+ohg5BNFr9W/hE3lzibvJ/3YXFBTejOfyT5o1Y0ZRdJOMYK8YuugPExFEp8AXvoykY7W1 cVFZMb/p58fjzOa1lU4bHm8zKbdCTU0ep5Wauu7OXoBRyPzkePpSJi0AigiCovD0Eflgbx Q5lYYeDNQkeAYeRJ57FcOTYRHaR8Jh+YSx4dhWhQWANDpEDXR1QIbCSG1TVtYy0vToKhvQ xwdw9YMBgrVgqOKywNtWiq30lBMCzRxSfACXpFiQZy5wdeNX1hvlz29G/OYnkQ== 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=1698158263; 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=P507d6Lj+1sRsXDjVxgWlWxf+e44ep4OyaBX6uNTAXI=; b=OGwymgnusvt1QX7H8RDTzKNY/Nt0wRU7kpmmmXDQhYiYVpUnSR39S8jzdz+cI/gEMck/3Y kZ9rKgFHJ0pIJUcpMXw06GotishGLi7YH80iViUKL6ptyX4Gml/t+yk7fLYd5EQ5OBPqdP c3m1YkdM37cXLWqgQuRTh6jahzuJ4TMObIy+f7r30mYLhpyo+LgZV/WQT67tQQMwmokq7A g1MvG1R+FqYTlH2apRd+VG75YWahjepODWgaSeUrpoptkTRmIiYMe7afbZBL4UvBKVaDZx ettnFmOS7jlxOeb7jT1qZioQXwruMKPrPG2nNI5s6/8o5kci9d12BSwR/SK3Eg== 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 4SFF5g42DQzBy6; Tue, 24 Oct 2023 14:37:43 +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 39OEbhlM089546; Tue, 24 Oct 2023 14:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbhvV089543; Tue, 24 Oct 2023 14:37:43 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:43 GMT Message-Id: <202310241437.39OEbhvV089543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8cb6243c3085 - releng/14.0 - kmsan: Add corresponding sysctl knob for loader tunable 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8cb6243c3085b43e82096c775d8059ca61461318 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8cb6243c3085b43e82096c775d8059ca61461318 commit 8cb6243c3085b43e82096c775d8059ca61461318 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 kmsan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kmsan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit 1d2b743784f7527a6840fe35ddb7e34cd41bc17a) (cherry picked from commit 1b289728e93d1000e6ca03354c8bc4209ea8da51) --- sys/kern/subr_msan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 57caeb454b42..54948370a14a 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -108,15 +108,13 @@ static uint8_t msan_dummy_shad[PAGE_SIZE] __aligned(PAGE_SIZE); static uint8_t msan_dummy_write_shad[PAGE_SIZE] __aligned(PAGE_SIZE); static uint8_t msan_dummy_orig[PAGE_SIZE] __aligned(PAGE_SIZE); static msan_td_t msan_thread0; -static bool kmsan_enabled __read_mostly; - static bool kmsan_reporting = false; /* * Avoid clobbering any thread-local state before we panic. */ #define kmsan_panic(f, ...) do { \ - kmsan_enabled = false; \ + kmsan_disabled = true; \ panic(f, __VA_ARGS__); \ } while (0) @@ -142,6 +140,11 @@ SYSCTL_BOOL(_debug_kmsan, OID_AUTO, panic_on_violation, CTLFLAG_RWTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); +static bool kmsan_disabled __read_mostly = true; +#define kmsan_enabled (!kmsan_disabled) +SYSCTL_BOOL(_debug_kmsan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kmsan_disabled, 0, "KMSAN is disabled"); + static MALLOC_DEFINE(M_KMSAN, "kmsan", "Kernel memory sanitizer"); /* -------------------------------------------------------------------------- */ @@ -599,7 +602,7 @@ kmsan_init(void) thread0.td_kmsan = &msan_thread0; /* Now officially enabled. */ - kmsan_enabled = true; + kmsan_disabled = false; } /* -------------------------------------------------------------------------- */