On 4/14/21 2:27 AM, Borislav Petkov wrote:
> On Wed, Mar 24, 2021 at 12:04:07PM -0500, Brijesh Singh wrote:
>> @@ -538,6 +540,10 @@
>> #define MSR_K8_SYSCFG 0xc0010010
>> #define MSR_K8_SYSCFG_MEM_ENCRYPT_BIT 23
>> #define MSR_K8_SYSCFG_MEM_ENCRYPT BIT_ULL(MSR_K8_SYSCFG_MEM_ENCRYPT_BIT)
>> +#define MSR_K8_SYSCFG_SNP_EN_BIT 24
>> +#define MSR_K8_SYSCFG_SNP_EN BIT_ULL(MSR_K8_SYSCFG_SNP_EN_BIT)
>> +#define MSR_K8_SYSCFG_SNP_VMPL_EN_BIT 25
>> +#define MSR_K8_SYSCFG_SNP_VMPL_EN BIT_ULL(MSR_K8_SYSCFG_SNP_VMPL_EN_BIT)
>> #define MSR_K8_INT_PENDING_MSG 0xc0010055
>> /* C1E active bits in int pending message */
>> #define K8_INTP_C1E_ACTIVE_MASK 0x18000000
> Ok, I believe it is finally time to make this MSR architectural and drop
> this silliness with "K8" in the name. If you wanna send me a prepatch which
> converts all like this:
>
> MSR_K8_SYSCFG -> MSR_AMD64_SYSCFG
>
> I'll gladly take it. If you prefer me to do it, I'll gladly do it.
I will send patch to address it.
>
>> @@ -44,12 +45,16 @@ u64 sev_check_data __section(".data") = 0;
>> EXPORT_SYMBOL(sme_me_mask);
>> DEFINE_STATIC_KEY_FALSE(sev_enable_key);
>> EXPORT_SYMBOL_GPL(sev_enable_key);
>> +DEFINE_STATIC_KEY_FALSE(snp_enable_key);
>> +EXPORT_SYMBOL_GPL(snp_enable_key);
>>
>> bool sev_enabled __section(".data");
>>
>> /* Buffer used for early in-place encryption by BSP, no locking needed */
>> static char sme_early_buffer[PAGE_SIZE] __initdata __aligned(PAGE_SIZE);
>>
>> +static unsigned long rmptable_start, rmptable_end;
> __ro_after_init I guess.
Yes.
>
>> +
>> /*
>> * When SNP is active, this routine changes the page state from private to shared before
>> * copying the data from the source to destination and restore after the copy. This is required
>> @@ -528,3 +533,82 @@ void __init mem_encrypt_init(void)
>> print_mem_encrypt_feature_info();
>> }
>>
>> +static __init void snp_enable(void *arg)
>> +{
>> + u64 val;
>> +
>> + rdmsrl_safe(MSR_K8_SYSCFG, &val);
> Why is this one _safe but the wrmsr isn't? Also, _safe returns a value -
> check it pls and return early.
No strong reason to use _safe. We reached here after all the CPUID
checks. I will drop the _safe.
>
>> +
>> + val |= MSR_K8_SYSCFG_SNP_EN;
>> + val |= MSR_K8_SYSCFG_SNP_VMPL_EN;
>> +
>> + wrmsrl(MSR_K8_SYSCFG, val);
>> +}
>> +
>> +static __init int rmptable_init(void)
>> +{
>> + u64 rmp_base, rmp_end;
>> + unsigned long sz;
>> + void *start;
>> + u64 val;
>> +
>> + rdmsrl_safe(MSR_AMD64_RMP_BASE, &rmp_base);
>> + rdmsrl_safe(MSR_AMD64_RMP_END, &rmp_end);
> Ditto, why _safe if you're checking CPUID?
>
>> +
>> + if (!rmp_base || !rmp_end) {
>> + pr_info("SEV-SNP: Memory for the RMP table has not been reserved by BIOS\n");
>> + return 1;
>> + }
>> +
>> + sz = rmp_end - rmp_base + 1;
>> +
>> + start = memremap(rmp_base, sz, MEMREMAP_WB);
>> + if (!start) {
>> + pr_err("SEV-SNP: Failed to map RMP table 0x%llx-0x%llx\n", rmp_base, rmp_end);
> ^^^^^^^
>
> That prefix is done by doing
>
> #undef pr_fmt
> #define pr_fmt(fmt) "SEV-SNP: " fmt
>
> before the SNP-specific functions.
Sure, I will use it.
>
>> + return 1;
>> + }
>> +
>> + /*
>> + * Check if SEV-SNP is already enabled, this can happen if we are coming from kexec boot.
>> + * Do not initialize the RMP table when SEV-SNP is already.
>> + */
> comment can be 80 cols wide.
Noted.
>
>> + rdmsrl_safe(MSR_K8_SYSCFG, &val);
> As above.
>
>> + if (val & MSR_K8_SYSCFG_SNP_EN)
>> + goto skip_enable;
>> +
>> + /* Initialize the RMP table to zero */
>> + memset(start, 0, sz);
>> +
>> + /* Flush the caches to ensure that data is written before we enable the SNP */
>> + wbinvd_on_all_cpus();
>> +
>> + /* Enable the SNP feature */
>> + on_each_cpu(snp_enable, NULL, 1);
> What happens if you boot only a subset of the CPUs and then others get
> hotplugged later? IOW, you need a CPU hotplug notifier which enables the
> feature bit on newly arrived CPUs.
>
> Which makes me wonder whether it makes sense to have this in an initcall
> and not put it instead in init_amd(): the BSP will do the init work
> and the APs coming in will see that it has been enabled and only call
> snp_enable().
>
> Which solves the hotplug thing automagically.
This function need to be called after all the APs are up. But you have
raised a very good point regarding the hotplug CPU. Let me look into CPU
hotplug notifier and move the MSR initialization for AP inside the AP
bringup callbacks.
>
>> +
>> +skip_enable:
>> + rmptable_start = (unsigned long)start;
>> + rmptable_end = rmptable_start + sz;
>> +
>> + pr_info("SEV-SNP: RMP table physical address 0x%016llx - 0x%016llx\n", rmp_base, rmp_end);
> "RMP table at ..."
>
> also, why is this issued in skip_enable? You want to issue it only once,
> on enable.
>
> also, rmp_base and rmp_end look redundant - you can simply use
> rmptable_start and rmptable_end.
>
> Which reminds me - that function needs to check as the very first thing
> on entry whether SNP is enabled and exit if so - there's no need to read
> MSR_AMD64_RMP_BASE and MSR_AMD64_RMP_END unnecessarily.
We need to store the virtual address of the RMP table range so that RMP
table can be accessed later. In next patch we add some helpers to read
the RMP table.
>> +
>> + return 0;
>> +}
>> +
>> +static int __init mem_encrypt_snp_init(void)
>> +{
>> + if (!boot_cpu_has(X86_FEATURE_SEV_SNP))
>> + return 1;
>> +
>> + if (rmptable_init()) {
>> + setup_clear_cpu_cap(X86_FEATURE_SEV_SNP);
>> + return 1;
>> + }
>> +
>> + static_branch_enable(&snp_enable_key);
>> +
>> + return 0;
>> +}
>> +/*
>> + * SEV-SNP must be enabled across all CPUs, so make the initialization as a late initcall.
> Is there any particular reason for this to be a late initcall?
I wanted this function to be called after APs are up but your hotplug
question is making me rethink this logic. I will work to improve it.
>
