On Mon, Apr 12, 2021 at 06:23:32PM -0700, Steve Rutherford wrote:
> On Mon, Apr 12, 2021 at 5:22 PM Steve Rutherford <srutherford@xxxxxxxxxx> wrote:
> >
> > On Mon, Apr 12, 2021 at 12:48 PM Ashish Kalra <Ashish.Kalra@xxxxxxx> wrote:
> > >
> > > From: Ashish Kalra <ashish.kalra@xxxxxxx>
> > >
> > > Reset the host's shared pages list related to kernel
> > > specific page encryption status settings before we load a
> > > new kernel by kexec. We cannot reset the complete
> > > shared pages list here as we need to retain the
> > > UEFI/OVMF firmware specific settings.
> > >
> > > The host's shared pages list is maintained for the
> > > guest to keep track of all unencrypted guest memory regions,
> > > therefore we need to explicitly mark all shared pages as
> > > encrypted again before rebooting into the new guest kernel.
> > >
> > > Signed-off-by: Ashish Kalra <ashish.kalra@xxxxxxx>
> > > ---
> > > arch/x86/kernel/kvm.c | 24 ++++++++++++++++++++++++
> > > 1 file changed, 24 insertions(+)
> > >
> > > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
> > > index bcc82e0c9779..4ad3ed547ff1 100644
> > > --- a/arch/x86/kernel/kvm.c
> > > +++ b/arch/x86/kernel/kvm.c
> > > @@ -39,6 +39,7 @@
> > > #include <asm/cpuidle_haltpoll.h>
> > > #include <asm/ptrace.h>
> > > #include <asm/svm.h>
> > > +#include <asm/e820/api.h>
> > >
> > > DEFINE_STATIC_KEY_FALSE(kvm_async_pf_enabled);
> > >
> > > @@ -384,6 +385,29 @@ static void kvm_pv_guest_cpu_reboot(void *unused)
> > > */
> > > if (kvm_para_has_feature(KVM_FEATURE_PV_EOI))
> > > wrmsrl(MSR_KVM_PV_EOI_EN, 0);
> > > + /*
> > > + * Reset the host's shared pages list related to kernel
> > > + * specific page encryption status settings before we load a
> > > + * new kernel by kexec. NOTE: We cannot reset the complete
> > > + * shared pages list here as we need to retain the
> > > + * UEFI/OVMF firmware specific settings.
> > > + */
> > > + if (sev_live_migration_enabled & (smp_processor_id() == 0)) {
> > What happens if the reboot of CPU0 races with another CPU servicing a
> > device request (while the reboot is pending for that CPU)?
> > Seems like you could run into a scenario where you have hypercalls racing.
> >
> > Calling this on every core isn't free, but it is an easy way to avoid this race.
> > You could also count cores, and have only last core do the job, but
> > that seems more complicated.
> On second thought, I think this may be insufficient as a fix, since my
> read of kernel/reboot.c seems to imply that devices aren't shutdown
> until after these notifiers occur. As such, a single thread might be
> able to race with itself. I could be wrong here though.
>
> The heavy hammer would be to disable migration through the MSR (which
> the subsequent boot will re-enable).
>
> I'm curious if there is a less "blocking" way of handling kexecs (that
> strategy would block LM while the guest booted).
>
> One option that comes to mind would be for the guest to "mute" the
> encryption status hypercall after the call to reset the encryption
> status. The problem would be that the encryption status for pages
> would be very temporarily inaccurate in the window between that call
> and the start of the next boot. That isn't ideal, but, on the other
> hand, the VM was about to reboot anyway, so a corrupted shared page
> for device communication probably isn't super important. Still, I'm
> not really a fan of that. This would avoid corrupting the next boot,
> which is clearly an improvement.
>
> Each time the kernel boots it could also choose something like a
> generation ID, and pass that down each time it calls the hypercall.
> This would then let userspace identify which requests were coming from
> the subsequent boot.
>
> Everything here (except, perhaps, disabling migration through the MSR)
> seems kind of complicated. I somewhat hope my interpretation of
> kernel/reboot.c is wrong and this race just is not possible in the
> first place.
>
Disabling migration through the MSR after resetting the page encryption
status is a reasonable approach. There is a similar window existing for
normal VM boot during which LM is disabled, from the point where OVMF
checks and adds support for SEV LM and the kernel boot checks for the
same and enables LM using the MSR.
Thanks,
Ashish
> > > + int i;
> > > + unsigned long nr_pages;
> > > +
> > > + for (i = 0; i < e820_table->nr_entries; i++) {
> > > + struct e820_entry *entry = &e820_table->entries[i];
> > > +
> > > + if (entry->type != E820_TYPE_RAM)
> > > + continue;
> > > +
> > > + nr_pages = DIV_ROUND_UP(entry->size, PAGE_SIZE);
> > > +
> > > + kvm_sev_hypercall3(KVM_HC_PAGE_ENC_STATUS,
> > > + entry->addr, nr_pages, 1);
> > > + }
> > > + }
> > > kvm_pv_disable_apf();
> > > kvm_disable_steal_time();
> > > }
> > > --
> > > 2.17.1
> > >
