From nobody Wed Apr 15 00:02:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2447C00144 for ; Fri, 29 Jul 2022 18:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237972AbiG2Swa (ORCPT ); Fri, 29 Jul 2022 14:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbiG2Sw2 (ORCPT ); Fri, 29 Jul 2022 14:52:28 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B41D3342F; Fri, 29 Jul 2022 11:52:27 -0700 (PDT) Date: Fri, 29 Jul 2022 18:52:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1659120745; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6AMlIlR/IA7h43fs/jnqbfHPC05a5PqX994y/JiTgek=; b=4SFuhuJv//l63IiuTbDait1NmdVZaxRPOwkXZPDgxsF/6BP8kuJCIvW9T1H7nlIaUU1HFR EIocm8DAPHpfnOxnG3ftP1rodIKJo45GTr8E4NiGSy5mLRvLR60q42AENM807WPOFUxXRF KNY+Zlou90QHSzOqCyOiUgQ2wKPbZlR8IWyeP6G8+hTVXMUju0CWW365gorjzf3uslUiLx BRL+JVxBg4z24W09vd/70nuOxhqVvBCAzDYYwear4neF3NzASAABx0rJG/n8/3DZVIbK9o udBo1ltdyYwoxl73xyjtl+JxbBj6O5DXWKzp9nwsjMwGrSXs3oRmbm3HyfQY3w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1659120745; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6AMlIlR/IA7h43fs/jnqbfHPC05a5PqX994y/JiTgek=; b=iYquR8hfoqiu5AHFKYwZlYnj/2NeRodWvdK+eFsshVyV55LGNypdJejZVTUG6sgTs3Ypa0 EdQxeLd2LLq3rmAA== From: "tip-bot2 for Eiichi Tsukata" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] docs/kernel-parameters: Update descriptions for "mitigations=" param with retbleed Cc: Eiichi Tsukata , Borislav Petkov , corbet@lwn.net, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220728043907.165688-1-eiichi.tsukata@nutanix.com> References: <20220728043907.165688-1-eiichi.tsukata@nutanix.com> MIME-Version: 1.0 Message-ID: <165912074412.15455.16713302879881825177.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/urgent branch of tip: Commit-ID: ea304a8b89fd0d6cf94ee30cb139dc23d9f1a62f Gitweb: https://git.kernel.org/tip/ea304a8b89fd0d6cf94ee30cb139dc23d= 9f1a62f Author: Eiichi Tsukata AuthorDate: Thu, 28 Jul 2022 04:39:07=20 Committer: Borislav Petkov CommitterDate: Fri, 29 Jul 2022 20:47:07 +02:00 docs/kernel-parameters: Update descriptions for "mitigations=3D" param with= retbleed Updates descriptions for "mitigations=3Doff" and "mitigations=3Dauto,nosmt" with the respective retbleed=3D settings. Signed-off-by: Eiichi Tsukata Signed-off-by: Borislav Petkov Cc: corbet@lwn.net Link: https://lore.kernel.org/r/20220728043907.165688-1-eiichi.tsukata@nuta= nix.com --- Documentation/admin-guide/kernel-parameters.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index c0fdb04..cc3ea8f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3176,6 +3176,7 @@ no_entry_flush [PPC] no_uaccess_flush [PPC] mmio_stale_data=3Doff [X86] + retbleed=3Doff [X86] =20 Exceptions: This does not have any effect on @@ -3198,6 +3199,7 @@ mds=3Dfull,nosmt [X86] tsx_async_abort=3Dfull,nosmt [X86] mmio_stale_data=3Dfull,nosmt [X86] + retbleed=3Dauto,nosmt [X86] =20 mminit_loglevel=3D [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this