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 8F93FC636CC for ; Thu, 16 Feb 2023 11:03:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229596AbjBPLDI (ORCPT ); Thu, 16 Feb 2023 06:03:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229828AbjBPLDE (ORCPT ); Thu, 16 Feb 2023 06:03:04 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 832AB10407 for ; Thu, 16 Feb 2023 03:02:56 -0800 (PST) Received: by linux.microsoft.com (Postfix, from userid 1112) id 66F9C20110A3; Thu, 16 Feb 2023 03:02:56 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 66F9C20110A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1676545376; bh=rRiJIH4OkdENqAcKCJDUy0D7DfpH4ZlezUyllsZg37U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jWCCbJ9IQED0iZJ8k8Zc81Jv122Nf9f6RiFzH0mtgzhVNZhAJp5M/lycw8UvwgRAJ +J/2Gpc1XKCZuLlAvPIN8V03ZNsKQ8Uokl+prUwzK6Ibus3iVXWNx9YxoZJWZjmd+m tTvxc3Rz+7Ni8EZiQ4yj9cUB/p9SwL/5Fu4XMSfU= Date: Thu, 16 Feb 2023 03:02:56 -0800 From: Jeremi Piotrowski To: Juergen Gross Cc: Borislav Petkov , linux-kernel@vger.kernel.org, x86@kernel.org, lists@nerdbynature.de, mikelley@microsoft.com, torvalds@linux-foundation.org, Thomas Gleixner , Ingo Molnar , Dave Hansen , "H. Peter Anvin" Subject: Re: [PATCH v2 2/8] x86/mtrr: support setting MTRR state for software defined MTRRs Message-ID: <20230216110256.GA3949@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> References: <20230209072220.6836-1-jgross@suse.com> <20230209072220.6836-3-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 16, 2023 at 10:32:28AM +0100, Juergen Gross wrote: > On 13.02.23 12:39, Borislav Petkov wrote: > >On Thu, Feb 09, 2023 at 08:22:14AM +0100, Juergen Gross wrote: > >>When running virtualized, MTRR access can be reduced (e.g. in Xen PV > >>guests or when running as a SEV-SNP guest under Hyper-V). Typically > >>the hypervisor will reset the MTRR feature in cpuid data, resulting > >>in no MTRR memory type information being available for the kernel. > >> > >>This has turned out to result in problems: > >> > >>- Hyper-V SEV-SNP guests using uncached mappings where they shouldn't > >>- Xen PV dom0 mapping memory as WB which should be UC- instead > >> > >>Solve those problems by supporting to set a fixed MTRR state, > >>overwriting the empty state used today. In case such a state has been > >>set, don't call get_mtrr_state() in mtrr_bp_init(). The set state > >>will only be used by mtrr_type_lookup(), as in all other cases > >>mtrr_enabled() is being checked, which will return false. Accept the > >>overwrite call only in case of MTRRs being disabled in cpuid. > > > >s/cpuid/CPUID/g > > > >>Signed-off-by: Juergen Gross > >>--- > >>V2: > >>- new patch > >>--- > >> arch/x86/include/asm/mtrr.h | 2 ++ > >> arch/x86/kernel/cpu/mtrr/generic.c | 38 ++++++++++++++++++++++++++++++ > >> arch/x86/kernel/cpu/mtrr/mtrr.c | 9 +++++++ > >> 3 files changed, 49 insertions(+) > >> > >>diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h > >>index f0eeaf6e5f5f..0b8f51d683dc 100644 > >>--- a/arch/x86/include/asm/mtrr.h > >>+++ b/arch/x86/include/asm/mtrr.h > >>@@ -31,6 +31,8 @@ > >> */ > >> # ifdef CONFIG_MTRR > >> void mtrr_bp_init(void); > >>+void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, > >>+ mtrr_type *fixed, mtrr_type def_type); > >> extern u8 mtrr_type_lookup(u64 addr, u64 end, u8 *uniform); > >> extern void mtrr_save_fixed_ranges(void *); > >> extern void mtrr_save_state(void); > >>diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c > >>index ee09d359e08f..788bc16888a5 100644 > >>--- a/arch/x86/kernel/cpu/mtrr/generic.c > >>+++ b/arch/x86/kernel/cpu/mtrr/generic.c > >>@@ -240,6 +240,44 @@ static u8 mtrr_type_lookup_variable(u64 start, u64 end, u64 *partial_end, > >> return mtrr_state.def_type; > >> } > >>+/** > >>+ * mtrr_overwrite_state - set fixed MTRR state > > > >fixed only? You pass in variable too... > > > >>+ * > >>+ * Used to set MTRR state via different means (e.g. with data obtained from > >>+ * a hypervisor). > >>+ */ > >>+void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, > >>+ mtrr_type *fixed, mtrr_type def_type) > >>+{ > >>+ unsigned int i; > >>+ > >>+ if (boot_cpu_has(X86_FEATURE_MTRR)) > > > >check_for_deprecated_apis: WARNING: arch/x86/kernel/cpu/mtrr/generic.c:254: Do not use boot_cpu_has() - use cpu_feature_enabled() instead. > > > >>+ return; > > > >So this here needs to check: > > > > if (!cpu_feature_enabled(X86_FEATURE_HYPERVISOR) && > > !(cpu_feature_enabled(X86_FEATURE_SEV_SNP) || > > cpu_feature_enabled(X86_FEATURE_XENPV))) { > > WARN_ON_ONCE(1); > > return; > > } > > > >as we don't want this to be called somewhere or by something else. > > > >The SEV_SNP flag can be used from: > > > >https://lore.kernel.org/r/20221214194056.161492-14-michael.roth@amd.com > > > >I'm assuming here HyperV SEV-SNP guests really do set that feature flag > >(they better). We can expedite that patch ofc. > > Is that flag _really_ meant to indicate we are running as a SEV-SNP guest? > > Given that the referenced patch is part of the SEV-SNP host support series, > I'm inclined to suspect it won't be set for sure in HyperV SEV-SNP guests. > And who is setting it for KVM SEV-SNP guests? > > > Juergen Initially both guest and host side have X86_FEATURE_SEV_SNP, but early_detect_mem_encrypt() clears it for the guest side. You would want cc_platform_has(CC_ATTR_GUEST_SEV_SNP), but: * there are two kinds of Hyper-V SEV-SNP VMs: "unenlightened" (vTOM+paravisor) and "enlightened" * the kernel currently supports the "unenlightened" kind which do not set CC_ATTR_GUEST_SEV_SNP (because it implies codepaths which do not apply to vTOM mode) * the patchset that adds support for "enlightened" Hyper-V SEV-SNP VMs sets CC_ATTR_GUEST_SEV_SNP [1] The closest you can get is: cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT) && hypervisor_is_type(X86_HYPER_MS_HYPERV) but that would soon cover TDX guests too so ... [1]: https://lore.kernel.org/lkml/1673559753-94403-8-git-send-email-mikelley@microsoft.com/