On Fri, Feb 23, 2024, Paolo Bonzini wrote: > Paolo Bonzini (11): > KVM: SEV: fix compat ABI for KVM_MEMORY_ENCRYPT_OP > KVM: introduce new vendor op for KVM_GET_DEVICE_ATTR > Documentation: kvm/sev: separate description of firmware > KVM: SEV: publish supported VMSA features > KVM: SEV: store VMSA features in kvm_sev_info > KVM: SEV: disable DEBUG_SWAP by default > KVM: x86: define standard behavior for bits 0/1 of VM type > KVM: x86: Add is_vm_type_supported callback > KVM: SEV: define VM types for SEV and SEV-ES > KVM: SEV: introduce KVM_SEV_INIT2 operation > selftests: kvm: add tests for KVM_SEV_INIT2 > > Documentation/virt/kvm/api.rst | 2 + > .../virt/kvm/x86/amd-memory-encryption.rst | 81 +++++++-- > arch/x86/include/asm/kvm-x86-ops.h | 2 + > arch/x86/include/asm/kvm_host.h | 11 +- > arch/x86/include/uapi/asm/kvm.h | 35 ++++ > arch/x86/kvm/svm/sev.c | 110 +++++++++++- > arch/x86/kvm/svm/svm.c | 14 +- > arch/x86/kvm/svm/svm.h | 6 +- > arch/x86/kvm/x86.c | 157 ++++++++++++++---- > tools/testing/selftests/kvm/Makefile | 1 + > .../selftests/kvm/include/kvm_util_base.h | 6 +- > .../selftests/kvm/set_memory_region_test.c | 8 +- > .../selftests/kvm/x86_64/sev_init2_tests.c | 146 ++++++++++++++++ > 13 files changed, 510 insertions(+), 69 deletions(-) > create mode 100644 tools/testing/selftests/kvm/x86_64/sev_init2_tests.c FYI, there are 4-5 minor conflicts with kvm-x86/next, and going off my memory, I think the conflicts come from ~3 different topic branches. Given that this is based on kvm/next, I assume it's destined for 6.9. So maybe rebase on kvm-x86/next for v3, and then I'll get my 6.9 pull requests sent for the conflicting branches early next week so that this can land in a topic branch that's based on kvm/next?
