From nobody Sat Oct 21 14:47:16 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 4SCPS45j3Sz4y6G0; Sat, 21 Oct 2023 14:47:16 +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 4SCPS455RGz4Mbw; Sat, 21 Oct 2023 14:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899636; 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=aoF5h2l0V/FfGK0RKIKS5OintKC/4F/4KrKny4IuHWo=; b=TFGxrjyYeB/45lm8dUsoqjTX2GlNQ2cPzVqqhvs/5bS9Bgovnh94KX6Inz4FKMFw7B+gRx 6844wHsYV3sWz64jyV+8RpxKsIcrjrUYwrvrKcVy7OLkbLl0Jaa6RbDCsnyMNEuJae2K9g liKlyUUMRWXtx7Y37Y6A01+cpa7t6u0Wou1kjKEIB1u4tWe3689+wqQaRmtX7pbEyGjWFc Yd+rKha3FbEwtELLkCKVLt031lLJSsfLicO1oMKPvCfWmHfmSP5PbPGGZLOAliwTSj1Yxy YkWiO+8y4xpO8CLfsQUlfCxAt6aS8wF6syWB7/fkxHpfYsqZhJehOZvLXPvoCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899636; a=rsa-sha256; cv=none; b=gx/2gYoba90Zb87iOse/JavZPcgo2JUfqS8WY+103m/OxVgSoBDS4yin5GPkil8B7YWO26 u7Oej+vBI1xb9Qha/MT/H3iej08Fj2GyOEZHd6BJJW3B8xxOJ3In2bLVkokr/2Q+67pbb9 Mc0QLsV3LiVeWLJU/3ZzV+IN74gq4DtB2nNO5uuRdU6O60iDRoxim+qy3w+uaTKjHQnePT HUBhIT7xj0Z6JfkrUMtrnk5+TQpyF1DDdK84Oi85+F6VQVSp9FCPrAlusFQbGzF19XqpEb qP3gIkbrQr4r8JW8QLQJoiSt67G65/RKmTJaMLikkq8vB1H5nJx1KeaW7bjhfw== 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=1697899636; 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=aoF5h2l0V/FfGK0RKIKS5OintKC/4F/4KrKny4IuHWo=; b=pVZ1YxhRCBSkhlSGcYJztnvYWJLOMeVOA6Fhc6laH/PS9IYRyGnxxgL29vuSQaTZ8Orhkk drXyKcYREEwPAZvvJoJg2K30PsOawRqsUIbWwBUZOrU0Xryd3y43IMPX2GGcxPqSlFdrfG rnSo5r4SGAV+WXAIhQAHDcHwpvlavLxg2ii039BkGpk6irBYi7KMNaWkXZ/YwGAz0KS8pV BMz7ZE/PrYMxfAaNvSfrqeJaqa7E9nxzAKZa2TT6bM+m2YNUBtQbZo9/lrfL7IGWRu1yZ1 QEuxAjH9Xhbqj1/s1g5wROYuQ1/crbqvrYEUog40on1Iivban1C8Aa6GgzwUWA== 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 4SCPS43s7mz4xh; Sat, 21 Oct 2023 14:47:16 +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 39LElGAD006073; Sat, 21 Oct 2023 14:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LElGli006070; Sat, 21 Oct 2023 14:47:16 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:47:16 GMT Message-Id: <202310211447.39LElGli006070@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: a72ab19000bd - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95 commit a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95 Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:45:45 +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) --- 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 145d373b1117..b0b7824c4b4b 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1486,7 +1486,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); @@ -1494,7 +1494,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); finishidentcpu(); /* Final stage of CPU initialization */