From nobody Thu Oct 19 15:25:22 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 4SBBNz2B5Sz4xZ1P; Thu, 19 Oct 2023 15:25:23 +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 4SBBNz01lKz4fVT; Thu, 19 Oct 2023 15:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697729123; 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=1hFhkW3M+g1J+MQTkth6YUX0tL9BqwjA4DFZ42ZoLso=; b=TBwbAtPFGXHmuxY7enpAkhM4zFtNCoUQAgXme5BXb08T972Z97La4SAXc2A071rtFGpjUb sX83xnJO4eXFHf35azckSq/CPW+hXp9dEWPoKfLCIzsAHePbOLgLNrLocvGEbmPLOQMToy KV7mutdmxi6AX9l5+6qmLozH+iQbZXZ/vdpY1k9svKvs87HAy/BjnDCKw3jYxwe9o80eix RDC/OKCy9FCqA4oJgEVBSGba4aVJCGlK0gIJHGFams0s3RMYAZsXOXDVJ0rRQ/6SXxkpi2 QQj6jiT98FIPLQdxi4FhKwv+uTeluLCbkfMmMxLEy/mu+o4+XZ1gVym8cvoUvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697729123; a=rsa-sha256; cv=none; b=oJiUDg7X9zcEugYVF8qdJQuGaZNl1i92wNasula9oRwH8t8sbuvx3YqNzXn08ayQVAldE3 /AIaJe2hnKybJu9Zere3KxBD3Ic9bs2CYpaOKSN+ttDh0/Cex4YjfK3YUHUJy2DtwtA9xw FfmZU2+GlR4PislcM4YDb9RuCF1MC88kO+z9vLSFaJc8m/s1iKTYf8f2T2rKgCHED/HEwX yYQlu/B8rxUqQ8aORnMGOvopdG0Vtm1lIGN6SXfgjusVc3krBJVQ38xioHDvZ/a2b1VvC4 w44Y9h1iX7CWL3x1+XBwftnzTIIA8AGm/ssQbGpBkDOGLz+xffZMcpOnHGABbA== 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=1697729123; 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=1hFhkW3M+g1J+MQTkth6YUX0tL9BqwjA4DFZ42ZoLso=; b=KupId1bStDnG1oUoLHQjJdexk3eHg+nB5D0c2ZU8eoJfCMvwftZECkTSsGwzdcowJJEzRM Xd3BLpFV5DHHSxTLSaAdEgRi0oFvMXXV1kHHeL5SwqoA86kfQNEz8CLHoOyYofbkZhFzr6 uE3Fd2DNRa3FiKqPJVbkB5XoXgQ3sPJxLQgNPOaGjbSUi+NEAl4b1E5QXQheQ9pZiKqPvB GO97CJ4hh4g4NOVFeYIp9YennvAIsb5iOmm1kVVQxT9R17g1m412sNP6KpEXtxvgTlSwJu 94NfpE13M4HTPhfbh/BhH/C68c7hzzxiBbGiPrVKs/zfhkNCUK5kCEC7tZF8uA== 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 4SBBNy6CTDzvdr; Thu, 19 Oct 2023 15:25:22 +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 39JFPM32078338; Thu, 19 Oct 2023 15:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JFPMtv078335; Thu, 19 Oct 2023 15:25:22 GMT (envelope-from git) Date: Thu, 19 Oct 2023 15:25:22 GMT Message-Id: <202310191525.39JFPMtv078335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: afbb8041a063 - main - 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/main X-Git-Reftype: branch X-Git-Commit: afbb8041a0633c97acb51ac895c9ae3cde4fe540 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=afbb8041a0633c97acb51ac895c9ae3cde4fe540 commit afbb8041a0633c97acb51ac895c9ae3cde4fe540 Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 15:23:33 +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 --- 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 440c21c918be..f235d72519ae 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1480,7 +1480,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); TUNABLE_INT_FETCH("machdep.mitigations.ssb.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); @@ -1488,7 +1488,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) 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); TUNABLE_INT_FETCH("machdep.mitigations.zenbleed.enable",