From nobody Sat Oct 21 14:53:47 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 4SCPbc0j2Nz4y6dx; Sat, 21 Oct 2023 14:53:48 +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 4SCPbb71TDz4N9j; Sat, 21 Oct 2023 14:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697900028; 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=1LmN58rkB2x76K4itQTIwgICLaP02iqfw1Jn2C45BIU=; b=XCcsBZ2pBxFdAnLeXqkXmcYVmHuAnBcZNydhmo20MbzBvRmCKBoJ8qmzEVszZMIpy5iJss HcpI4rMGiQfajfz2yW/CPUM6xJnROH3IYHEpQ8ohesYnhOYb1At1DcQHt9Dkcptppd1Mnd mwgjikc7Ajyt0VMpzg5G8pyRVZttaGlGGIEgGpascp1droUt3/KqcmTxmHBzBGN9PDMsyd P5Eh1k+rnAWpfFO5Wb7+lV9GPsAtsklplOsyH9e6Ue7D7KewlLV2lbeMVOSKyZE2J9/JK0 0XjQTFughhNf6L21cppcUPnWFgpEK6exlxcnrTmYGNDKUKgs4uUZSL76zHTXrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697900028; a=rsa-sha256; cv=none; b=fiGFfIwcvxVybZbio4Oey+ph8tw00L2ZUFwyJW8HGs0AWrkVQYI9+bjiBz4l5ovuukrskY Z7V8xZeJoPWl+UDgTWEK4s9zxrVRH2f/fPhCLWetktAOaBnsdAVUxnQdd1ZyIRNSYeWfax 0eV/6tl7uHy512pyR4RMwEeelXdreVbl29ciL25LG/A8gd5AaXua5tLBEShkAMq5qm74Cy kaOWu9i30nTPopRnZNPD1JPFOb4HGCoMxe8bFH6WZo/6cnX3RC30rR0VWfdCi7OJ7MtTY+ ds25X9Yvf9IvokBM6DVJjpHSVYIdIckUqfpjvVN4t4r0j67hua7yh3ikljjwAQ== 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=1697900028; 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=1LmN58rkB2x76K4itQTIwgICLaP02iqfw1Jn2C45BIU=; b=JC/kucGNIg56VZcm0z4+Tx5TkZ+GFb/aq3BYNA1aMNtCiU9ZOhKyxoKunaPgf2j0RDYVel 7Cpp4pPIksUX/vfw/vB22YdZ8yGDzteoevxnfr0p5+UpFMKGxStD3zQIZXdEwDo3JBOW+a xB3bAl3ZuEDhDcqwpTKKTi0dI7ZcQgAQfn8OigQeu1/xPWJ6b23leDYI/hsnqwaA1imMJl h0zUgb4d2vEgjJP/mEM3X2PzTFmNwQBQ2yNmq1yrQJWNfR/kzVjfVt1TfDqxDjL63jqbNm demkYQENMMuPYUksbjwafTw0Wh9Q9Hw2Bse0j/7bOoIqrS27dVQ68hXxo7QmGA== 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 4SCPbb648Rz521; Sat, 21 Oct 2023 14:53: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 39LErlQk022103; Sat, 21 Oct 2023 14:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LErl7T022100; Sat, 21 Oct 2023 14:53:47 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:53:47 GMT Message-Id: <202310211453.39LErl7T022100@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: 5173f00ae2e6 - stable/12 - amd64: Fix two typos of loader tunables 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 5173f00ae2e6c02b65ec95c428e7b50aafee1e5c Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5173f00ae2e6c02b65ec95c428e7b50aafee1e5c commit 5173f00ae2e6c02b65ec95c428e7b50aafee1e5c Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:50:51 +0000 amd64: Fix two typos of loader tunables To match the sysctl MIBs and document entries in security(7). Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an error Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling mitigation Reviewed by: kib MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42249 (cherry picked from commit afbb8041a0633c97acb51ac895c9ae3cde4fe540) (cherry picked from commit 032a0b44541ffb669a4553105c6f6343ab4e3a67) (cherry picked from commit a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95) --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 1e663382f140..c0d501707bb9 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1797,12 +1797,12 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.ibrs_disable", &hw_ibrs_disable); TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); - TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", + TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d", &syscall_ret_l1d_flush_mode); TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); - TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable", + TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable", &x86_rngds_mitg_enable); finishidentcpu(); /* Final stage of CPU initialization */