From nobody Mon Dec 1 23:31:56 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 453B41E1A17; Wed, 26 Nov 2025 22:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195342; cv=none; b=WF2iZbBIFgreHGOcrVhoPPfFUvmAGZqqf4oBAHKqcqMCm3HEboY/Csv5sV5JHxpKeRX7AimWEsPjl3kcLlu2ndbFqrXD82Vh8ZMfyUGXbxsHAqyCaCCH82sx9AH07on8Yr5hmrYlSLrrdX7nnH2z1P33arUOJpkGpO2muuXgaZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195342; c=relaxed/simple; bh=G2JOWn9yvfYt1qFCSza1jyQm69uDU6B8+P8t0sq/pAU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=SyInJ655ANQJmUPZhwPSnNQ4PO4ZynQTbETB9/KIwqKlBEvT4HczFvZ+hROA5gLCJlJHYdumnTMWl2PurjyOX0d8HmfLPRuFptNzY13wYxFNifZrydEzyKd7EySNk3sdzznfwqekzoWShJU/V0WdGFBCcTceyxOu9StHCL2y2fk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Oilujy0m; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Oilujy0m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764195342; x=1795731342; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=G2JOWn9yvfYt1qFCSza1jyQm69uDU6B8+P8t0sq/pAU=; b=Oilujy0mpeZLWXD/AUnTSDGC+7JYaGKFKJGI0z5mc9WQYIDZ4WNOWvPH 36+jl8jOLcSG19yEArnoV/wbtKNw/nZ0mjBHvz0IaNs+9T0H0DrBfIJ36 6BGX5uAJoc9+AbVZVlDFjDiCljSLpBBQp/shCs6l1Q/21tgtIT4+b6gma LyyRe1VI/V5xDmt1DCh7aMkKCkXZeUiLY+CH416vD38jxLaC7JeOuglmr adQLPoGg7WUv83cxx7D6sk/7EpIKTBoDBtvOGGQ5/mqwvKarsXWDdyUhd /YgAs1j7HRtDpxG0qAOu72ssxpyAc5gFIBlZcbjSooW5AOMkGIrtA37K7 Q==; X-CSE-ConnectionGUID: J2n4xmahT9Go1uU8Tjy6XA== X-CSE-MsgGUID: 83pnxrFJRxWkMltbwqhi9Q== X-IronPort-AV: E=McAfee;i="6800,10657,11625"; a="77716029" X-IronPort-AV: E=Sophos;i="6.20,229,1758610800"; d="scan'208";a="77716029" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2025 14:15:41 -0800 X-CSE-ConnectionGUID: yUvYHFdLQWu8pGoJrRBkYg== X-CSE-MsgGUID: UyImgWEbRCaOOKFwZJmNDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,229,1758610800"; d="scan'208";a="193084780" Received: from guptapa-desk.jf.intel.com (HELO desk) ([10.165.239.46]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2025 14:15:41 -0800 Date: Wed, 26 Nov 2025 14:15:40 -0800 From: Pawan Gupta To: x86@kernel.org, David Kaplan , Nikolay Borisov , "H. Peter Anvin" , Josh Poimboeuf , Sean Christopherson , Paolo Bonzini , Borislav Petkov , Dave Hansen Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Asit Mallick , Tao Zhang Subject: [PATCH v5 4/9] x86/vmscape: Move mitigation selection to a switch() Message-ID: <20251126-vmscape-bhb-v5-4-02d66e423b00@linux.intel.com> X-Mailer: b4 0.14.2 References: <20251126-vmscape-bhb-v5-0-02d66e423b00@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20251126-vmscape-bhb-v5-0-02d66e423b00@linux.intel.com> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This ensures that all mitigation modes are explicitly handled, while keeping the mitigation selection for each mode together. This also prepares for adding BHB-clearing mitigation mode for VMSCAPE. Signed-off-by: Pawan Gupta --- arch/x86/kernel/cpu/bugs.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 1e9b11198db0fe2483bd17b1327bcfd44a2c1dbf..ecefea3c018117031ea1d1ef8f4= fca6e425a936c 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -3231,17 +3231,32 @@ early_param("vmscape", vmscape_parse_cmdline); =20 static void __init vmscape_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_VMSCAPE) || - !boot_cpu_has(X86_FEATURE_IBPB)) { + if (!boot_cpu_has_bug(X86_BUG_VMSCAPE)) { vmscape_mitigation =3D VMSCAPE_MITIGATION_NONE; return; } =20 - if (vmscape_mitigation =3D=3D VMSCAPE_MITIGATION_AUTO) { - if (should_mitigate_vuln(X86_BUG_VMSCAPE)) + if ((vmscape_mitigation =3D=3D VMSCAPE_MITIGATION_AUTO) && + !should_mitigate_vuln(X86_BUG_VMSCAPE)) + vmscape_mitigation =3D VMSCAPE_MITIGATION_NONE; + + switch (vmscape_mitigation) { + case VMSCAPE_MITIGATION_NONE: + break; + + case VMSCAPE_MITIGATION_IBPB_EXIT_TO_USER: + if (!boot_cpu_has(X86_FEATURE_IBPB)) + vmscape_mitigation =3D VMSCAPE_MITIGATION_NONE; + break; + + case VMSCAPE_MITIGATION_AUTO: + if (boot_cpu_has(X86_FEATURE_IBPB)) vmscape_mitigation =3D VMSCAPE_MITIGATION_IBPB_EXIT_TO_USER; else vmscape_mitigation =3D VMSCAPE_MITIGATION_NONE; + break; + + default: } } =20 --=20 2.34.1