Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Zhang, Chen" <chen.zhang@intel.com>
To:     Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
CC:     "x86@kernel.org" <x86@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "kvm@vger.kernel.org" <kvm@vger.kernel.org>,
        "Gao, Chao" <chao.gao@intel.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        "Christopherson,, Sean" <seanjc@google.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Borislav Petkov <bp@alien8.de>, Ingo Molnar <mingo@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>
Subject: RE: [RFC PATCH 5/9] x86/bugs: Use Virtual MSRs to request hardware
 mitigations
Thread-Topic: [RFC PATCH 5/9] x86/bugs: Use Virtual MSRs to request hardware
 mitigations
Thread-Index: AQHZDLMhDxurDeM6YkqaqujyHlpxN65qtdEAgAJS9ZA=
Date:   Wed, 14 Dec 2022 07:57:46 +0000
Message-ID: <MWHPR11MB0031350E012516655F42F42D9BE09@MWHPR11MB0031.namprd11.prod.outlook.com>
References: <20221210160046.2608762-1-chen.zhang@intel.com>
 <20221210160046.2608762-6-chen.zhang@intel.com>
 <20221212202334.ldrgv7fnkgjtsogg@desk>
In-Reply-To: <20221212202334.ldrgv7fnkgjtsogg@desk>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WoBuVwCR2FERK9hpCPIXAWsFsegT+/JAZNFZfnOcYDbKoYL3tR+j03hopOZo?=
 =?us-ascii?Q?CN7Kcz5oIUm4A5MZvIaPolBcgDxc/dmU+7FZwZ24LuJUYshn0+pWOgxZsQsG?=
 =?us-ascii?Q?ZoQ/sZNpIgleMdKaw3sGvs+tGTbPq41No16QYFlzMDkR4FYm70BuzTZAX1SI?=
 =?us-ascii?Q?g8br1OfzSmaxddEaa1cHUZ1dyzQ2m6oNXgoU+TDGZOWIraxZWxi+1NbOTEWt?=
 =?us-ascii?Q?+gmnJHsmF6p8T279NSnz3VhchF00xVT/+FKr7iR5IW6ou60kTqjbDnURpxj+?=
 =?us-ascii?Q?sXMDlSmKERjAd7KyKMZbt8tbIxRDBEgGi2LAvjz59lJ8Is6Bw9VfeabG5ZbF?=
 =?us-ascii?Q?y6OsY1JCvGbCdwuMdP4RrnErFUoYm/ObG17XC0yJm8oKnANpDjRXgLmBu0f9?=
 =?us-ascii?Q?ugt2ERuGVEl88xaVIfBO8rWHTtHYVo08q6azi/3HiuwP8o6fcGqDHnEmCZE0?=
 =?us-ascii?Q?Z4hP3nPh9qxSiE1SGxQg9hUni/c8SNNShSlHOAjiwS5EniGlcNhfOaDmF7AO?=
 =?us-ascii?Q?DK8jCODqZQVyTKFCZ1LEAaSyWH99EzSIVztMhI5axsjttQqzVvTHoiIy3lmT?=
 =?us-ascii?Q?q1EuPzEQgrpGTmfOnVkHPexGmAfiMeg3hZkwmrgf8VR0wLqFy6wwO9HC1apz?=
 =?us-ascii?Q?vCMQXOFMgPiHCFJX3AwPIt1Tu2ZOn8BVrU2V4viuo6T6llmc6zivg240ThiG?=
 =?us-ascii?Q?xg7j0grKHdiYLXx1wc1Z1PxPu+2xJQWcDE/evsiW1trCuW25FKWEdbQko0Vr?=
 =?us-ascii?Q?VljuNdh2TIMZYLd6Fhn4FKXmopfajsel+lg0Dk/2lPhvxuqdea65A1npeWLP?=
 =?us-ascii?Q?81/kGcA1p8x8xcSoicdg5wpdnbVGTt+3/orFXE/MA+23zyf1OgDFB/8o4uRs?=
 =?us-ascii?Q?c8qYndvGIDqwWVGh6EQvXgK3+/0sNbqLJ2MkicsbLXnIZkm0E3bHEMBO6e/w?=
 =?us-ascii?Q?hQlsKeyd9So0wyddXa/2Pp/38YqLXe5fbRklD4aK0p1H93ZPIvmEbxtRrhzL?=
 =?us-ascii?Q?FEFMJrnX3qHGBU56u4hKz96oi+IA9Tp+r+F+e5/YSyNE+px0vrry172IaLO0?=
 =?us-ascii?Q?cZDbWoJBIoYLiR4Kmk+XLV6R2vnidrnSTK5dzC/U/CF1EVFPnoIevMw6Y80P?=
 =?us-ascii?Q?jcWCxqAW27l9wBjQMznxG83BkKZBebhIXQjw0d5YOel1Z+euMC1b4NwbTADc?=
 =?us-ascii?Q?7lWirpPAFrAB2lLiDIsydX6duTXhy1g+puZ67iNYNs6g9IzycHxHut2jCThi?=
 =?us-ascii?Q?n72Ms+v1sh30ZLOny6HNQ0rymL6tLlgCNw9TFzZ8NYpTX1W3VEFhToAw+Vwq?=
 =?us-ascii?Q?teQLG1A+nw2YJGU0E1pHS3AWqhloSw0UXz46oyZpsuUsoBsBJcJPCHIg1pEs?=
 =?us-ascii?Q?tlNqGrYJaqZHYDK7r2ZAUU8JLZ1XwXkZAuJ5EJ1OO13KsJnS/ZFWkeuLvqVH?=
 =?us-ascii?Q?VDhgRPQqn65RQvBLcId0IQAx+82gtmbQiQn34Mu4dD7qH6oBSt/xpxPFkO+I?=
 =?us-ascii?Q?Z0IGAWJkECNiyiftp4rqr3k44a4baYMzQfSq/3gBzBEWx7ij7sOwiF8j5gIx?=
 =?us-ascii?Q?vhU/2DooO/4b2229WVQKz5ZUrk7c4Fj9nD1Pc9RJ?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB0031.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d705a3a8-de5d-49ab-5553-08dadda8e36d
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2022 07:57:46.5559
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: fyMWGQ6BRbNkcUpy90p3GhPdieV9DN8yvS4l+P/FgpyJtG/kpvbqM5uTQtaJYNIQUI8ESfoyP+N6Sv2GV7N2Mg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6933
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
> Sent: Tuesday, December 13, 2022 4:24 AM
> To: Zhang, Chen <chen.zhang@intel.com>
> Cc: x86@kernel.org; linux-kernel@vger.kernel.org; kvm@vger.kernel.org; Ga=
o,
> Chao <chao.gao@intel.com>; Paolo Bonzini <pbonzini@redhat.com>;
> Christopherson,, Sean <seanjc@google.com>; H. Peter Anvin
> <hpa@zytor.com>; Dave Hansen <dave.hansen@linux.intel.com>; Borislav
> Petkov <bp@alien8.de>; Ingo Molnar <mingo@redhat.com>; Thomas Gleixner
> <tglx@linutronix.de>
> Subject: Re: [RFC PATCH 5/9] x86/bugs: Use Virtual MSRs to request hardwa=
re
> mitigations
>=20
> On Sun, Dec 11, 2022 at 12:00:42AM +0800, Zhang Chen wrote:
> > From: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
> >
> > Guests that have different family/model than the host may not be aware
> > of hardware mitigations(such as RRSBA_DIS_S) available on host. This
> > is particularly true when guests migrate. To solve this problem Intel
> > processors have added a virtual MSR interface through which guests can
> > report their mitigation status and request VMM to deploy relevant
> > hardware mitigations.
> >
> > Use this virtualized MSR interface to request relevant hardware
> > controls for retpoline mitigation.
> >
> > Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
> > ---
> >  arch/x86/include/asm/msr-index.h | 23 +++++++++++++++++++++++
> >  arch/x86/kernel/cpu/bugs.c       | 24 ++++++++++++++++++++++++
> >  2 files changed, 47 insertions(+)
> >
> > diff --git a/arch/x86/include/asm/msr-index.h
> > b/arch/x86/include/asm/msr-index.h
> > index 1143ac9400c3..1166b472377c 100644
> > --- a/arch/x86/include/asm/msr-index.h
> > +++ b/arch/x86/include/asm/msr-index.h
> > @@ -165,6 +165,7 @@
> >  						 *
> IA32_XAPIC_DISABLE_STATUS MSR
> >  						 * supported
> >  						 */
> > +#define ARCH_CAP_VIRTUAL_ENUM		BIT(63)	/*
> MSR_VIRTUAL_ENUMERATION supported */
> >
> >  #define MSR_IA32_FLUSH_CMD		0x0000010b
> >  #define L1D_FLUSH			BIT(0)	/*
> > @@ -1062,6 +1063,28 @@
> >  #define MSR_IA32_VMX_MISC_INTEL_PT                 (1ULL << 14)
> >  #define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL <<
> 29)
> >  #define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE   0x1F
> > +
> > +/* Intel virtual MSRs */
> > +#define MSR_VIRTUAL_ENUMERATION			0x50000000
> > +#define VIRT_ENUM_MITIGATION_CTRL_SUPPORT	BIT(0)	/*
> > +							 * Mitigation ctrl via
> virtual
> > +							 * MSRs supported
> > +							 */
> > +
> > +#define MSR_VIRTUAL_MITIGATION_ENUM		0x50000001
> > +#define MITI_ENUM_BHB_CLEAR_SEQ_S_SUPPORT	BIT(0)	/* VMM
> supports BHI_DIS_S */
> > +#define MITI_ENUM_RETPOLINE_S_SUPPORT		BIT(1)	/*
> VMM supports RRSBA_DIS_S */
> > +
> > +#define MSR_VIRTUAL_MITIGATION_CTRL		0x50000002
> > +#define MITI_CTRL_BHB_CLEAR_SEQ_S_USED		BIT(0)	/*
> > +							 * Request VMM to
> deploy
> > +							 * BHI_DIS_S
> mitigation
> > +							 */
> > +#define MITI_CTRL_RETPOLINE_S_USED		BIT(1)	/*
> > +							 * Request VMM to
> deploy
> > +							 * RRSBA_DIS_S
> mitigation
> > +							 */
> > +
> >  /* AMD-V MSRs */
> >
> >  #define MSR_VM_CR                       0xc0010114
> > diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
> > index 3e3230cccaa7..a9e869f568ee 100644
> > --- a/arch/x86/kernel/cpu/bugs.c
> > +++ b/arch/x86/kernel/cpu/bugs.c
> > @@ -1379,6 +1379,28 @@ static void __init
> spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_
> >  	dump_stack();
> >  }
> >
> > +/* Speculation control using virtualized MSRs */ static void __init
> > +spec_ctrl_setup_virtualized_msr(void)
> > +{
> > +	u64 msr_virt_enum, msr_mitigation_enum, msr_mitigation_ctrl;
> > +
> > +	if (!(x86_read_arch_cap_msr() & ARCH_CAP_VIRTUAL_ENUM))
> > +		return;
> > +
> > +	rdmsrl(MSR_VIRTUAL_ENUMERATION, msr_virt_enum);
> > +	if (!(msr_virt_enum & VIRT_ENUM_MITIGATION_CTRL_SUPPORT))
> > +		return;
> > +
> > +	rdmsrl(MSR_VIRTUAL_MITIGATION_ENUM, msr_mitigation_enum);
> > +	/* When retpoline is being used, request relevant hardware controls
> */
> > +	if (boot_cpu_has(X86_FEATURE_RETPOLINE) &&
> > +	    msr_mitigation_enum & MITI_ENUM_RETPOLINE_S_SUPPORT) {
> > +		rdmsrl(MSR_VIRTUAL_MITIGATION_CTRL,
> msr_mitigation_ctrl);
> > +		msr_mitigation_ctrl |=3D MITI_CTRL_RETPOLINE_S_USED;
> > +		wrmsrl(MSR_VIRTUAL_MITIGATION_CTRL,
> msr_mitigation_ctrl);
> > +	}
> > +}
> > +
> >  static void __init spectre_v2_select_mitigation(void)
> >  {
> >  	enum spectre_v2_mitigation_cmd cmd =3D spectre_v2_parse_cmdline();
> @@
> > -1485,6 +1507,8 @@ static void __init spectre_v2_select_mitigation(void=
)
> >  	    mode =3D=3D SPECTRE_V2_RETPOLINE)
> >  		spec_ctrl_disable_kernel_rrsba();
> >
> > +	spec_ctrl_setup_virtualized_msr();
>=20
> I think this also needs to be called during secondary CPU initialization.

Yes, we need setup virtual MSRs for each CPU.
I will add the " spec_ctrl_setup_virtualized_msr()" to the "start_secondary=
()" in the arch/x86/kernel/smpboot.c  next version.

Thanks
Chen