Add AMD SEV guest live migration support
Subsystems (10)
v8 cover Add AMD SEV guest live migration support
From: Ashish Kalra <[email protected]>
The series add support for AMD SEV guest live migration commands. To protect the confidentiality of an SEV protected guest memory while in transit we need to use the SEV commands defined in SEV API spec [1].
SEV guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. The commands provided by the SEV FW are meant to be used for the private memory only. The patch series introduces a new hypercall. The guest OS can use this hypercall to notify the page encryption status. If the page is encrypted with guest specific-key then we use SEV command during the migration. If page is not encrypted then fallback to default.
The patch adds new ioctls KVM_{SET,GET}_PAGE_ENC_BITMAP. The ioctl can be used by the qemu to get the page encrypted bitmap. Qemu can consult this bitmap during the migration to know whether the page is encrypted.
This section descibes how the SEV live migration feature is negotiated between the host and guest, the host indicates this feature support via KVM_FEATURE_CPUID. The guest firmware (OVMF) detects this feature and sets a UEFI enviroment variable indicating OVMF support for live migration, the guest kernel also detects the host support for this feature via cpuid and in case of an EFI boot verifies if OVMF also supports this feature by getting the UEFI enviroment variable and if it set then enables live migration feature on host by writing to a custom MSR, if not booted under EFI, then it simply enables the feature by again writing to the custom MSR. The host returns error as part of SET_PAGE_ENC_BITMAP ioctl if guest has not enabled live migration.
A branch containing these patches is available here:
https://github.com/AMDESE/linux/tree/sev-migration-v8
[1] https://developer.amd.com/wp-content/resources/55766.PDF
Changes since v7:
- Removed the hypervisor specific hypercall/paravirt callback for SEV live migration and moved back to calling kvm_sev_hypercall3 directly.
- Fix build errors as
build error when CONFIG_HYPERVISOR_GUEST=y and CONFIG_AMD_MEM_ENCRYPT=n.
- Implicitly enabled live migration for incoming VM(s) to handle A->B->C->... VM migrations.
- Fixed Documentation as per comments on v6 patches.
- Fixed error return path in sev_send_update_data() as per comments on v6 patches.
Changes since v6:
- Rebasing to mainline and refactoring to the new split SVM infrastructre.
- Move to static allocation of the unified Page Encryption bitmap instead of the dynamic resizing of the bitmap, the static allocation is done implicitly by extending kvm_arch_commit_memory_region() callack to add svm specific x86_ops which can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap.
- Fixed KVM_SET_PAGE_ENC_BITMAP ioctl to set the whole bitmap instead of simply clearing specific bits.
- Removed KVM_PAGE_ENC_BITMAP_RESET ioctl, which is now performed using KVM_SET_PAGE_ENC_BITMAP.
- Extended guest support for enabling Live Migration feature by adding a check for UEFI environment variable indicating OVMF support for Live Migration feature and additionally checking for KVM capability for the same feature. If not booted under EFI, then we simply check for KVM capability.
- Add hypervisor specific hypercall for SEV live migration by adding a new paravirt callback as part of x86_hyper_runtime.
(x86 hypervisor specific runtime callbacks)
- Moving MSR handling for MSR_KVM_SEV_LIVE_MIG_EN into svm/sev code and adding check for SEV live migration enabled by guest in the KVM_GET_PAGE_ENC_BITMAP ioctl.
- Instead of the complete __bss_decrypted section, only specific variables such as hv_clock_boot and wall_clock are marked as decrypted in the page encryption bitmap
Changes since v5:
- Fix build errors as
Changes since v4:
- Host support has been added to extend KVM capabilities/feature bits to include a new KVM_FEATURE_SEV_LIVE_MIGRATION, which the guest can query for host-side support for SEV live migration and a new custom MSR MSR_KVM_SEV_LIVE_MIG_EN is added for guest to enable the SEV live migration feature.
- Ensure that _bss_decrypted section is marked as decrypted in the page encryption bitmap.
- Fixing KVM_GET_PAGE_ENC_BITMAP ioctl to return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copy bmap->num_pages bytes in the userspace buffer, if bmap->num_pages is not byte aligned we read the trailing bits from the userspace and copy those bits as is. This fixes guest page(s) corruption issues observed after migration completion.
- Add kexec support for SEV Live Migration to reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.
Changes since v3:
- Rebasing to mainline and testing.
- Adding a new KVM_PAGE_ENC_BITMAP_RESET ioctl, which resets the page encryption bitmap on a guest reboot event.
- Adding a more reliable sanity check for GPA range being passed to the hypercall to ensure that guest MMIO ranges are also marked in the page encryption bitmap.
Changes since v2:
- reset the page encryption bitmap on vcpu reboot
Changes since v1:
- Add support to share the page encryption between the source and target machine.
- Fix review feedbacks from Tom Lendacky.
- Add check to limit the session blob length.
- Update KVM_GET_PAGE_ENC_BITMAP icotl to use the base_gfn instead of the memory slot when querying the bitmap.
Ashish Kalra (7):
KVM: SVM: Add support for static allocation of unified Page Encryption
Bitmap.
KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature &
Custom MSR.
EFI: Introduce the new AMD Memory Encryption GUID.
KVM: x86: Add guest support for detecting and enabling SEV Live
Migration feature.
KVM: x86: Mark _bss_decrypted section variables as decrypted in page
encryption bitmap.
KVM: x86: Add kexec support for SEV Live Migration.
KVM: SVM: Enable SEV live migration feature implicitly on Incoming
VM(s).
Brijesh Singh (11):
KVM: SVM: Add KVM_SEV SEND_START command
KVM: SVM: Add KVM_SEND_UPDATE_DATA command
KVM: SVM: Add KVM_SEV_SEND_FINISH command
KVM: SVM: Add support for KVM_SEV_RECEIVE_START command
KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command
KVM: SVM: Add KVM_SEV_RECEIVE_FINISH command
KVM: x86: Add AMD SEV specific Hypercall3
KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall
KVM: x86: Introduce KVM_GET_PAGE_ENC_BITMAP ioctl
mm: x86: Invoke hypercall when page encryption status is changed
KVM: x86: Introduce KVM_SET_PAGE_ENC_BITMAP ioctl
.../virt/kvm/amd-memory-encryption.rst | 120 +++ Documentation/virt/kvm/api.rst | 71 ++ Documentation/virt/kvm/cpuid.rst | 5 + Documentation/virt/kvm/hypercalls.rst | 15 + Documentation/virt/kvm/msr.rst | 10 + arch/x86/include/asm/kvm_host.h | 7 + arch/x86/include/asm/kvm_para.h | 12 + arch/x86/include/asm/mem_encrypt.h | 11 + arch/x86/include/asm/paravirt.h | 10 + arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/include/uapi/asm/kvm_para.h | 5 + arch/x86/kernel/kvm.c | 90 +++ arch/x86/kernel/kvmclock.c | 12 + arch/x86/kernel/paravirt.c | 1 + arch/x86/kvm/svm/sev.c | 732 +++++++++++++++++- arch/x86/kvm/svm/svm.c | 21 + arch/x86/kvm/svm/svm.h | 9 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 35 + arch/x86/mm/mem_encrypt.c | 68 +- arch/x86/mm/pat/set_memory.c | 7 + include/linux/efi.h | 1 + include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 52 ++ include/uapi/linux/kvm_para.h | 1 + 25 files changed, 1297 insertions(+), 9 deletions(-)
Signature · 1 line
2.17.1
PATCH v8 1/18 KVM: SVM: Add KVM_SEV SEND_START command
From: Brijesh Singh <[email protected]>
The command is used to create an outgoing SEV guest encryption context.
--- .../virt/kvm/amd-memory-encryption.rst | 27 ++++ arch/x86/kvm/svm/sev.c | 125 ++++++++++++++++++ include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 12 ++ 4 files changed, 168 insertions(+), 4 deletions(-)
Documentation/virt/kvm/amd-memory-encryption.rst +27 -0
@@ -263,6 +263,33 @@ Returns: 0 on success, -negative on error __u32 trans_len; }; +10. KVM_SEV_SEND_START +---------------------- + +The KVM_SEV_SEND_START command can be used by the hypervisor to create an +outgoing guest encryption context. + +Parameters (in): struct kvm_sev_send_start + +Returns: 0 on success, -negative on error + +:: + struct kvm_sev_send_start { + __u32 policy; /* guest policy */ + + __u64 pdh_cert_uaddr; /* platform Diffie-Hellman certificate */ + __u32 pdh_cert_len; + + __u64 plat_certs_uaddr; /* platform certificate chain */ + __u32 plat_certs_len; + + __u64 amd_certs_uaddr; /* AMD certificate */ + __u32 amd_certs_len; + + __u64 session_uaddr; /* Guest session information */ + __u32 session_len; + }; + References ==========
arch/x86/kvm/svm/sev.c +125 -0
137 lines not on this page · raw message
include/linux/psp-sev.h +4 -4
@@ -323,11 +323,11 @@ struct sev_data_send_start {u64 pdh_cert_address;/* In */ u32 pdh_cert_len;/* In */ u32 reserved1; -u64 plat_cert_address;/* In */ -u32 plat_cert_len;/* In */ +u64 plat_certs_address;/* In */ +u32 plat_certs_len;/* In */ u32 reserved2; -u64 amd_cert_address;/* In */ -u32 amd_cert_len;/* In */ +u64 amd_certs_address;/* In */ +u32 amd_certs_len;/* In */ u32 reserved3;u64 session_address;/* In */ u32 session_len;/* In/Out */
include/uapi/linux/kvm.h +12 -0
@@ -1598,6 +1598,18 @@ struct kvm_sev_dbg {__u32 len; }; +struct kvm_sev_send_start { +__u32 policy; +__u64 pdh_cert_uaddr; +__u32 pdh_cert_len; +__u64 plat_certs_uaddr; +__u32 plat_certs_len; +__u64 amd_certs_uaddr; +__u32 amd_certs_len; +__u64 session_uaddr; +__u32 session_len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
Signature · 1 line
2.17.1
PATCH v8 2/18 KVM: SVM: Add KVM_SEND_UPDATE_DATA command
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The command is used for encrypting the guest memory region using the encryption context created with KVM_SEV_SEND_START.
--- .../virt/kvm/amd-memory-encryption.rst | 24 ++++ arch/x86/kvm/svm/sev.c | 135 +++++++++++++++++- include/uapi/linux/kvm.h | 9 ++ 3 files changed, 164 insertions(+), 4 deletions(-)
Documentation/virt/kvm/amd-memory-encryption.rst +24 -0
@@ -290,6 +290,30 @@ Returns: 0 on success, -negative on error __u32 session_len; }; +11. KVM_SEV_SEND_UPDATE_DATA +---------------------------- + +The KVM_SEV_SEND_UPDATE_DATA command can be used by the hypervisor to encrypt the +outgoing guest memory region with the encryption context creating using +KVM_SEV_SEND_START. + +Parameters (in): struct kvm_sev_send_update_data + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_launch_send_update_data { + __u64 hdr_uaddr; /* userspace address containing the packet header */ + __u32 hdr_len; + + __u64 guest_uaddr; /* the source memory region to be encrypted */ + __u32 guest_len; + + __u64 trans_uaddr; /* the destition memory region */ + __u32 trans_len; + }; + References ==========
arch/x86/kvm/svm/sev.c +131 -4
165 lines not on this page · raw message
include/uapi/linux/kvm.h +9 -0
@@ -1610,6 +1610,15 @@ struct kvm_sev_send_start {__u32 session_len; }; +struct kvm_sev_send_update_data { +__u64 hdr_uaddr; +__u32 hdr_len; +__u64 guest_uaddr; +__u32 guest_len; +__u64 trans_uaddr; +__u32 trans_len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
Signature · 1 line
2.17.1
Re: [PATCH v8 02/18] KVM: SVM: Add KVM_SEND_UPDATE_DATA command
Quoted 5 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
The command is used for encrypting the guest memory region using the encryption context created with
KVM_SEV_SEND_START.
Quoted 14 lines
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Steve Rutherford <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>
Quoted 237 lines
--- .../virt/kvm/amd-memory-encryption.rst | 24 ++++ arch/x86/kvm/svm/sev.c | 135 +++++++++++++++++- include/uapi/linux/kvm.h | 9 ++ 3 files changed, 164 insertions(+), 4 deletions(-)Documentation/virt/kvm/amd-memory-encryption.rst +24
-0@@ -290,6 +290,30 @@ Returns: 0 on success, -negative on error __u32 session_len; }; +11. KVM_SEV_SEND_UPDATE_DATA +---------------------------- + +The KVM_SEV_SEND_UPDATE_DATA command can be used by the hypervisor to encrypt the +outgoing guest memory region with the encryption context creating using +KVM_SEV_SEND_START. + +Parameters (in): struct kvm_sev_send_update_data + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_launch_send_update_data { + __u64 hdr_uaddr; /* userspace address containing the packet header */ + __u32 hdr_len; + + __u64 guest_uaddr; /* the source memory region to be encrypted */ + __u32 guest_len; + + __u64 trans_uaddr; /* the destition memory region */ + __u32 trans_len; + }; + References ==========arch/x86/kvm/svm/sev.c +131
-4@@ -23,6 +23,7 @@ static DECLARE_RWSEM(sev_deactivate_lock);static DEFINE_MUTEX (sev_bitmap_lock);unsigned int max_sev_asid;static unsigned int min_sev_asid; +static unsigned long sev_me_mask;static unsigned long *sev_asid_bitmap;static unsigned long *sev_reclaim_asid_bitmap;#define __sme_page_pa (x) __sme_set(page_to_pfn(x) << PAGE_SHIFT)@@ -1035,6 +1036,123 @@ static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +/* Userspace wants to query either header or trans length. */ +static int +__sev_send_update_data_query_lengths (struct kvm *kvm,struct kvm_sev_cmd *argp, +struct kvm_sev_send_update_data *params) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_send_update_data *data; +int ret; + + data =kzalloc (sizeof (*data),GFP_KERNEL_ACCOUNT ); +if (!data) +return -ENOMEM ; + + data->handle = sev->handle; + ret =sev_issue_cmd (kvm,SEV_CMD_SEND_UPDATE_DATA , data, &argp->error); + + params->hdr_len = data->hdr_len; + params->trans_len = data->trans_len; + +if (copy_to_user ((void __user *)(uintptr_t )argp->data, params, +sizeof (struct kvm_sev_send_update_data ))) + ret = -EFAULT ; + +kfree (data); +return ret; +} + +static int sev_send_update_data (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_send_update_data *data; +struct kvm_sev_send_update_data params; +void *hdr, *trans_data; +struct page **guest_page; +unsigned long n; +int ret, offset; + +if (!sev_guest (kvm)) +return -ENOTTY ; + +if (copy_from_user (¶ms, (void __user *)(uintptr_t )argp->data, +sizeof (struct kvm_sev_send_update_data ))) +return -EFAULT ; + +/* userspace wants to query either header or trans length */ +if (!params.trans_len || !params.hdr_len) +return __sev_send_update_data_query_lengths (kvm, argp, ¶ms); + +if (!params.trans_uaddr || !params.guest_uaddr || + !params.guest_len || !params.hdr_uaddr) +return -EINVAL ; + +/* Check if we are crossing the page boundary */ + offset = params.guest_uaddr & (PAGE_SIZE -1 ); +if ((params.guest_len + offset >PAGE_SIZE )) +return -EINVAL ; + +/* Pin guest memory */ + guest_page =sev_pin_memory (kvm, params.guest_uaddr &PAGE_MASK , +PAGE_SIZE , &n,0 ); +if (!guest_page) +return -EFAULT ; + +/* allocate memory for header and transport buffer */ + ret = -ENOMEM ; + hdr =kmalloc (params.hdr_len,GFP_KERNEL_ACCOUNT ); +if (!hdr) + goto e_unpin; + + trans_data =kmalloc (params.trans_len,GFP_KERNEL_ACCOUNT ); +if (!trans_data) + goto e_free_hdr; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) + goto e_free_trans_data; + + data->hdr_address =__psp_pa (hdr); + data->hdr_len = params.hdr_len; + data->trans_address =__psp_pa (trans_data); + data->trans_len = params.trans_len; + +/* The SEND_UPDATE_DATA command requires C-bit to be always set. */ + data->guest_address = (page_to_pfn (guest_page[0 ]) <<PAGE_SHIFT ) + + offset; + data->guest_address |= sev_me_mask; + data->guest_len = params.guest_len; + data->handle = sev->handle; + + ret =sev_issue_cmd (kvm,SEV_CMD_SEND_UPDATE_DATA , data, &argp->error); + +if (ret) + goto e_free; + +/* copy transport buffer to user space */ +if (copy_to_user ((void __user *)(uintptr_t )params.trans_uaddr, + trans_data, params.trans_len)) { + ret = -EFAULT ; + goto e_free; + } + +/* Copy packet header to userspace. */ + ret =copy_to_user ((void __user *)(uintptr_t )params.hdr_uaddr, hdr, + params.hdr_len); + +e_free: +kfree (data); +e_free_trans_data: +kfree (trans_data); +e_free_hdr: +kfree (hdr); +e_unpin: +sev_unpin_memory (kvm, guest_page, n); + +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;@@ -1082,6 +1200,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_SEND_START : r =sev_send_start (kvm, &sev_cmd);break ; +case KVM_SEV_SEND_UPDATE_DATA : + r =sev_send_update_data (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;@@ -1238,16 +1359,22 @@ void sev_vm_destroy(struct kvm *kvm)int __init sev_hardware_setup (void ) {struct sev_user_data_status *status; +u32 eax, ebx;int rc; -/* Maximum number of encrypted guests supported simultaneously */ - max_sev_asid =cpuid_ecx (0x8000001F ); +/* +* Query the memory encryption information. +* EBX: Bit 0:5 Pagetable bit position used to indicate encryption +* (aka Cbit). +* ECX: Maximum number of encrypted guests supported simultaneously. +* EDX: Minimum ASID value that should be used for SEV guest. +*/ +cpuid (0x8000001f , &eax, &ebx, &max_sev_asid, &min_sev_asid);if (!svm_sev_enabled ())return 1 ; -/* Minimum ASID value that should be used for SEV guest */ - min_sev_asid =cpuid_edx (0x8000001F ); + sev_me_mask =1UL << (ebx &0x3f );/* Initialize SEV ASID bitmaps */ sev_asid_bitmap =bitmap_zalloc (max_sev_asid,GFP_KERNEL );include/uapi/linux/kvm.h +9
-0@@ -1610,6 +1610,15 @@ struct kvm_sev_send_start {__u32 session_len; }; +struct kvm_sev_send_update_data { +__u64 hdr_uaddr; +__u32 hdr_len; +__u64 guest_uaddr; +__u32 guest_len; +__u64 trans_uaddr; +__u32 trans_len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)Signature · 1 line
2.17.1
PATCH v8 3/18 KVM: SVM: Add KVM_SEV_SEND_FINISH command
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The command is used to finailize the encryption context created with KVM_SEV_SEND_START command.
--- .../virt/kvm/amd-memory-encryption.rst | 8 +++++++ arch/x86/kvm/svm/sev.c | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+)
Documentation/virt/kvm/amd-memory-encryption.rst +8 -0
@@ -314,6 +314,14 @@ Returns: 0 on success, -negative on error __u32 trans_len; }; +12. KVM_SEV_SEND_FINISH +------------------------ + +After completion of the migration flow, the KVM_SEV_SEND_FINISH command can be +issued by the hypervisor to delete the encryption context. + +Returns: 0 on success, -negative on error + References ==========
arch/x86/kvm/svm/sev.c +23 -0
@@ -1153,6 +1153,26 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_send_finish (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_send_finish *data; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + data->handle = sev->handle; + ret =sev_issue_cmd (kvm,SEV_CMD_SEND_FINISH , data, &argp->error); + +kfree (data); +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;
@@ -1203,6 +1223,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_SEND_UPDATE_DATA : r =sev_send_update_data (kvm, &sev_cmd);break ; +case KVM_SEV_SEND_FINISH : + r =sev_send_finish (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;
Signature · 1 line
2.17.1
Re: [PATCH v8 03/18] KVM: SVM: Add KVM_SEV_SEND_FINISH command
Quoted 5 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
The command is used to finailize the encryption context created with
KVM_SEV_SEND_STARTcommand.
Quoted 14 lines
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Steve Rutherford <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>
Quoted 68 lines
--- .../virt/kvm/amd-memory-encryption.rst | 8 +++++++ arch/x86/kvm/svm/sev.c | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+)Documentation/virt/kvm/amd-memory-encryption.rst +8
-0@@ -314,6 +314,14 @@ Returns: 0 on success, -negative on error __u32 trans_len; }; +12. KVM_SEV_SEND_FINISH +------------------------ + +After completion of the migration flow, the KVM_SEV_SEND_FINISH command can be +issued by the hypervisor to delete the encryption context. + +Returns: 0 on success, -negative on error + References ==========arch/x86/kvm/svm/sev.c +23
-0@@ -1153,6 +1153,26 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_send_finish (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_send_finish *data; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + data->handle = sev->handle; + ret =sev_issue_cmd (kvm,SEV_CMD_SEND_FINISH , data, &argp->error); + +kfree (data); +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;@@ -1203,6 +1223,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_SEND_UPDATE_DATA : r =sev_send_update_data (kvm, &sev_cmd);break ; +case KVM_SEV_SEND_FINISH : + r =sev_send_finish (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;Signature · 1 line
2.17.1
PATCH v8 4/18 KVM: SVM: Add support for KVM_SEV_RECEIVE_START command
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The command is used to create the encryption context for an incoming SEV guest. The encryption context can be later used by the hypervisor to import the incoming data into the SEV guest memory space.
--- .../virt/kvm/amd-memory-encryption.rst | 29 +++++++ arch/x86/kvm/svm/sev.c | 81 +++++++++++++++++++ include/uapi/linux/kvm.h | 9 +++ 3 files changed, 119 insertions(+)
Documentation/virt/kvm/amd-memory-encryption.rst +29 -0
@@ -322,6 +322,35 @@ issued by the hypervisor to delete the encryption context. Returns: 0 on success, -negative on error +13. KVM_SEV_RECEIVE_START +------------------------ + +The KVM_SEV_RECEIVE_START command is used for creating the memory encryption +context for an incoming SEV guest. To create the encryption context, the user must +provide a guest policy, the platform public Diffie-Hellman (PDH) key and session +information. + +Parameters: struct kvm_sev_receive_start (in/out) + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_receive_start { + __u32 handle; /* if zero then firmware creates a new handle */ + __u32 policy; /* guest's policy */ + + __u64 pdh_uaddr; /* userspace address pointing to the PDH key */ + __u32 pdh_len; + + __u64 session_uaddr; /* userspace address which points to the guest session information */ + __u32 session_len; + }; + +On success, the 'handle' field contains a new handle and on error, a negative value. + +For more details, see SEV spec Section 6.12. + References ==========
arch/x86/kvm/svm/sev.c +81 -0
93 lines not on this page · raw message
include/uapi/linux/kvm.h +9 -0
@@ -1619,6 +1619,15 @@ struct kvm_sev_send_update_data {__u32 trans_len; }; +struct kvm_sev_receive_start { +__u32 handle; +__u32 policy; +__u64 pdh_uaddr; +__u32 pdh_len; +__u64 session_uaddr; +__u32 session_len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
Signature · 1 line
2.17.1
Re: [PATCH v8 04/18] KVM: SVM: Add support for KVM_SEV_RECEIVE_START command
Quoted 6 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
The command is used to create the encryption context for an incoming SEV guest. The encryption context can be later used by the hypervisor to import the incoming data into the SEV guest memory space.
Quoted 14 lines
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Steve Rutherford <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>
Quoted 168 lines
--- .../virt/kvm/amd-memory-encryption.rst | 29 +++++++ arch/x86/kvm/svm/sev.c | 81 +++++++++++++++++++ include/uapi/linux/kvm.h | 9 +++ 3 files changed, 119 insertions(+)Documentation/virt/kvm/amd-memory-encryption.rst +29
-0@@ -322,6 +322,35 @@ issued by the hypervisor to delete the encryption context. Returns: 0 on success, -negative on error +13. KVM_SEV_RECEIVE_START +------------------------ + +The KVM_SEV_RECEIVE_START command is used for creating the memory encryption +context for an incoming SEV guest. To create the encryption context, the user must +provide a guest policy, the platform public Diffie-Hellman (PDH) key and session +information. + +Parameters: struct kvm_sev_receive_start (in/out) + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_receive_start { + __u32 handle; /* if zero then firmware creates a new handle */ + __u32 policy; /* guest's policy */ + + __u64 pdh_uaddr; /* userspace address pointing to the PDH key */ + __u32 pdh_len; + + __u64 session_uaddr; /* userspace address which points to the guest session information */ + __u32 session_len; + }; + +On success, the 'handle' field contains a new handle and on error, a negative value. + +For more details, see SEV spec Section 6.12. + References ==========arch/x86/kvm/svm/sev.c +81
-0@@ -1173,6 +1173,84 @@ static int sev_send_finish(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_receive_start (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_receive_start *start; +struct kvm_sev_receive_start params; +int *error = &argp->error; +void *session_data; +void *pdh_data; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; + +/* Get parameter from the userspace */ +if (copy_from_user (¶ms, (void __user *)(uintptr_t )argp->data, +sizeof (struct kvm_sev_receive_start ))) +return -EFAULT ; + +/* some sanity checks */ +if (!params.pdh_uaddr || !params.pdh_len || + !params.session_uaddr || !params.session_len) +return -EINVAL ; + + pdh_data =psp_copy_user_blob (params.pdh_uaddr, params.pdh_len); +if (IS_ERR (pdh_data)) +return PTR_ERR (pdh_data); + + session_data =psp_copy_user_blob (params.session_uaddr, + params.session_len); +if (IS_ERR (session_data)) { + ret =PTR_ERR (session_data); + goto e_free_pdh; + } + + ret = -ENOMEM ; + start =kzalloc (sizeof (*start),GFP_KERNEL ); +if (!start) + goto e_free_session; + + start->handle = params.handle; + start->policy = params.policy; + start->pdh_cert_address =__psp_pa (pdh_data); + start->pdh_cert_len = params.pdh_len; + start->session_address =__psp_pa (session_data); + start->session_len = params.session_len; + +/* create memory encryption context */ + ret =__sev_issue_cmd (argp->sev_fd,SEV_CMD_RECEIVE_START , start, + error); +if (ret) + goto e_free; + +/* Bind ASID to this guest */ + ret =sev_bind_asid (kvm, start->handle, error); +if (ret) + goto e_free; + + params.handle = start->handle; +if (copy_to_user ((void __user *)(uintptr_t )argp->data, + ¶ms,sizeof (struct kvm_sev_receive_start ))) { + ret = -EFAULT ; +sev_unbind_asid (kvm, start->handle); + goto e_free; + } + + sev->handle = start->handle; + sev->fd = argp->sev_fd; + +e_free: +kfree (start); +e_free_session: +kfree (session_data); +e_free_pdh: +kfree (pdh_data); + +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;@@ -1226,6 +1304,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_SEND_FINISH : r =sev_send_finish (kvm, &sev_cmd);break ; +case KVM_SEV_RECEIVE_START : + r =sev_receive_start (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;include/uapi/linux/kvm.h +9
-0@@ -1619,6 +1619,15 @@ struct kvm_sev_send_update_data {__u32 trans_len; }; +struct kvm_sev_receive_start { +__u32 handle; +__u32 policy; +__u64 pdh_uaddr; +__u32 pdh_len; +__u64 session_uaddr; +__u32 session_len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)Signature · 1 line
2.17.1
PATCH v8 5/18 KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The command is used for copying the incoming buffer into the SEV guest memory space.
--- .../virt/kvm/amd-memory-encryption.rst | 24 ++++++ arch/x86/kvm/svm/sev.c | 79 +++++++++++++++++++ include/uapi/linux/kvm.h | 9 +++ 3 files changed, 112 insertions(+)
Documentation/virt/kvm/amd-memory-encryption.rst +24 -0
@@ -351,6 +351,30 @@ On success, the 'handle' field contains a new handle and on error, a negative va For more details, see SEV spec Section 6.12. +14. KVM_SEV_RECEIVE_UPDATE_DATA +---------------------------- + +The KVM_SEV_RECEIVE_UPDATE_DATA command can be used by the hypervisor to copy +the incoming buffers into the guest memory region with encryption context +created during the KVM_SEV_RECEIVE_START. + +Parameters (in): struct kvm_sev_receive_update_data + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_launch_receive_update_data { + __u64 hdr_uaddr; /* userspace address containing the packet header */ + __u32 hdr_len; + + __u64 guest_uaddr; /* the destination guest memory region */ + __u32 guest_len; + + __u64 trans_uaddr; /* the incoming buffer memory region */ + __u32 trans_len; + }; + References ==========
arch/x86/kvm/svm/sev.c +79 -0
91 lines not on this page · raw message
include/uapi/linux/kvm.h +9 -0
@@ -1628,6 +1628,15 @@ struct kvm_sev_receive_start {__u32 session_len; }; +struct kvm_sev_receive_update_data { +__u64 hdr_uaddr; +__u32 hdr_len; +__u64 guest_uaddr; +__u32 guest_len; +__u64 trans_uaddr; +__u32 trans_len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
Signature · 1 line
2.17.1
PATCH v8 6/18 KVM: SVM: Add KVM_SEV_RECEIVE_FINISH command
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The command finalize the guest receiving process and make the SEV guest ready for the execution.
--- .../virt/kvm/amd-memory-encryption.rst | 8 +++++++ arch/x86/kvm/svm/sev.c | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+)
Documentation/virt/kvm/amd-memory-encryption.rst +8 -0
@@ -375,6 +375,14 @@ Returns: 0 on success, -negative on error __u32 trans_len; }; +15. KVM_SEV_RECEIVE_FINISH +------------------------ + +After completion of the migration flow, the KVM_SEV_RECEIVE_FINISH command can be +issued by the hypervisor to make the guest ready for execution. + +Returns: 0 on success, -negative on error + References ==========
arch/x86/kvm/svm/sev.c +23 -0
@@ -1327,6 +1327,26 @@ static int sev_receive_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_receive_finish (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_receive_finish *data; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + data->handle = sev->handle; + ret =sev_issue_cmd (kvm,SEV_CMD_RECEIVE_FINISH , data, &argp->error); + +kfree (data); +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;
@@ -1386,6 +1406,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_RECEIVE_UPDATE_DATA : r =sev_receive_update_data (kvm, &sev_cmd);break ; +case KVM_SEV_RECEIVE_FINISH : + r =sev_receive_finish (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;
Signature · 1 line
2.17.1
PATCH v8 7/18 KVM: x86: Add AMD SEV specific Hypercall3
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
KVM hypercall framework relies on alternative framework to patch the VMCALL -> VMMCALL on AMD platform. If a hypercall is made before apply_alternative() is called then it defaults to VMCALL. The approach works fine on non SEV guest. A VMCALL would causes #UD, and hypervisor will be able to decode the instruction and do the right things. But when SEV is active, guest memory is encrypted with guest key and hypervisor will not be able to decode the instruction bytes.
Add SEV specific hypercall3, it unconditionally uses VMMCALL. The hypercall will be used by the SEV guest to notify encrypted pages to the hypervisor.
--- arch/x86/include/asm/kvm_para.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/x86/include/asm/kvm_para.h +12 -0
@@ -84,6 +84,18 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,return ret; } +static inline long kvm_sev_hypercall3 (unsigned int nr,unsigned long p1, +unsigned long p2,unsigned long p3) +{ +long ret; + + asmvolatile ("vmmcall" + :"=a" (ret) + :"a" (nr),"b" (p1),"c" (p2),"d" (p3) + :"memory" ); +return ret; +} +#ifdef CONFIG_KVM_GUEST bool kvm_para_available (void );unsigned int kvm_arch_para_features (void );
Signature · 1 line
2.17.1
PATCH v8 8/18 KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
This hypercall is used by the SEV guest to notify a change in the page encryption status to the hypervisor. The hypercall should be invoked only when the encryption attribute is changed from encrypted -> decrypted and vice versa. By default all guest pages are considered encrypted.
--- Documentation/virt/kvm/hypercalls.rst | 15 +++++ arch/x86/include/asm/kvm_host.h | 2 + arch/x86/kvm/svm/sev.c | 90 +++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 2 + arch/x86/kvm/svm/svm.h | 4 ++ arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 6 ++ include/uapi/linux/kvm_para.h | 1 + 8 files changed, 121 insertions(+)
Documentation/virt/kvm/hypercalls.rst +15 -0
@@ -169,3 +169,18 @@ a0: destination APIC ID :Usage example: When sending a call-function IPI-many to vCPUs, yield if any of the IPI target vCPUs was preempted. + + +8. KVM_HC_PAGE_ENC_STATUS +------------------------- +:Architecture: x86 +:Status: active +:Purpose: Notify the encryption status changes in guest page table (SEV guest) + +a0: the guest physical address of the start page +a1: the number of pages +a2: encryption attribute + + Where: + * 1: Encryption attribute is set + * 0: Encryption attribute is cleared
arch/x86/include/asm/kvm_host.h +2 -0
@@ -1254,6 +1254,8 @@ struct kvm_x86_ops {bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); +int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa, +unsigned long sz,unsigned long mode); };struct kvm_x86_init_ops {
arch/x86/kvm/svm/sev.c +90 -0
102 lines not on this page · raw message
arch/x86/kvm/svm/svm.c +2 -0
@@ -4014,6 +4014,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .apic_init_signal_blocked = svm_apic_init_signal_blocked, .check_nested_events = svm_check_nested_events, + + .page_enc_status_hc = svm_page_enc_status_hc, };static struct kvm_x86_init_ops svm_init_ops__initdata = {
arch/x86/kvm/svm/svm.h +4 -0
@@ -65,6 +65,8 @@ struct kvm_sev_info {int fd;/* SEV device fd */ unsigned long pages_locked;/* Number of pages locked */ struct list_head regions_list;/* List of registered regions */ +unsigned long *page_enc_bmap; +unsigned long page_enc_bmap_size; };struct kvm_svm {
@@ -400,6 +402,8 @@ int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, bool has_error_code, u32 error_code);int svm_check_nested_events (struct kvm_vcpu *vcpu);int nested_svm_exit_special (struct vcpu_svm *svm); +int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa, +unsigned long npages,unsigned long enc);/* avic.c */
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -7838,6 +7838,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .nested_get_evmcs_version = NULL, .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault, .apic_init_signal_blocked = vmx_apic_init_signal_blocked, + .page_enc_status_hc = NULL, };static __init int hardware_setup (void )
arch/x86/kvm/x86.c +6 -0
@@ -7605,6 +7605,12 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)kvm_sched_yield (vcpu->kvm, a0); ret =0 ;break ; +case KVM_HC_PAGE_ENC_STATUS : + ret = -KVM_ENOSYS ; +if (kvm_x86_ops.page_enc_status_hc) + ret = kvm_x86_ops.page_enc_status_hc (vcpu->kvm, + a0, a1, a2); +break ;default : ret = -KVM_ENOSYS ;break ;
include/uapi/linux/kvm_para.h +1 -0
@@ -29,6 +29,7 @@#define KVM_HC_CLOCK_PAIRING 9#define KVM_HC_SEND_IPI 10#define KVM_HC_SCHED_YIELD 11 +#define KVM_HC_PAGE_ENC_STATUS 12/* * hypercalls use architecture specific
Signature · 1 line
2.17.1
Re: [PATCH v8 08/18] KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall
Quoted 254 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
This hypercall is used by the SEV guest to notify a change in the page encryption status to the hypervisor. The hypercall should be invoked only when the encryption attribute is changed from encrypted -> decrypted and vice versa. By default all guest pages are considered encrypted.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Venu Busireddy <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>--- Documentation/virt/kvm/hypercalls.rst | 15 +++++ arch/x86/include/asm/kvm_host.h | 2 + arch/x86/kvm/svm/sev.c | 90 +++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 2 + arch/x86/kvm/svm/svm.h | 4 ++ arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 6 ++ include/uapi/linux/kvm_para.h | 1 + 8 files changed, 121 insertions(+)Documentation/virt/kvm/hypercalls.rst +15
-0@@ -169,3 +169,18 @@ a0: destination APIC ID :Usage example: When sending a call-function IPI-many to vCPUs, yield if any of the IPI target vCPUs was preempted. + + +8. KVM_HC_PAGE_ENC_STATUS +------------------------- +:Architecture: x86 +:Status: active +:Purpose: Notify the encryption status changes in guest page table (SEV guest) + +a0: the guest physical address of the start page +a1: the number of pages +a2: encryption attribute + + Where: + * 1: Encryption attribute is set + * 0: Encryption attribute is clearedarch/x86/include/asm/kvm_host.h +2
-0@@ -1254,6 +1254,8 @@ struct kvm_x86_ops {bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); +int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa, +unsigned long sz,unsigned long mode); };struct kvm_x86_init_ops {arch/x86/kvm/svm/sev.c +90
-0@@ -1347,6 +1347,93 @@ static int sev_receive_finish(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_resize_page_enc_bitmap (struct kvm *kvm,unsigned long new_size) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +unsigned long *map; +unsigned long sz; + +if (sev->page_enc_bmap_size >= new_size) +return 0 ; + + sz =ALIGN (new_size,BITS_PER_LONG ) /8 ; + + map =vmalloc (sz); +if (!map) { +pr_err_once ("Failed to allocate encrypted bitmap size %lx\n" , + sz); +return -ENOMEM ; + } + +/* mark the page encrypted (by default) */ +memset (map,0xff , sz); + +bitmap_copy (map, sev->page_enc_bmap, sev->page_enc_bmap_size); +kvfree (sev->page_enc_bmap); + + sev->page_enc_bmap = map; + sev->page_enc_bmap_size = new_size; + +return 0 ; +} + +int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa, +unsigned long npages,unsigned long enc) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +kvm_pfn_t pfn_start, pfn_end; +gfn_t gfn_start, gfn_end; + +if (!sev_guest (kvm)) +return -EINVAL ; + +if (!npages) +return 0 ; + + gfn_start =gpa_to_gfn (gpa); + gfn_end = gfn_start + npages; + +/* out of bound access error check */ +if (gfn_end <= gfn_start) +return -EINVAL ; + +/* lets make sure that gpa exist in our memslot */ + pfn_start =gfn_to_pfn (kvm, gfn_start); + pfn_end =gfn_to_pfn (kvm, gfn_end); + +if (is_error_noslot_pfn (pfn_start) && !is_noslot_pfn (pfn_start)) { +/* +* Allow guest MMIO range(s) to be added +* to the page encryption bitmap. +*/ +return -EINVAL ; + } + +if (is_error_noslot_pfn (pfn_end) && !is_noslot_pfn (pfn_end)) { +/* +* Allow guest MMIO range(s) to be added +* to the page encryption bitmap. +*/ +return -EINVAL ; + } + +mutex_lock (&kvm->lock); + +if (sev->page_enc_bmap_size < gfn_end) + goto unlock; + +if (enc) +__bitmap_set (sev->page_enc_bmap, gfn_start, + gfn_end - gfn_start); +else +__bitmap_clear (sev->page_enc_bmap, gfn_start, + gfn_end - gfn_start); + +unlock: +mutex_unlock (&kvm->lock); +return 0 ; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;@@ -1560,6 +1647,9 @@ void sev_vm_destroy(struct kvm *kvm)sev_unbind_asid (kvm, sev->handle);sev_asid_free (sev->asid); + +kvfree (sev->page_enc_bmap); + sev->page_enc_bmap =NULL ; }int __init sev_hardware_setup (void )arch/x86/kvm/svm/svm.c +2
-0@@ -4014,6 +4014,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .apic_init_signal_blocked = svm_apic_init_signal_blocked, .check_nested_events = svm_check_nested_events, + + .page_enc_status_hc = svm_page_enc_status_hc, };static struct kvm_x86_init_ops svm_init_ops__initdata = {arch/x86/kvm/svm/svm.h +4
-0@@ -65,6 +65,8 @@ struct kvm_sev_info {int fd;/* SEV device fd */ unsigned long pages_locked;/* Number of pages locked */ struct list_head regions_list;/* List of registered regions */ +unsigned long *page_enc_bmap; +unsigned long page_enc_bmap_size; };struct kvm_svm {@@ -400,6 +402,8 @@ int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, bool has_error_code, u32 error_code);int svm_check_nested_events (struct kvm_vcpu *vcpu);int nested_svm_exit_special (struct vcpu_svm *svm); +int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa, +unsigned long npages,unsigned long enc);/* avic.c */ arch/x86/kvm/vmx/vmx.c +1
-0@@ -7838,6 +7838,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .nested_get_evmcs_version = NULL, .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault, .apic_init_signal_blocked = vmx_apic_init_signal_blocked, + .page_enc_status_hc = NULL, };static __init int hardware_setup (void )arch/x86/kvm/x86.c +6
-0@@ -7605,6 +7605,12 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)kvm_sched_yield (vcpu->kvm, a0); ret =0 ;break ; +case KVM_HC_PAGE_ENC_STATUS : + ret = -KVM_ENOSYS ; +if (kvm_x86_ops.page_enc_status_hc) + ret = kvm_x86_ops.page_enc_status_hc (vcpu->kvm, + a0, a1, a2); +break ;default : ret = -KVM_ENOSYS ;break ;include/uapi/linux/kvm_para.h +1
-1@@ -29,6 +29,7 @@#define KVM_HC_CLOCK_PAIRING 9#define KVM_HC_SEND_IPI 10#define KVM_HC_SCHED_YIELD 11 +#define KVM_HC_PAGE_ENC_STATUS 12/* * hypercalls use architecture specific --
Quoted 2 lines
2.17.1
PATCH v8 9/18 KVM: x86: Introduce KVM_GET_PAGE_ENC_BITMAP ioctl
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The ioctl can be used to retrieve page encryption bitmap for a given gfn range.
Return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copy bmap->num_pages bytes in the userspace buffer, if bmap->num_pages is not byte aligned we read the trailing bits from the userspace and copy those bits as is.
--- Documentation/virt/kvm/api.rst | 27 +++++++++++++ arch/x86/include/asm/kvm_host.h | 2 + arch/x86/kvm/svm/sev.c | 70 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 12 ++++++ include/uapi/linux/kvm.h | 12 ++++++ 7 files changed, 125 insertions(+)
Documentation/virt/kvm/api.rst +27 -0
@@ -4636,6 +4636,33 @@ This ioctl resets VCPU registers and control structures according to the clear cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the initial reset. +4.125 KVM_GET_PAGE_ENC_BITMAP (vm ioctl) +--------------------------------------- + +:Capability: basic +:Architectures: x86 +:Type: vm ioctl +:Parameters: struct kvm_page_enc_bitmap (in/out) +:Returns: 0 on success, -1 on error + +/* for KVM_GET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { + __u64 start_gfn; + __u64 num_pages; + union { + void __user *enc_bitmap; /* one bit per page */ + __u64 padding2; + }; +}; + +The encrypted VMs have the concept of private and shared pages. The private +pages are encrypted with the guest-specific key, while the shared pages may +be encrypted with the hypervisor key. The KVM_GET_PAGE_ENC_BITMAP can +be used to get the bitmap indicating whether the guest page is private +or shared. The bitmap can be used during the guest migration. If the page +is private then the userspace need to use SEV migration commands to transmit +the page. + 4.125 KVM_S390_PV_COMMAND -------------------------
arch/x86/include/asm/kvm_host.h +2 -0
@@ -1256,6 +1256,8 @@ struct kvm_x86_ops {int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu);int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa,unsigned long sz,unsigned long mode); +int (*get_page_enc_bitmap)(struct kvm *kvm, +struct kvm_page_enc_bitmap *bmap); };struct kvm_x86_init_ops {
arch/x86/kvm/svm/sev.c +70 -0
76 lines not on this page · raw message
arch/x86/kvm/svm/svm.c +1 -0
@@ -4016,6 +4016,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .check_nested_events = svm_check_nested_events, .page_enc_status_hc = svm_page_enc_status_hc, + .get_page_enc_bitmap = svm_get_page_enc_bitmap, };static struct kvm_x86_init_ops svm_init_ops__initdata = {
arch/x86/kvm/svm/svm.h +1 -0
@@ -404,6 +404,7 @@ int svm_check_nested_events(struct kvm_vcpu *vcpu);int nested_svm_exit_special (struct vcpu_svm *svm);int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc); +int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);/* avic.c */
arch/x86/kvm/x86.c +12 -0
@@ -5208,6 +5208,18 @@ long kvm_arch_vm_ioctl(struct file *filp,case KVM_SET_PMU_EVENT_FILTER : r =kvm_vm_ioctl_set_pmu_event_filter (kvm, argp);break ; +case KVM_GET_PAGE_ENC_BITMAP : { +struct kvm_page_enc_bitmap bitmap; + + r = -EFAULT ; +if (copy_from_user (&bitmap, argp,sizeof (bitmap))) + goto out; + + r = -ENOTTY ; +if (kvm_x86_ops.get_page_enc_bitmap) + r = kvm_x86_ops.get_page_enc_bitmap (kvm, &bitmap); +break ; + }default : r = -ENOTTY ; }
include/uapi/linux/kvm.h +12 -0
@@ -505,6 +505,16 @@ struct kvm_dirty_log { }; }; +/* for KVM_GET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { +__u64 start_gfn; +__u64 num_pages; +union { +void __user *enc_bitmap;/* one bit per page */ +__u64 padding2; + }; +}; +/* for KVM_CLEAR_DIRTY_LOG */ struct kvm_clear_dirty_log {__u32 slot;
@@ -1518,6 +1528,8 @@ struct kvm_pv_cmd {/* Available with KVM_CAP_S390_PROTECTED */ #define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd) +#define KVM_GET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc6, struct kvm_page_enc_bitmap) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */
Signature · 1 line
2.17.1
Re: [PATCH v8 09/18] KVM: x86: Introduce KVM_GET_PAGE_ENC_BITMAP ioctl
Quoted 112 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
The ioctl can be used to retrieve page encryption bitmap for a given gfn range.
Return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copy
bmap->num_pagesbytes in the userspace buffer, ifbmap->num_pagesis not byte aligned we read the trailing bits from the userspace and copy those bits as is.Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Venu Busireddy <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>--- Documentation/virt/kvm/api.rst | 27 +++++++++++++ arch/x86/include/asm/kvm_host.h | 2 + arch/x86/kvm/svm/sev.c | 70 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 12 ++++++ include/uapi/linux/kvm.h | 12 ++++++ 7 files changed, 125 insertions(+)Documentation/virt/kvm/api.rst +27
-0@@ -4636,6 +4636,33 @@ This ioctl resets VCPU registers and control structures according to the clear cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the initial reset. +4.125 KVM_GET_PAGE_ENC_BITMAP (vm ioctl) +--------------------------------------- + +:Capability: basic +:Architectures: x86 +:Type: vm ioctl +:Parameters: struct kvm_page_enc_bitmap (in/out) +:Returns: 0 on success, -1 on error + +/* for KVM_GET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { + __u64 start_gfn; + __u64 num_pages; + union { + void __user *enc_bitmap; /* one bit per page */ + __u64 padding2; + }; +}; + +The encrypted VMs have the concept of private and shared pages. The private +pages are encrypted with the guest-specific key, while the shared pages may +be encrypted with the hypervisor key. The KVM_GET_PAGE_ENC_BITMAP can +be used to get the bitmap indicating whether the guest page is private +or shared. The bitmap can be used during the guest migration. If the page +is private then the userspace need to use SEV migration commands to transmit +the page. + 4.125 KVM_S390_PV_COMMAND -------------------------arch/x86/include/asm/kvm_host.h +2
-0@@ -1256,6 +1256,8 @@ struct kvm_x86_ops {int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu);int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa,unsigned long sz,unsigned long mode); +int (*get_page_enc_bitmap)(struct kvm *kvm, +struct kvm_page_enc_bitmap *bmap); };struct kvm_x86_init_ops {arch/x86/kvm/svm/sev.c +18
-0@@ -1434,6 +1434,76 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa,return 0 ; } +int svm_get_page_enc_bitmap (struct kvm *kvm, +struct kvm_page_enc_bitmap *bmap) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +unsigned long gfn_start, gfn_end; +unsigned long sz, i, sz_bytes; +unsigned long *bitmap; +int ret, n; + +if (!sev_guest (kvm)) +return -ENOTTY ; + + gfn_start = bmap->start_gfn; + gfn_end = gfn_start + bmap->num_pages; + + sz =ALIGN (bmap->num_pages,BITS_PER_LONG ) /BITS_PER_BYTE ; + bitmap =kmalloc (sz,GFP_KERNEL ); +if (!bitmap)
arch/x86/kvm/svm/sev.c int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa, · line 1464
Quoted 10 lines
arch/x86/kvm/svm/sev.c +10
-0+return -ENOMEM ; + +/* by default all pages are marked encrypted */ +memset (bitmap,0xff , sz); + +mutex_lock (&kvm->lock); +if (sev->page_enc_bmap) { + i = gfn_start; +for_each_clear_bit_from (i, sev->page_enc_bmap, +min (sev->page_enc_bmap_size, gfn_end))
gfn_end is not a size? I believe you want either gfn_end - gfn_start or bmap->num_pages.
Quoted 4 lines
arch/x86/kvm/svm/sev.c +4
-0+clear_bit (i - gfn_start, bitmap); + } +mutex_unlock (&kvm->lock); +
arch/x86/kvm/svm/sev.c int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa, · line 1478
Quoted 10 lines
arch/x86/kvm/svm/sev.c +10
-0+ ret = -EFAULT ; + + n = bmap->num_pages %BITS_PER_BYTE ; + sz_bytes =ALIGN (bmap->num_pages,BITS_PER_BYTE ) /BITS_PER_BYTE ; + +/* +* Return the correct bitmap as per the number of pages being +* requested by the user. Ensure that we only copy bmap->num_pages +* bytes in the userspace buffer, if bmap->num_pages is not byte +* aligned we read the trailing bits from the userspace and copy
Nit: "userspace" instead of "the userspace".
Quoted 111 lines
arch/x86/kvm/svm/sev.c +28
-0+* those bits as is. +*/ + +if (n) { +unsigned char *bitmap_kernel = (unsigned char *)bitmap; +unsigned char bitmap_user; +unsigned long offset, mask; + + offset = bmap->num_pages /BITS_PER_BYTE ; +if (copy_from_user (&bitmap_user, bmap->enc_bitmap + offset, +sizeof (unsigned char ))) + goto out; + + mask =GENMASK (n -1 ,0 ); + bitmap_user &= ~mask; + bitmap_kernel[offset] &= mask; + bitmap_kernel[offset] |= bitmap_user; + } + +if (copy_to_user (bmap->enc_bitmap, bitmap, sz_bytes)) + goto out; + + ret =0 ; +out: +kfree (bitmap); +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;arch/x86/kvm/svm/svm.c +1
-0@@ -4016,6 +4016,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .check_nested_events = svm_check_nested_events, .page_enc_status_hc = svm_page_enc_status_hc, + .get_page_enc_bitmap = svm_get_page_enc_bitmap, };static struct kvm_x86_init_ops svm_init_ops__initdata = {arch/x86/kvm/svm/svm.h +1
-0@@ -404,6 +404,7 @@ int svm_check_nested_events(struct kvm_vcpu *vcpu);int nested_svm_exit_special (struct vcpu_svm *svm);int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc); +int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);/* avic.c */ arch/x86/kvm/x86.c +12
-0@@ -5208,6 +5208,18 @@ long kvm_arch_vm_ioctl(struct file *filp,case KVM_SET_PMU_EVENT_FILTER : r =kvm_vm_ioctl_set_pmu_event_filter (kvm, argp);break ; +case KVM_GET_PAGE_ENC_BITMAP : { +struct kvm_page_enc_bitmap bitmap; + + r = -EFAULT ; +if (copy_from_user (&bitmap, argp,sizeof (bitmap))) + goto out; + + r = -ENOTTY ; +if (kvm_x86_ops.get_page_enc_bitmap) + r = kvm_x86_ops.get_page_enc_bitmap (kvm, &bitmap); +break ; + }default : r = -ENOTTY ; }include/uapi/linux/kvm.h +12
-1@@ -505,6 +505,16 @@ struct kvm_dirty_log { }; }; +/* for KVM_GET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { +__u64 start_gfn; +__u64 num_pages; +union { +void __user *enc_bitmap;/* one bit per page */ +__u64 padding2; + }; +}; +/* for KVM_CLEAR_DIRTY_LOG */ struct kvm_clear_dirty_log {__u32 slot;@@ -1518,6 +1528,8 @@ struct kvm_pv_cmd {/* Available with KVM_CAP_S390_PROTECTED */ #define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd) +#define KVM_GET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc6, struct kvm_page_enc_bitmap) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */ --2.17.1
PATCH v8 10/18 mm: x86: Invoke hypercall when page encryption status is changed
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
Invoke a hypercall when a memory region is changed from encrypted -> decrypted and vice versa. Hypervisor needs to know the page encryption status during the guest migration.
--- arch/x86/include/asm/paravirt.h | 10 +++++ arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/mem_encrypt.c | 57 ++++++++++++++++++++++++++- arch/x86/mm/pat/set_memory.c | 7 ++++ 5 files changed, 76 insertions(+), 1 deletion(-)
arch/x86/include/asm/paravirt.h +10 -0
@@ -78,6 +78,12 @@ static inline void paravirt_arch_exit_mmap(struct mm_struct *mm)PVOP_VCALL1 (mmu.exit_mmap, mm); } +static inline void page_encryption_changed (unsigned long vaddr,int npages, +bool enc) +{ +PVOP_VCALL3 (mmu.page_encryption_changed, vaddr, npages, enc); +} +#ifdef CONFIG_PARAVIRT_XXL static inline void load_sp0 (unsigned long sp0) {
@@ -946,6 +952,10 @@ static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm,static inline void paravirt_arch_exit_mmap (struct mm_struct *mm) { } + +static inline void page_encryption_changed (unsigned long vaddr,int npages,bool enc) +{ +}#endif #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_PARAVIRT_H */
arch/x86/include/asm/paravirt_types.h +2 -0
@@ -215,6 +215,8 @@ struct pv_mmu_ops {/* Hook for intercepting the destruction of an mm_struct. */ void (*exit_mmap)(struct mm_struct *mm); +void (*page_encryption_changed)(unsigned long vaddr,int npages, +bool enc);#ifdef CONFIG_PARAVIRT_XXL struct paravirt_callee_save read_cr2;
arch/x86/kernel/paravirt.c +1 -0
@@ -367,6 +367,7 @@ struct paravirt_patch_template pv_ops = { (void (*)(struct mmu_gather *, void *))tlb_remove_page, .mmu.exit_mmap = paravirt_nop, + .mmu.page_encryption_changed = paravirt_nop, #ifdef CONFIG_PARAVIRT_XXL .mmu.read_cr2 = __PV_IS_CALLEE_SAVE(native_read_cr2),
arch/x86/mm/mem_encrypt.c +56 -1
98 lines not on this page · raw message
arch/x86/mm/pat/set_memory.c +7 -0
@@ -27,6 +27,7 @@#include <asm/proto.h> #include <asm/memtype.h> #include <asm/set_memory.h> +#include <asm/paravirt.h> #include "../mm_internal.h"
@@ -2003,6 +2004,12 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc)*/ cpa_flush (&cpa,0 ); +/* Notify hypervisor that a given memory range is mapped encrypted +* or decrypted. The hypervisor will use this information during the +* VM migration. +*/ +page_encryption_changed (addr, numpages, enc); +return ret; }
Signature · 1 line
2.17.1
Re: [PATCH v8 10/18] mm: x86: Invoke hypercall when page encryption status is changed
Quoted 216 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
Invoke a hypercall when a memory region is changed from encrypted -> decrypted and vice versa. Hypervisor needs to know the page encryption status during the guest migration.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Venu Busireddy <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/include/asm/paravirt.h | 10 +++++ arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/mem_encrypt.c | 57 ++++++++++++++++++++++++++- arch/x86/mm/pat/set_memory.c | 7 ++++ 5 files changed, 76 insertions(+), 1 deletion(-)arch/x86/include/asm/paravirt.h +10
-0@@ -78,6 +78,12 @@ static inline void paravirt_arch_exit_mmap(struct mm_struct *mm)PVOP_VCALL1 (mmu.exit_mmap, mm); } +static inline void page_encryption_changed (unsigned long vaddr,int npages, +bool enc) +{ +PVOP_VCALL3 (mmu.page_encryption_changed, vaddr, npages, enc); +} +#ifdef CONFIG_PARAVIRT_XXL static inline void load_sp0 (unsigned long sp0) {@@ -946,6 +952,10 @@ static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm,static inline void paravirt_arch_exit_mmap (struct mm_struct *mm) { } + +static inline void page_encryption_changed (unsigned long vaddr,int npages,bool enc) +{ +}#endif #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_PARAVIRT_H */ arch/x86/include/asm/paravirt_types.h +2
-0@@ -215,6 +215,8 @@ struct pv_mmu_ops {/* Hook for intercepting the destruction of an mm_struct. */ void (*exit_mmap)(struct mm_struct *mm); +void (*page_encryption_changed)(unsigned long vaddr,int npages, +bool enc);#ifdef CONFIG_PARAVIRT_XXL struct paravirt_callee_save read_cr2;arch/x86/kernel/paravirt.c +1
-0@@ -367,6 +367,7 @@ struct paravirt_patch_template pv_ops = { (void (*)(struct mmu_gather *, void *))tlb_remove_page, .mmu.exit_mmap = paravirt_nop, + .mmu.page_encryption_changed = paravirt_nop, #ifdef CONFIG_PARAVIRT_XXL .mmu.read_cr2 = __PV_IS_CALLEE_SAVE(native_read_cr2),arch/x86/mm/mem_encrypt.c +56
-1@@ -19,6 +19,7 @@#include <linux/kernel.h> #include <linux/bitops.h> #include <linux/dma-mapping.h> +#include <linux/kvm_para.h> #include <asm/tlbflush.h> #include <asm/fixmap.h> @@ -29,6 +30,7 @@#include <asm/processor-flags.h> #include <asm/msr.h> #include <asm/cmdline.h> +#include <asm/kvm_para.h> #include "mm_internal.h" @@ -196,6 +198,47 @@ void __init sme_early_init(void) swiotlb_force =SWIOTLB_FORCE ; } +static void set_memory_enc_dec_hypercall (unsigned long vaddr,int npages, +bool enc) +{ +unsigned long sz = npages <<PAGE_SHIFT ; +unsigned long vaddr_end, vaddr_next; + + vaddr_end = vaddr + sz; + +for (; vaddr < vaddr_end; vaddr = vaddr_next) { +int psize, pmask, level; +unsigned long pfn; +pte_t *kpte; + + kpte =lookup_address (vaddr, &level); +if (!kpte ||pte_none (*kpte)) +return ; + +switch (level) { +case PG_LEVEL_4K : + pfn =pte_pfn (*kpte); +break ; +case PG_LEVEL_2M : + pfn =pmd_pfn (*(pmd_t *)kpte); +break ; +case PG_LEVEL_1G : + pfn =pud_pfn (*(pud_t *)kpte); +break ; +default : +return ; + } + + psize =page_level_size (level); + pmask =page_level_mask (level); + +kvm_sev_hypercall3 (KVM_HC_PAGE_ENC_STATUS , + pfn <<PAGE_SHIFT , psize >>PAGE_SHIFT , enc); + + vaddr_next = (vaddr & pmask) + psize; + } +} +static void __init __set_clr_pte_enc (pte_t *kpte,int level,bool enc) {pgprot_t old_prot, new_prot;@@ -253,12 +296,13 @@ static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc)static int __init early_set_memory_enc_dec (unsigned long vaddr,unsigned long size,bool enc) { -unsigned long vaddr_end, vaddr_next; +unsigned long vaddr_end, vaddr_next, start;unsigned long psize, pmask;int split_page_size_mask;int level, ret;pte_t *kpte; + start = vaddr; vaddr_next = vaddr; vaddr_end = vaddr + size;@@ -313,6 +357,8 @@ static int __init early_set_memory_enc_dec(unsigned long vaddr, ret =0 ; +set_memory_enc_dec_hypercall (start,PAGE_ALIGN (size) >>PAGE_SHIFT , + enc); out:__flush_tlb_all ();return ret;@@ -451,6 +497,15 @@ void __init mem_encrypt_init(void)if (sev_active ())static_branch_enable (&sev_enable_key); +#ifdef CONFIG_PARAVIRT +/* +* With SEV, we need to make a hypercall when page encryption state is +* changed. +*/ +if (sev_active ()) + pv_ops.mmu.page_encryption_changed = set_memory_enc_dec_hypercall; +#endif +pr_info ("AMD %s active\n" ,sev_active () ?"Secure Encrypted Virtualization (SEV)" :"Secure Memory Encryption (SME)" );arch/x86/mm/pat/set_memory.c +7
-1@@ -27,6 +27,7 @@#include <asm/proto.h> #include <asm/memtype.h> #include <asm/set_memory.h> +#include <asm/paravirt.h> #include "../mm_internal.h" @@ -2003,6 +2004,12 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc)*/ cpa_flush (&cpa,0 ); +/* Notify hypervisor that a given memory range is mapped encrypted +* or decrypted. The hypervisor will use this information during the +* VM migration. +*/ +page_encryption_changed (addr, numpages, enc); +return ret; } --
Quoted 2 lines
2.17.1
PATCH v8 11/18 KVM: x86: Introduce KVM_SET_PAGE_ENC_BITMAP ioctl
In reply to Ashish KalraFrom: Brijesh Singh <[email protected]>
The ioctl can be used to set page encryption bitmap for an incoming guest.
--- Documentation/virt/kvm/api.rst | 44 +++++++++++++++++++++++++++++ arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/svm/sev.c | 50 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 12 ++++++++ include/uapi/linux/kvm.h | 1 + 7 files changed, 111 insertions(+)
Documentation/virt/kvm/api.rst +44 -0
@@ -4663,6 +4663,28 @@ or shared. The bitmap can be used during the guest migration. If the page is private then the userspace need to use SEV migration commands to transmit the page. +4.126 KVM_SET_PAGE_ENC_BITMAP (vm ioctl) +--------------------------------------- + +:Capability: basic +:Architectures: x86 +:Type: vm ioctl +:Parameters: struct kvm_page_enc_bitmap (in/out) +:Returns: 0 on success, -1 on error + +/* for KVM_SET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { + __u64 start_gfn; + __u64 num_pages; + union { + void __user *enc_bitmap; /* one bit per page */ + __u64 padding2; + }; +}; + +During the guest live migration the outgoing guest exports its page encryption +bitmap, the KVM_SET_PAGE_ENC_BITMAP can be used to build the page encryption +bitmap for an incoming guest. 4.125 KVM_S390_PV_COMMAND -------------------------
@@ -4717,6 +4739,28 @@ KVM_PV_VM_VERIFY Verify the integrity of the unpacked image. Only if this succeeds, KVM is allowed to start protected VCPUs. +4.126 KVM_SET_PAGE_ENC_BITMAP (vm ioctl) +--------------------------------------- + +:Capability: basic +:Architectures: x86 +:Type: vm ioctl +:Parameters: struct kvm_page_enc_bitmap (in/out) +:Returns: 0 on success, -1 on error + +/* for KVM_SET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { + __u64 start_gfn; + __u64 num_pages; + union { + void __user *enc_bitmap; /* one bit per page */ + __u64 padding2; + }; +}; + +During the guest live migration the outgoing guest exports its page encryption +bitmap, the KVM_SET_PAGE_ENC_BITMAP can be used to build the page encryption +bitmap for an incoming guest. 5. The kvm_run structure ========================
arch/x86/include/asm/kvm_host.h +2 -0
@@ -1258,6 +1258,8 @@ struct kvm_x86_ops { unsigned long sz, unsigned long mode);int (*get_page_enc_bitmap)(struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +int (*set_page_enc_bitmap)(struct kvm *kvm, +struct kvm_page_enc_bitmap *bmap); };struct kvm_x86_init_ops {
arch/x86/kvm/svm/sev.c +50 -0
56 lines not on this page · raw message
arch/x86/kvm/svm/svm.c +1 -0
@@ -4017,6 +4017,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .page_enc_status_hc = svm_page_enc_status_hc, .get_page_enc_bitmap = svm_get_page_enc_bitmap, + .set_page_enc_bitmap = svm_set_page_enc_bitmap, };static struct kvm_x86_init_ops svm_init_ops__initdata = {
arch/x86/kvm/svm/svm.h +1 -0
@@ -405,6 +405,7 @@ int nested_svm_exit_special(struct vcpu_svm *svm);int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc);int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +int svm_set_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);/* avic.c */
arch/x86/kvm/x86.c +12 -0
@@ -5220,6 +5220,18 @@ long kvm_arch_vm_ioctl(struct file *filp, r = kvm_x86_ops.get_page_enc_bitmap (kvm, &bitmap);break ; } +case KVM_SET_PAGE_ENC_BITMAP : { +struct kvm_page_enc_bitmap bitmap; + + r = -EFAULT ; +if (copy_from_user (&bitmap, argp,sizeof (bitmap))) + goto out; + + r = -ENOTTY ; +if (kvm_x86_ops.set_page_enc_bitmap) + r = kvm_x86_ops.set_page_enc_bitmap (kvm, &bitmap); +break ; + }default : r = -ENOTTY ; }
include/uapi/linux/kvm.h +1 -0
@@ -1529,6 +1529,7 @@ struct kvm_pv_cmd {#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)#define KVM_GET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc6, struct kvm_page_enc_bitmap) +#define KVM_SET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc7, struct kvm_page_enc_bitmap)/* Secure Encrypted Virtualization command */ enum sev_cmd_id {
Signature · 1 line
2.17.1
Re: [PATCH v8 11/18] KVM: x86: Introduce KVM_SET_PAGE_ENC_BITMAP ioctl
Quoted 145 lines · Ashish Kalra
From: Brijesh Singh <[email protected]>
The ioctl can be used to set page encryption bitmap for an incoming guest.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Joerg Roedel <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Reviewed-by Venu Busireddy <[email protected]>Signed-off-by Brijesh Singh <[email protected]>Signed-off-by Ashish Kalra <[email protected]>--- Documentation/virt/kvm/api.rst | 44 +++++++++++++++++++++++++++++ arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/svm/sev.c | 50 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 12 ++++++++ include/uapi/linux/kvm.h | 1 + 7 files changed, 111 insertions(+)Documentation/virt/kvm/api.rst +44
-0@@ -4663,6 +4663,28 @@ or shared. The bitmap can be used during the guest migration. If the page is private then the userspace need to use SEV migration commands to transmit the page. +4.126 KVM_SET_PAGE_ENC_BITMAP (vm ioctl) +--------------------------------------- + +:Capability: basic +:Architectures: x86 +:Type: vm ioctl +:Parameters: struct kvm_page_enc_bitmap (in/out) +:Returns: 0 on success, -1 on error + +/* for KVM_SET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { + __u64 start_gfn; + __u64 num_pages; + union { + void __user *enc_bitmap; /* one bit per page */ + __u64 padding2; + }; +}; + +During the guest live migration the outgoing guest exports its page encryption +bitmap, the KVM_SET_PAGE_ENC_BITMAP can be used to build the page encryption +bitmap for an incoming guest. 4.125 KVM_S390_PV_COMMAND -------------------------@@ -4717,6 +4739,28 @@ KVM_PV_VM_VERIFY Verify the integrity of the unpacked image. Only if this succeeds, KVM is allowed to start protected VCPUs. +4.126 KVM_SET_PAGE_ENC_BITMAP (vm ioctl) +--------------------------------------- + +:Capability: basic +:Architectures: x86 +:Type: vm ioctl +:Parameters: struct kvm_page_enc_bitmap (in/out) +:Returns: 0 on success, -1 on error + +/* for KVM_SET_PAGE_ENC_BITMAP */ +struct kvm_page_enc_bitmap { + __u64 start_gfn; + __u64 num_pages; + union { + void __user *enc_bitmap; /* one bit per page */ + __u64 padding2; + }; +}; + +During the guest live migration the outgoing guest exports its page encryption +bitmap, the KVM_SET_PAGE_ENC_BITMAP can be used to build the page encryption +bitmap for an incoming guest. 5. The kvm_run structure ========================arch/x86/include/asm/kvm_host.h +2
-0@@ -1258,6 +1258,8 @@ struct kvm_x86_ops { unsigned long sz, unsigned long mode);int (*get_page_enc_bitmap)(struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +int (*set_page_enc_bitmap)(struct kvm *kvm, +struct kvm_page_enc_bitmap *bmap); };struct kvm_x86_init_ops {arch/x86/kvm/svm/sev.c +31
-0@@ -1504,6 +1504,56 @@ int svm_get_page_enc_bitmap(struct kvm *kvm,return ret; } +int svm_set_page_enc_bitmap (struct kvm *kvm, +struct kvm_page_enc_bitmap *bmap) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +unsigned long gfn_start, gfn_end; +unsigned long *bitmap; +unsigned long sz; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; +/* special case of resetting the complete bitmap */ +if (!bmap->enc_bitmap) { +mutex_lock (&kvm->lock); +/* by default all pages are marked encrypted */ +if (sev->page_enc_bmap_size) +bitmap_fill (sev->page_enc_bmap, + sev->page_enc_bmap_size); +mutex_unlock (&kvm->lock); +return 0 ; + } + + gfn_start = bmap->start_gfn; + gfn_end = gfn_start + bmap->num_pages; + + sz =ALIGN (bmap->num_pages,BITS_PER_LONG ) /8 ; + bitmap =kmalloc (sz,GFP_KERNEL ); +if (!bitmap) +return -ENOMEM ; + + ret = -EFAULT ;
arch/x86/kvm/svm/sev.c int svm_get_page_enc_bitmap(struct kvm *kvm, · line 1548
Quoted 10 lines
arch/x86/kvm/svm/sev.c +10
-0+if (copy_from_user (bitmap, bmap->enc_bitmap, sz)) + goto out; + +mutex_lock (&kvm->lock); + ret =sev_resize_page_enc_bitmap (kvm, gfn_end); +if (ret) + goto unlock; + +bitmap_copy (sev->page_enc_bmap +BIT_WORD (gfn_start), bitmap, + (gfn_end - gfn_start));
I *think* this assumes that gfn_start is a multiple of 8. I'm not certain I have a clean suggestion for fixing this, other than advertising that this is an expectation, and returning an error if that is not true.
If I'm reading bitmap_copy correctly, I also think it assumes all bitmaps have lengths that are unsigned long aligned, which surprised me.
Quoted 73 lines
arch/x86/kvm/svm/sev.c +9
-0+ + ret =0 ; +unlock: +mutex_unlock (&kvm->lock); +out: +kfree (bitmap); +return ret; +} +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;arch/x86/kvm/svm/svm.c +1
-0@@ -4017,6 +4017,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .page_enc_status_hc = svm_page_enc_status_hc, .get_page_enc_bitmap = svm_get_page_enc_bitmap, + .set_page_enc_bitmap = svm_set_page_enc_bitmap, };static struct kvm_x86_init_ops svm_init_ops__initdata = {arch/x86/kvm/svm/svm.h +1
-0@@ -405,6 +405,7 @@ int nested_svm_exit_special(struct vcpu_svm *svm);int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc);int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +int svm_set_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);/* avic.c */ arch/x86/kvm/x86.c +12
-0@@ -5220,6 +5220,18 @@ long kvm_arch_vm_ioctl(struct file *filp, r = kvm_x86_ops.get_page_enc_bitmap (kvm, &bitmap);break ; } +case KVM_SET_PAGE_ENC_BITMAP : { +struct kvm_page_enc_bitmap bitmap; + + r = -EFAULT ; +if (copy_from_user (&bitmap, argp,sizeof (bitmap))) + goto out; + + r = -ENOTTY ; +if (kvm_x86_ops.set_page_enc_bitmap) + r = kvm_x86_ops.set_page_enc_bitmap (kvm, &bitmap); +break ; + }default : r = -ENOTTY ; }include/uapi/linux/kvm.h +1
-1@@ -1529,6 +1529,7 @@ struct kvm_pv_cmd {#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)#define KVM_GET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc6, struct kvm_page_enc_bitmap) +#define KVM_SET_PAGE_ENC_BITMAP _IOW(KVMIO, 0xc7, struct kvm_page_enc_bitmap)/* Secure Encrypted Virtualization command */ enum sev_cmd_id { --
Quoted 2 lines
2.17.1
Otherwise, this looks good to me. Thanks for merging the ioctls together.
PATCH v8 12/18 KVM: SVM: Add support for static allocation of unified Page Encryption Bitmap.
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
Add support for static allocation of the unified Page encryption bitmap by extending kvm_arch_commit_memory_region() callack to add svm specific x86_ops which can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap based on that information, i.e. the highest guest PA that is mapped by a memslot.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/sev.c | 35 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 5 +++++ 5 files changed, 43 insertions(+)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1254,6 +1254,7 @@ struct kvm_x86_ops {bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); +void (*commit_memory_region)(struct kvm *kvm,enum kvm_mr_change change);int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa,unsigned long sz,unsigned long mode); int (*get_page_enc_bitmap)(struct kvm *kvm,
arch/x86/kvm/svm/sev.c +35 -0
@@ -1377,6 +1377,41 @@ static int sev_resize_page_enc_bitmap(struct kvm *kvm, unsigned long new_size)return 0 ; } +void svm_commit_memory_region (struct kvm *kvm,enum kvm_mr_change change) +{ +struct kvm_memslots *slots; +struct kvm_memory_slot *memslot; +gfn_t start, end =0 ; + +spin_lock (&kvm->mmu_lock); +if (change ==KVM_MR_CREATE ) { + slots =kvm_memslots (kvm); +kvm_for_each_memslot (memslot, slots) { + start = memslot->base_gfn; + end = memslot->base_gfn + memslot->npages; +/* +* KVM memslots is a sorted list, starting with +* the highest mapped guest PA, so pick the topmost +* valid guest PA. +*/ +if (memslot->npages) +break ; + } + } +spin_unlock (&kvm->mmu_lock); + +if (end) { +/* +* NORE: This callback is invoked in vm ioctl +* set_user_memory_region, hence we can use a +* mutex here. +*/ +mutex_lock (&kvm->lock); +sev_resize_page_enc_bitmap (kvm, end); +mutex_unlock (&kvm->lock); + } +} +int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc) {
arch/x86/kvm/svm/svm.c +1 -0
@@ -4015,6 +4015,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .check_nested_events = svm_check_nested_events, + .commit_memory_region = svm_commit_memory_region, .page_enc_status_hc = svm_page_enc_status_hc, .get_page_enc_bitmap = svm_get_page_enc_bitmap, .set_page_enc_bitmap = svm_set_page_enc_bitmap,
arch/x86/kvm/svm/svm.h +1 -0
@@ -406,6 +406,7 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa, unsigned long npages, unsigned long enc);int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);int svm_set_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +void svm_commit_memory_region (struct kvm *kvm,enum kvm_mr_change change);/* avic.c */
arch/x86/kvm/x86.c +5 -0
@@ -10133,6 +10133,11 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,kvm_mmu_change_mmu_pages (kvm,kvm_mmu_calculate_default_mmu_pages (kvm)); +if (change ==KVM_MR_CREATE || change ==KVM_MR_DELETE ) { +if (kvm_x86_ops.commit_memory_region) + kvm_x86_ops.commit_memory_region (kvm, change); + } +/* * Dirty logging tracks sptes in 4k granularity, meaning that large * sptes have to be split. If live migration is successful, the guest
Signature · 1 line
2.17.1
Re: [PATCH v8 12/18] KVM: SVM: Add support for static allocation of unified Page Encryption Bitmap.
Quoted 105 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Add support for static allocation of the unified Page encryption bitmap by extending
kvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap based on that information, i.e. the highest guest PA that is mapped by a memslot.Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/sev.c | 35 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 5 +++++ 5 files changed, 43 insertions(+)arch/x86/include/asm/kvm_host.h +1
-0@@ -1254,6 +1254,7 @@ struct kvm_x86_ops {bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); +void (*commit_memory_region)(struct kvm *kvm,enum kvm_mr_change change);int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa,unsigned long sz,unsigned long mode); int (*get_page_enc_bitmap)(struct kvm *kvm,arch/x86/kvm/svm/sev.c +35
-0@@ -1377,6 +1377,41 @@ static int sev_resize_page_enc_bitmap(struct kvm *kvm, unsigned long new_size)return 0 ; } +void svm_commit_memory_region (struct kvm *kvm,enum kvm_mr_change change) +{ +struct kvm_memslots *slots; +struct kvm_memory_slot *memslot; +gfn_t start, end =0 ; + +spin_lock (&kvm->mmu_lock); +if (change ==KVM_MR_CREATE ) { + slots =kvm_memslots (kvm); +kvm_for_each_memslot (memslot, slots) { + start = memslot->base_gfn; + end = memslot->base_gfn + memslot->npages; +/* +* KVM memslots is a sorted list, starting with +* the highest mapped guest PA, so pick the topmost +* valid guest PA. +*/ +if (memslot->npages) +break ; + } + } +spin_unlock (&kvm->mmu_lock); + +if (end) { +/* +* NORE: This callback is invoked in vm ioctl +* set_user_memory_region, hence we can use a +* mutex here. +*/ +mutex_lock (&kvm->lock); +sev_resize_page_enc_bitmap (kvm, end); +mutex_unlock (&kvm->lock); + } +} +int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc) {arch/x86/kvm/svm/svm.c +1
-0@@ -4015,6 +4015,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .check_nested_events = svm_check_nested_events, + .commit_memory_region = svm_commit_memory_region, .page_enc_status_hc = svm_page_enc_status_hc, .get_page_enc_bitmap = svm_get_page_enc_bitmap, .set_page_enc_bitmap = svm_set_page_enc_bitmap,arch/x86/kvm/svm/svm.h +1
-0@@ -406,6 +406,7 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa, unsigned long npages, unsigned long enc);int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);int svm_set_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +void svm_commit_memory_region (struct kvm *kvm,enum kvm_mr_change change);/* avic.c */ arch/x86/kvm/x86.c +0
-0
arch/x86/kvm/x86.c void kvm_arch_commit_memory_region(struct kvm *kvm, · line 10138
Quoted 6 lines
arch/x86/kvm/x86.c +3
-0@@ -10133,6 +10133,11 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,kvm_mmu_change_mmu_pages (kvm,kvm_mmu_calculate_default_mmu_pages (kvm)); +if (change ==KVM_MR_CREATE || change ==KVM_MR_DELETE ) { +if (kvm_x86_ops.commit_memory_region) + kvm_x86_ops.commit_memory_region (kvm, change);
Why not just call this every time (if it exists) and have the kvm_x86_op determine if it should do anything?
It seems like it's a nop anyway unless you are doing a create.
Quoted 8 lines
arch/x86/kvm/x86.c +2
-1+ } +/* * Dirty logging tracks sptes in 4k granularity, meaning that large * sptes have to be split. If live migration is successful, the guest -- 2.17.1
Re: [PATCH v8 12/18] KVM: SVM: Add support for static allocation of unified Page Encryption Bitmap.
Hello Steve,
Quoted 109 lines · Steve Rutherford
Quoted 108 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Add support for static allocation of the unified Page encryption bitmap by extending
kvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap based on that information, i.e. the highest guest PA that is mapped by a memslot.Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/sev.c | 35 +++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/x86.c | 5 +++++ 5 files changed, 43 insertions(+)arch/x86/include/asm/kvm_host.h +1
-0@@ -1254,6 +1254,7 @@ struct kvm_x86_ops {bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); +void (*commit_memory_region)(struct kvm *kvm,enum kvm_mr_change change);int (*page_enc_status_hc)(struct kvm *kvm,unsigned long gpa,unsigned long sz,unsigned long mode); int (*get_page_enc_bitmap)(struct kvm *kvm,arch/x86/kvm/svm/sev.c +35
-0@@ -1377,6 +1377,41 @@ static int sev_resize_page_enc_bitmap(struct kvm *kvm, unsigned long new_size)return 0 ; } +void svm_commit_memory_region (struct kvm *kvm,enum kvm_mr_change change) +{ +struct kvm_memslots *slots; +struct kvm_memory_slot *memslot; +gfn_t start, end =0 ; + +spin_lock (&kvm->mmu_lock); +if (change ==KVM_MR_CREATE ) { + slots =kvm_memslots (kvm); +kvm_for_each_memslot (memslot, slots) { + start = memslot->base_gfn; + end = memslot->base_gfn + memslot->npages; +/* +* KVM memslots is a sorted list, starting with +* the highest mapped guest PA, so pick the topmost +* valid guest PA. +*/ +if (memslot->npages) +break ; + } + } +spin_unlock (&kvm->mmu_lock); + +if (end) { +/* +* NORE: This callback is invoked in vm ioctl +* set_user_memory_region, hence we can use a +* mutex here. +*/ +mutex_lock (&kvm->lock); +sev_resize_page_enc_bitmap (kvm, end); +mutex_unlock (&kvm->lock); + } +} +int svm_page_enc_status_hc (struct kvm *kvm,unsigned long gpa,unsigned long npages,unsigned long enc) {arch/x86/kvm/svm/svm.c +1
-0@@ -4015,6 +4015,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .check_nested_events = svm_check_nested_events, + .commit_memory_region = svm_commit_memory_region, .page_enc_status_hc = svm_page_enc_status_hc, .get_page_enc_bitmap = svm_get_page_enc_bitmap, .set_page_enc_bitmap = svm_set_page_enc_bitmap,arch/x86/kvm/svm/svm.h +1
-0@@ -406,6 +406,7 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa, unsigned long npages, unsigned long enc);int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap);int svm_set_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); +void svm_commit_memory_region (struct kvm *kvm,enum kvm_mr_change change);/* avic.c */ arch/x86/kvm/x86.c +0
-0@@ -10133,6 +10133,11 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,kvm_mmu_change_mmu_pages (kvm,kvm_mmu_calculate_default_mmu_pages (kvm));
Quoted 8 lines
arch/x86/kvm/x86.c void kvm_arch_commit_memory_region(struct kvm *kvm, · line 10138
Quoted 3 lines
arch/x86/kvm/x86.c +3
-0+if (change ==KVM_MR_CREATE || change ==KVM_MR_DELETE ) { +if (kvm_x86_ops.commit_memory_region) + kvm_x86_ops.commit_memory_region (kvm, change);Why not just call this every time (if it exists) and have the
kvm_x86_opdetermine if it should do anything?It seems like it's a nop anyway unless you are doing a create.
Yes, this makes sense.
I will call it unconditionally it it exits and let the callback determine what to do eventually with it.
Thanks,
Ashish
Quoted 8 lines
Quoted 8 lines
arch/x86/kvm/x86.c +2
-1+ } +/* * Dirty logging tracks sptes in 4k granularity, meaning that large * sptes have to be split. If live migration is successful, the guest -- 2.17.1
Paolo Bonzini
maintainerRe: [PATCH v8 12/18] KVM: SVM: Add support for static allocation of unified Page Encryption Bitmap.
In reply to Ashish KalraQuoted 1 line · Ashish Kalra
Add support for static allocation of the unified Page encryption bitmap by extending
kvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap based on that information, i.e. the highest guest PA that is mapped by a memslot.
Hi Ashish,
the commit message should explain why this is needed or useful.
Paolo
Re: [PATCH v8 12/18] KVM: SVM: Add support for static allocation of unified Page Encryption Bitmap.
Hello Paolo,
Quoted 8 lines · Paolo Bonzini
Quoted 6 lines · Ashish Kalra
Add support for static allocation of the unified Page encryption bitmap by extending
kvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap based on that information, i.e. the highest guest PA that is mapped by a memslot.
Quoted 4 lines
Hi Ashish,
the commit message should explain why this is needed or useful.
Earlier we used to dynamic resizing of the page encryption bitmap based on the guest hypercall, but potentially a malicious guest can make a hypercall which can trigger a really large memory allocation on the host side and may eventually cause denial of service.
Hence now we don't do dynamic resizing of the page encryption bitmap as per the hypercall and allocate it statically based on guest memory allocation by walking through memslots and computing it's size.
I will add the above comment to the fresh series of the patch-set i am going to post.
Thanks,
Ashish
Paolo Bonzini
maintainerRe: [PATCH v8 12/18] KVM: SVM: Add support for static allocation of unified Page Encryption Bitmap.
Quoted 11 lines · Ashish Kalra
Earlier we used to dynamic resizing of the page encryption bitmap based on the guest hypercall, but potentially a malicious guest can make a hypercall which can trigger a really large memory allocation on the host side and may eventually cause denial of service.
Hence now we don't do dynamic resizing of the page encryption bitmap as per the hypercall and allocate it statically based on guest memory allocation by walking through memslots and computing it's size.
I will add the above comment to the fresh series of the patch-set i am going to post.
Sounds good, thanks. If there are no other changes I can include this in the commit message myself.
Paolo
PATCH v8 13/18 KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
Add new KVM_FEATURE_SEV_LIVE_MIGRATION feature for guest to check for host-side support for SEV live migration. Also add a new custom MSR_KVM_SEV_LIVE_MIG_EN for guest to enable the SEV live migration feature.
--- Documentation/virt/kvm/cpuid.rst | 5 +++++ Documentation/virt/kvm/msr.rst | 10 ++++++++++ arch/x86/include/uapi/asm/kvm_para.h | 5 +++++ arch/x86/kvm/svm/sev.c | 14 ++++++++++++++ arch/x86/kvm/svm/svm.c | 16 ++++++++++++++++ arch/x86/kvm/svm/svm.h | 2 ++ 6 files changed, 52 insertions(+)
Documentation/virt/kvm/cpuid.rst +5 -0
@@ -86,6 +86,11 @@ KVM_FEATURE_PV_SCHED_YIELD 13 guest checks this feature bit before using paravirtualized sched yield. +KVM_FEATURE_SEV_LIVE_MIGRATION 14 guest checks this feature bit before + using the page encryption state + hypercall to notify the page state + change + KVM_FEATURE_CLOCSOURCE_STABLE_BIT 24 host will warn if no guest-side per-cpu warps are expeced in kvmclock
Documentation/virt/kvm/msr.rst +10 -0
@@ -319,3 +319,13 @@ data: KVM guests can request the host not to poll on HLT, for example if they are performing polling themselves. + +MSR_KVM_SEV_LIVE_MIG_EN: + 0x4b564d06 + + Control SEV Live Migration features. + +data: + Bit 0 enables (1) or disables (0) host-side SEV Live Migration feature. + Bit 1 enables (1) or disables (0) support for SEV Live Migration extensions. + All other bits are reserved.
arch/x86/include/uapi/asm/kvm_para.h +5 -0
@@ -31,6 +31,7 @@#define KVM_FEATURE_PV_SEND_IPI 11#define KVM_FEATURE_POLL_CONTROL 12#define KVM_FEATURE_PV_SCHED_YIELD 13 +#define KVM_FEATURE_SEV_LIVE_MIGRATION 14#define KVM_HINTS_REALTIME 0
@@ -50,6 +51,7 @@#define MSR_KVM_STEAL_TIME 0x4b564d03#define MSR_KVM_PV_EOI_EN 0x4b564d04#define MSR_KVM_POLL_CONTROL 0x4b564d05 +#define MSR_KVM_SEV_LIVE_MIG_EN 0x4b564d06struct kvm_steal_time {__u64 steal;
@@ -122,4 +124,7 @@ struct kvm_vcpu_pv_apf_data {#define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK#define KVM_PV_EOI_DISABLED 0x0 +#define KVM_SEV_LIVE_MIGRATION_ENABLED (1 << 0) +#define KVM_SEV_LIVE_MIGRATION_EXTENSIONS_SUPPORTED (1 << 1) +#endif /* _UAPI_ASM_X86_KVM_PARA_H */
arch/x86/kvm/svm/sev.c +14 -0
@@ -1469,6 +1469,17 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa,return 0 ; } +void sev_update_migration_flags (struct kvm *kvm,u64 data) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; + +if (!sev_guest (kvm)) +return ; + +if (data &KVM_SEV_LIVE_MIGRATION_ENABLED ) + sev->live_migration_enabled = true; +} +int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap) {
@@ -1481,6 +1492,9 @@ int svm_get_page_enc_bitmap(struct kvm *kvm,if (!sev_guest (kvm))return -ENOTTY ; +if (!sev->live_migration_enabled) +return -EINVAL ; + gfn_start = bmap->start_gfn; gfn_end = gfn_start + bmap->num_pages;
arch/x86/kvm/svm/svm.c +16 -0
@@ -2633,6 +2633,9 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) svm->msr_decfg = data;break ; } +case MSR_KVM_SEV_LIVE_MIG_EN : +sev_update_migration_flags (vcpu->kvm, data); +break ;case MSR_IA32_APICBASE :if (kvm_vcpu_apicv_active (vcpu))avic_update_vapic_bar (to_svm (vcpu), data);
@@ -3493,6 +3496,19 @@ static void svm_cpuid_update(struct kvm_vcpu *vcpu) svm->nrips_enabled =kvm_cpu_cap_has (X86_FEATURE_NRIPS ) &&guest_cpuid_has (&svm->vcpu,X86_FEATURE_NRIPS ); +/* +* If SEV guest then enable the Live migration feature. +*/ +if (sev_guest (vcpu->kvm)) { +struct kvm_cpuid_entry2 *best; + + best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); +if (!best) +return ; + + best->eax |= (1 <<KVM_FEATURE_SEV_LIVE_MIGRATION ); + } +if (!kvm_vcpu_apicv_active (vcpu))return ;
arch/x86/kvm/svm/svm.h +2 -0
@@ -65,6 +65,7 @@ struct kvm_sev_info {int fd;/* SEV device fd */ unsigned long pages_locked;/* Number of pages locked */ struct list_head regions_list;/* List of registered regions */ +bool live_migration_enabled;unsigned long *page_enc_bmap;unsigned long page_enc_bmap_size; };
@@ -494,5 +495,6 @@ int svm_unregister_enc_region(struct kvm *kvm,void pre_sev_run (struct vcpu_svm *svm,int cpu);int __init sev_hardware_setup (void );void sev_hardware_teardown (void ); +void sev_update_migration_flags (struct kvm *kvm,u64 data);#endif
Signature · 1 line
2.17.1
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
Quoted 166 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Add new
KVM_FEATURE_SEV_LIVE_MIGRATIONfeature for guest to check for host-side support for SEV live migration. Also add a new customMSR_KVM_SEV_LIVE_MIG_ENfor guest to enable the SEV live migration feature.Signed-off-by Ashish Kalra <[email protected]>--- Documentation/virt/kvm/cpuid.rst | 5 +++++ Documentation/virt/kvm/msr.rst | 10 ++++++++++ arch/x86/include/uapi/asm/kvm_para.h | 5 +++++ arch/x86/kvm/svm/sev.c | 14 ++++++++++++++ arch/x86/kvm/svm/svm.c | 16 ++++++++++++++++ arch/x86/kvm/svm/svm.h | 2 ++ 6 files changed, 52 insertions(+)Documentation/virt/kvm/cpuid.rst +5
-0@@ -86,6 +86,11 @@ KVM_FEATURE_PV_SCHED_YIELD 13 guest checks this feature bit before using paravirtualized sched yield. +KVM_FEATURE_SEV_LIVE_MIGRATION 14 guest checks this feature bit before + using the page encryption state + hypercall to notify the page state + change + KVM_FEATURE_CLOCSOURCE_STABLE_BIT 24 host will warn if no guest-side per-cpu warps are expeced in kvmclockDocumentation/virt/kvm/msr.rst +10
-0@@ -319,3 +319,13 @@ data: KVM guests can request the host not to poll on HLT, for example if they are performing polling themselves. + +MSR_KVM_SEV_LIVE_MIG_EN: + 0x4b564d06 + + Control SEV Live Migration features. + +data: + Bit 0 enables (1) or disables (0) host-side SEV Live Migration feature. + Bit 1 enables (1) or disables (0) support for SEV Live Migration extensions. + All other bits are reserved.arch/x86/include/uapi/asm/kvm_para.h +5
-0@@ -31,6 +31,7 @@#define KVM_FEATURE_PV_SEND_IPI 11#define KVM_FEATURE_POLL_CONTROL 12#define KVM_FEATURE_PV_SCHED_YIELD 13 +#define KVM_FEATURE_SEV_LIVE_MIGRATION 14#define KVM_HINTS_REALTIME 0@@ -50,6 +51,7 @@#define MSR_KVM_STEAL_TIME 0x4b564d03#define MSR_KVM_PV_EOI_EN 0x4b564d04#define MSR_KVM_POLL_CONTROL 0x4b564d05 +#define MSR_KVM_SEV_LIVE_MIG_EN 0x4b564d06struct kvm_steal_time {__u64 steal;@@ -122,4 +124,7 @@ struct kvm_vcpu_pv_apf_data {#define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK#define KVM_PV_EOI_DISABLED 0x0 +#define KVM_SEV_LIVE_MIGRATION_ENABLED (1 << 0) +#define KVM_SEV_LIVE_MIGRATION_EXTENSIONS_SUPPORTED (1 << 1) +#endif /* _UAPI_ASM_X86_KVM_PARA_H */ arch/x86/kvm/svm/sev.c +14
-0@@ -1469,6 +1469,17 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa,return 0 ; } +void sev_update_migration_flags (struct kvm *kvm,u64 data) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; + +if (!sev_guest (kvm)) +return ; + +if (data &KVM_SEV_LIVE_MIGRATION_ENABLED ) + sev->live_migration_enabled = true; +} +int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap) {@@ -1481,6 +1492,9 @@ int svm_get_page_enc_bitmap(struct kvm *kvm,if (!sev_guest (kvm))return -ENOTTY ; +if (!sev->live_migration_enabled) +return -EINVAL ; + gfn_start = bmap->start_gfn; gfn_end = gfn_start + bmap->num_pages;arch/x86/kvm/svm/svm.c +16
-0@@ -2633,6 +2633,9 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) svm->msr_decfg = data;break ; } +case MSR_KVM_SEV_LIVE_MIG_EN : +sev_update_migration_flags (vcpu->kvm, data); +break ;case MSR_IA32_APICBASE :if (kvm_vcpu_apicv_active (vcpu))avic_update_vapic_bar (to_svm (vcpu), data);@@ -3493,6 +3496,19 @@ static void svm_cpuid_update(struct kvm_vcpu *vcpu) svm->nrips_enabled =kvm_cpu_cap_has (X86_FEATURE_NRIPS ) &&guest_cpuid_has (&svm->vcpu,X86_FEATURE_NRIPS ); +/* +* If SEV guest then enable the Live migration feature. +*/ +if (sev_guest (vcpu->kvm)) { +struct kvm_cpuid_entry2 *best; + + best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); +if (!best) +return ; + + best->eax |= (1 <<KVM_FEATURE_SEV_LIVE_MIGRATION ); + } +if (!kvm_vcpu_apicv_active (vcpu))return ;arch/x86/kvm/svm/svm.h +2
-1@@ -65,6 +65,7 @@ struct kvm_sev_info {int fd;/* SEV device fd */ unsigned long pages_locked;/* Number of pages locked */ struct list_head regions_list;/* List of registered regions */ +bool live_migration_enabled;unsigned long *page_enc_bmap;unsigned long page_enc_bmap_size; };@@ -494,5 +495,6 @@ int svm_unregister_enc_region(struct kvm *kvm,void pre_sev_run (struct vcpu_svm *svm,int cpu);int __init sev_hardware_setup (void );void sev_hardware_teardown (void ); +void sev_update_migration_flags (struct kvm *kvm,u64 data);#endif --
Quoted 2 lines
2.17.1
Paolo Bonzini
maintainerRe: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
In reply to Ashish KalraQuoted 41 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Add new
KVM_FEATURE_SEV_LIVE_MIGRATIONfeature for guest to check for host-side support for SEV live migration. Also add a new customMSR_KVM_SEV_LIVE_MIG_ENfor guest to enable the SEV live migration feature.Signed-off-by Ashish Kalra <[email protected]>--- Documentation/virt/kvm/cpuid.rst | 5 +++++ Documentation/virt/kvm/msr.rst | 10 ++++++++++ arch/x86/include/uapi/asm/kvm_para.h | 5 +++++ arch/x86/kvm/svm/sev.c | 14 ++++++++++++++ arch/x86/kvm/svm/svm.c | 16 ++++++++++++++++ arch/x86/kvm/svm/svm.h | 2 ++ 6 files changed, 52 insertions(+)Documentation/virt/kvm/cpuid.rst +5
-0@@ -86,6 +86,11 @@ KVM_FEATURE_PV_SCHED_YIELD 13 guest checks this feature bit before using paravirtualized sched yield. +KVM_FEATURE_SEV_LIVE_MIGRATION 14 guest checks this feature bit before + using the page encryption state + hypercall to notify the page state + change + KVM_FEATURE_CLOCSOURCE_STABLE_BIT 24 host will warn if no guest-side per-cpu warps are expeced in kvmclockDocumentation/virt/kvm/msr.rst +0
-0@@ -319,3 +319,13 @@ data: KVM guests can request the host not to poll on HLT, for example if they are performing polling themselves.
Documentation/virt/kvm/msr.rst data: · line 331
Quoted 10 lines
Documentation/virt/kvm/msr.rst +10
-0+ +MSR_KVM_SEV_LIVE_MIG_EN: + 0x4b564d06 + + Control SEV Live Migration features. + +data: + Bit 0 enables (1) or disables (0) host-side SEV Live Migration feature. + Bit 1 enables (1) or disables (0) support for SEV Live Migration extensions. + All other bits are reserved.
This doesn't say what the feature is or does, and what the extensions are. As far as I understand bit 0 is a guest->host communication that it's properly handling the encryption bitmap.
I applied patches -13, this one a bit changed as follows.
Documentation/virt/kvm/cpuid.rst +0 -0
@@ -96,6 +96,11 @@ KVM_FEATURE_MSI_EXT_DEST_ID 15 guest checks this feature bit before using extended
destination
ID bits in MSI address
bits 11-5.
+KVM_FEATURE_ENCRYPTED_VM_BIT 16 guest checks this feature bit before + using the page encryption state + hypercall and encrypted VM + features MSR
+
KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 24 host will warn if no
guest-side
per-cpu warps are
expected in
kvmclock
Documentation/virt/kvm/msr.rst +10 -0
@@ -376,3 +376,13 @@ data: write '1' to bit 0 of the MSR, this causes the host to re-scan its queue and check if there are more notifications pending. The MSR is available if KVM_FEATURE_ASYNC_PF_INT is present in CPUID. + +MSR_KVM_ENC_VM_FEATURE: + 0x4b564d08 + + Control encrypted VM features. + +data: + Bit 0 tells the host that the guest is (1) or is not (0) issuing the + ``KVM_HC_PAGE_ENC_STATUS`` hypercall to keep the encrypted bitmap + up to date.
arch/x86/include/uapi/asm/kvm_para.h +4 -0
@@ -33,6 +33,7 @@#define KVM_FEATURE_PV_SCHED_YIELD 13#define KVM_FEATURE_ASYNC_PF_INT 14#define KVM_FEATURE_MSI_EXT_DEST_ID 15 +#define KVM_FEATURE_ENCRYPTED_VM 16#define KVM_HINTS_REALTIME 0
@@ -54,6 +55,7 @@#define MSR_KVM_POLL_CONTROL 0x4b564d05#define MSR_KVM_ASYNC_PF_INT 0x4b564d06#define MSR_KVM_ASYNC_PF_ACK 0x4b564d07 +#define MSR_KVM_ENC_VM_FEATURE 0x4b564d08struct kvm_steal_time {__u64 steal;
@@ -136,4 +138,6 @@ struct kvm_vcpu_pv_apf_data {#define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK#define KVM_PV_EOI_DISABLED 0x0 +#define KVM_ENC_VM_BITMAP_VALID (1 << 0) +#endif /* _UAPI_ASM_X86_KVM_PARA_H */
arch/x86/kvm/svm/sev.c +14 -0
@@ -1478,6 +1478,17 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa,return 0 ; } +void sev_update_enc_vm_flags (struct kvm *kvm,u64 data) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; + +if (!sev_guest (kvm)) +return ; + +if (data &KVM_ENC_VM_BITMAP_VALID ) + sev->live_migration_enabled = true; +} +int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap) {
@@ -1490,6 +1501,9 @@ int svm_get_page_enc_bitmap(struct kvm *kvm,if (!sev_guest (kvm))return -ENOTTY ; +if (!sev->live_migration_enabled) +return -EINVAL ; + gfn_start = bmap->start_gfn; gfn_end = gfn_start + bmap->num_pages;
arch/x86/kvm/svm/svm.c +3 -0
@@ -2766,6 +2766,9 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) svm->msr_decfg = data;break ; } +case MSR_KVM_ENC_VM_FEATURE : +sev_update_enc_vm_flags (vcpu->kvm, data); +break ;case MSR_IA32_APICBASE :if (kvm_vcpu_apicv_active (vcpu))avic_update_vapic_bar (to_svm (vcpu), data);
arch/x86/kvm/svm/svm.h +1 -0
@@ -66,6 +66,7 @@ struct kvm_sev_info {int fd;/* SEV device fd */ unsigned long pages_locked;/* Number of pages locked */ struct list_head regions_list;/* List of registered regions */ +bool live_migration_enabled;unsigned long *page_enc_bmap;unsigned long page_enc_bmap_size; };
@@ -504,5 +505,6 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsigned long gpa, unsigned long npages, unsigned long enc); int svm_get_page_enc_bitmap(struct kvm *kvm, struct
kvm_page_enc_bitmap *bmap);
int svm_set_page_enc_bitmap(struct kvm *kvm, structkvm_page_enc_bitmap *bmap);
+void sev_update_enc_vm_flags(struct kvm *kvm, u64 data);
#endif
Paolo
Sean Christopherson
maintainerRe: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
Quoted 1 line · Paolo Bonzini
I applied patches -13, this one a bit changed as follows.
Can we hold up on applying this series? Unless I'm misunderstanding things, much of what you're applying is superseded by a much more recent series to add only the page encryption bitmap[*]. I have several concerns/comments for that series that I would like to hash out before we add a new ioctl(). I'll try to respond next week, my time is unfortunately limited due to onboarding activities.
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
An immediate response, actually the SEV live migration patches are preferred over the Page encryption bitmap patches, in other words, if SEV live migration patches are applied then we don't need the Page encryption bitmap patches and we prefer the live migration series to be applied.
It is not that page encryption bitmap series supersede the live migration patches, they are just cut of the live migration patches.
Thanks,
Ashish
Sean Christopherson
maintainerRe: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
Quoted 7 lines · Ashish Kalra
An immediate response, actually the SEV live migration patches are preferred over the Page encryption bitmap patches, in other words, if SEV live migration patches are applied then we don't need the Page encryption bitmap patches and we prefer the live migration series to be applied.
It is not that page encryption bitmap series supersede the live migration patches, they are just cut of the live migration patches.
In that case, can you post a fresh version of the live migration series? Paolo is obviously willing to take a big chunk of that series, and it will likely be easier to review with the full context, e.g. one of my comments on the standalone encryption bitmap series was going to be that it's hard to review without seeing the live migration aspect.
Thanks!
Paolo Bonzini
maintainerRe: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
Quoted 6 lines · Sean Christopherson
Quoted 5 lines · Ashish Kalra
An immediate response, actually the SEV live migration patches are preferred over the Page encryption bitmap patches, in other words, if SEV live migration patches are applied then we don't need the Page encryption bitmap patches and we prefer the live migration series to be applied.
Quoted 7 lines
Quoted 2 lines
It is not that page encryption bitmap series supersede the live migration patches, they are just cut of the live migration patches.
In that case, can you post a fresh version of the live migration series? Paolo is obviously willing to take a big chunk of that series, and it will likely be easier to review with the full context, e.g. one of my comments on the standalone encryption bitmap series was going to be that it's hard to review without seeing the live migration aspect.
It still applies without change. For now I'll only keep the series queued in my (n)SVM branch, but will hold on applying it to kvm.git's queue and next branches.
Thanks,
Paolo
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
Quoted 12 lines · Paolo Bonzini
Quoted 8 lines · Sean Christopherson
Quoted 8 lines · Ashish Kalra
An immediate response, actually the SEV live migration patches are preferred over the Page encryption bitmap patches, in other words, if SEV live migration patches are applied then we don't need the Page encryption bitmap patches and we prefer the live migration series to be applied.
It is not that page encryption bitmap series supersede the live migration patches, they are just cut of the live migration patches.
Quoted 8 lines
Quoted 5 lines
In that case, can you post a fresh version of the live migration series? Paolo is obviously willing to take a big chunk of that series, and it will likely be easier to review with the full context, e.g. one of my comments on the standalone encryption bitmap series was going to be that it's hard to review without seeing the live migration aspect.
It still applies without change. For now I'll only keep the series queued in my (n)SVM branch, but will hold on applying it to kvm.git's queue and next branches.
Ok thanks Paolo.
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
In reply to Sean ChristophersonYes i will post a fresh version of the live migration patches.
Also, can you please check your email settings, we are only able to see your response on the mailing list but we are not getting your direct responses.
Thanks,
Ashish
Sean Christopherson
maintainerRe: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
Quoted 5 lines · Ashish Kalra
Yes i will post a fresh version of the live migration patches.
Also, can you please check your email settings, we are only able to see your response on the mailing list but we are not getting your direct responses.
Hrm, as in you don't get the email?
Is this email any different? Sending via gmail instead of mutt...
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
This time I received your email directly.
Thanks,
Ashish
Quoted 12 lines · Sean Christopherson
Quoted 5 lines · Ashish Kalra
Yes i will post a fresh version of the live migration patches.
Also, can you please check your email settings, we are only able to see your response on the mailing list but we are not getting your direct responses.
Hrm, as in you don't get the email?
Is this email any different? Sending via gmail instead of mutt...
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
In reply to Sean ChristophersonQuoted 10 lines · Sean Christopherson
Quoted 5 lines · Ashish Kalra
Yes i will post a fresh version of the live migration patches.
Also, can you please check your email settings, we are only able to see your response on the mailing list but we are not getting your direct responses.
Hrm, as in you don't get the email?
Is this email any different? Sending via gmail instead of mutt...
FWIW, I received the previous email(s). It's probably something on our end.
Thanks,
Tom
Quoted 1 line
Re: [PATCH v8 13/18] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR.
In reply to Paolo BonziniHello Paolo,
Quoted 46 lines · Paolo Bonzini
Quoted 45 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Add new
KVM_FEATURE_SEV_LIVE_MIGRATIONfeature for guest to check for host-side support for SEV live migration. Also add a new customMSR_KVM_SEV_LIVE_MIG_ENfor guest to enable the SEV live migration feature.Signed-off-by Ashish Kalra <[email protected]>--- Documentation/virt/kvm/cpuid.rst | 5 +++++ Documentation/virt/kvm/msr.rst | 10 ++++++++++ arch/x86/include/uapi/asm/kvm_para.h | 5 +++++ arch/x86/kvm/svm/sev.c | 14 ++++++++++++++ arch/x86/kvm/svm/svm.c | 16 ++++++++++++++++ arch/x86/kvm/svm/svm.h | 2 ++ 6 files changed, 52 insertions(+)Documentation/virt/kvm/cpuid.rst +5
-0@@ -86,6 +86,11 @@ KVM_FEATURE_PV_SCHED_YIELD 13 guest checks this feature bit before using paravirtualized sched yield. +KVM_FEATURE_SEV_LIVE_MIGRATION 14 guest checks this feature bit before + using the page encryption state + hypercall to notify the page state + change + KVM_FEATURE_CLOCSOURCE_STABLE_BIT 24 host will warn if no guest-side per-cpu warps are expeced in kvmclockDocumentation/virt/kvm/msr.rst +6
-0@@ -319,3 +319,13 @@ data: KVM guests can request the host not to poll on HLT, for example if they are performing polling themselves. + +MSR_KVM_SEV_LIVE_MIG_EN: + 0x4b564d06 + + Control SEV Live Migration features. +
Quoted 9 lines
Documentation/virt/kvm/msr.rst data: · line 330
Quoted 4 lines
Documentation/virt/kvm/msr.rst +4
-0+data: + Bit 0 enables (1) or disables (0) host-side SEV Live Migration feature. + Bit 1 enables (1) or disables (0) support for SEV Live Migration extensions. + All other bits are reserved.This doesn't say what the feature is or does, and what the extensions are. As far as I understand bit 0 is a
guest->hostcommunication that it's properly handling the encryption bitmap.
Yes, your understanding for bit 0 is correct, the extensions are for any future extensions related to this live migration support, such as extensions/support for accelerated migration, etc.
Quoted 1 line
I applied patches -13, this one a bit changed as follows.
Yes, i will post a fresh series of this patch-set.
Thanks,
Ashish
Quoted 145 lines
Documentation/virt/kvm/cpuid.rst +0
-0@@ -96,6 +96,11 @@ KVM_FEATURE_MSI_EXT_DEST_ID 15 guestchecks this feature bit
before using extended
destination
ID bits in MSI address bits
11-5.+KVM_FEATURE_ENCRYPTED_VM_BIT 16 guest checks this feature
bit before
+ using the page encryption
stateDocumentation/virt/kvm/cpuid.rst +3
-0+ hypercall and encrypted VM + features MSR + KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 24 host will warn if noguest-side
per-cpu warps are expected
in
kvmclockDocumentation/virt/kvm/msr.rst +8
-0@@ -376,3 +376,13 @@ data: write '1' to bit 0 of the MSR, this causes the host to re-scan its queue and check if there are more notifications pending. The MSR is available if KVM_FEATURE_ASYNC_PF_INT is present in CPUID. + +MSR_KVM_ENC_VM_FEATURE: + 0x4b564d08 + + Control encrypted VM features. + +data: + Bit 0 tells the host that the guest is (1) or is not (0) issuingthe
Documentation/virt/kvm/msr.rst +2
-0+ ``KVM_HC_PAGE_ENC_STATUS`` hypercall to keep the encrypted bitmap + up to date.arch/x86/include/uapi/asm/kvm_para.h +4
-0@@ -33,6 +33,7 @@#define KVM_FEATURE_PV_SCHED_YIELD 13#define KVM_FEATURE_ASYNC_PF_INT 14#define KVM_FEATURE_MSI_EXT_DEST_ID 15 +#define KVM_FEATURE_ENCRYPTED_VM 16#define KVM_HINTS_REALTIME 0@@ -54,6 +55,7 @@#define MSR_KVM_POLL_CONTROL 0x4b564d05#define MSR_KVM_ASYNC_PF_INT 0x4b564d06#define MSR_KVM_ASYNC_PF_ACK 0x4b564d07 +#define MSR_KVM_ENC_VM_FEATURE 0x4b564d08struct kvm_steal_time {__u64 steal;@@ -136,4 +138,6 @@ struct kvm_vcpu_pv_apf_data {#define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK#define KVM_PV_EOI_DISABLED 0x0 +#define KVM_ENC_VM_BITMAP_VALID (1 << 0) +#endif /* _UAPI_ASM_X86_KVM_PARA_H */ arch/x86/kvm/svm/sev.c +11
-0@@ -1478,6 +1478,17 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsignedlong gpa, return 0; } +void sev_update_enc_vm_flags (struct kvm *kvm,u64 data) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; + +if (!sev_guest (kvm)) +return ; + +if (data &KVM_ENC_VM_BITMAP_VALID ) + sev->live_migration_enabled = true; +} +int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap){
arch/x86/kvm/svm/sev.c +3
-0@@ -1490,6 +1501,9 @@ int svm_get_page_enc_bitmap(struct kvm *kvm,if (!sev_guest (kvm))return -ENOTTY ; +if (!sev->live_migration_enabled) +return -EINVAL ; + gfn_start = bmap->start_gfn; gfn_end = gfn_start + bmap->num_pages;arch/x86/kvm/svm/svm.c +3
-0@@ -2766,6 +2766,9 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) svm->msr_decfg = data;break ; } +case MSR_KVM_ENC_VM_FEATURE : +sev_update_enc_vm_flags (vcpu->kvm, data); +break ;case MSR_IA32_APICBASE :if (kvm_vcpu_apicv_active (vcpu))arch/x86/kvm/svm/svm.c +0
-0avic_update_vapic_bar (to_svm (vcpu), data);arch/x86/kvm/svm/svm.h +1
-0@@ -66,6 +66,7 @@ struct kvm_sev_info {int fd;/* SEV device fd */ unsigned long pages_locked;/* Number of pages locked */ struct list_head regions_list;/* List of registered regions */ +bool live_migration_enabled;unsigned long *page_enc_bmap;unsigned long page_enc_bmap_size; };@@ -504,5 +505,6 @@ int svm_page_enc_status_hc(struct kvm *kvm, unsignedlong gpa, unsigned long npages, unsigned long enc);int svm_get_page_enc_bitmap (struct kvm *kvm,struct kvm_page_enc_bitmap *bmap); int svm_set_page_enc_bitmap(struct kvm *kvm, struct kvm_page_enc_bitmap*bmap);
+voidsev_update_enc_vm_flags(struct kvm *kvm, u64 data);#endif
Paolo
PATCH v8 14/18 EFI: Introduce the new AMD Memory Encryption GUID.
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
Introduce a new AMD Memory Encryption GUID which is currently used for defining a new UEFI enviroment variable which indicates UEFI/OVMF support for the SEV live migration feature. This variable is setup when UEFI/OVMF detects host/hypervisor support for SEV live migration and later this variable is read by the kernel using EFI runtime services to verify if OVMF supports the live migration feature.
--- include/linux/efi.h | 1 + 1 file changed, 1 insertion(+)
include/linux/efi.h +1 -0
@@ -358,6 +358,7 @@ void efi_native_runtime_setup(void);/* OEM GUIDs */ #define DELLEMC_EFI_RCI2_TABLE_GUID EFI_GUID(0x2d9f28a2, 0xa886, 0x456a, 0x97, 0xa8, 0xf1, 0x1e, 0xf2, 0x4f, 0xf4, 0x55) +#define MEM_ENCRYPT_GUID EFI_GUID(0x0cf29b71, 0x9e51, 0x433a, 0xa3, 0xb7, 0x81, 0xf3, 0xab, 0x16, 0xb8, 0x75) typedef struct { efi_guid_t guid;
Signature · 1 line
2.17.1
Re: [PATCH v8 14/18] EFI: Introduce the new AMD Memory Encryption GUID.
Quoted 29 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Introduce a new AMD Memory Encryption GUID which is currently used for defining a new UEFI enviroment variable which indicates UEFI/OVMF support for the SEV live migration feature. This variable is setup when UEFI/OVMF detects host/hypervisor support for SEV live migration and later this variable is read by the kernel using EFI runtime services to verify if OVMF supports the live migration feature.
Signed-off-by Ashish Kalra <[email protected]>--- include/linux/efi.h | 1 + 1 file changed, 1 insertion(+)include/linux/efi.h +1
-1@@ -358,6 +358,7 @@ void efi_native_runtime_setup(void);/* OEM GUIDs */ #define DELLEMC_EFI_RCI2_TABLE_GUID EFI_GUID(0x2d9f28a2, 0xa886, 0x456a, 0x97, 0xa8, 0xf1, 0x1e, 0xf2, 0x4f, 0xf4, 0x55) +#define MEM_ENCRYPT_GUID EFI_GUID(0x0cf29b71, 0x9e51, 0x433a, 0xa3, 0xb7, 0x81, 0xf3, 0xab, 0x16, 0xb8, 0x75) typedef struct { efi_guid_t guid; --
Quoted 2 lines
2.17.1
Have you gotten this GUID upstreamed into edk2?
Re: [PATCH v8 14/18] EFI: Introduce the new AMD Memory Encryption GUID.
Hello Steve,
Quoted 27 lines · Steve Rutherford
Quoted 26 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Introduce a new AMD Memory Encryption GUID which is currently used for defining a new UEFI enviroment variable which indicates UEFI/OVMF support for the SEV live migration feature. This variable is setup when UEFI/OVMF detects host/hypervisor support for SEV live migration and later this variable is read by the kernel using EFI runtime services to verify if OVMF supports the live migration feature.
Signed-off-by Ashish Kalra <[email protected]>--- include/linux/efi.h | 1 + 1 file changed, 1 insertion(+)include/linux/efi.h +1
-0@@ -358,6 +358,7 @@ void efi_native_runtime_setup(void);/* OEM GUIDs */ #define DELLEMC_EFI_RCI2_TABLE_GUID EFI_GUID(0x2d9f28a2, 0xa886, 0x456a, 0x97, 0xa8, 0xf1, 0x1e, 0xf2, 0x4f, 0xf4, 0x55) +#define MEM_ENCRYPT_GUID EFI_GUID(0x0cf29b71, 0x9e51, 0x433a, 0xa3, 0xb7, 0x81, 0xf3, 0xab, 0x16, 0xb8, 0x75)
Quoted 7 lines
Quoted 5 lines
include/linux/efi.h +0
-1typedef struct { efi_guid_t guid; --2.17.1
Have you gotten this GUID upstreamed into edk2?
Not yet.
This patch and the other OVMF patches are ready to be sent for upstreaming, i was waiting for this kernel patch-set to be accepted and upstreamed.
Quoted 1 line
Reviewed-by Steve Rutherford <[email protected]>
PATCH v8 15/18 KVM: x86: Add guest support for detecting and enabling SEV Live Migration feature.
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
The guest support for detecting and enabling SEV Live migration feature uses the following logic :
- kvm_init_plaform() checks if its booted under the EFI
- If not EFI,
i) check for the KVM_FEATURE_CPUID
ii) if CPUID reports that migration is support then issue wrmsrl
to enable the SEV migration support
- If EFI,
i) Check the KVM_FEATURE_CPUID.
ii) If CPUID reports that migration is supported, then reads the UEFI enviroment variable which
indicates OVMF support for live migration.
iii) If variable is set then wrmsr to enable the SEV migration support.
The EFI live migration check is done using a late_initcall() callback.
--- arch/x86/include/asm/mem_encrypt.h | 11 ++++++ arch/x86/kernel/kvm.c | 62 ++++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt.c | 11 ++++++ 3 files changed, 84 insertions(+)
arch/x86/include/asm/mem_encrypt.h +11 -0
@@ -20,6 +20,7 @@extern u64 sme_me_mask;extern bool sev_enabled; +extern bool sev_live_mig_enabled; void sme_encrypt_execute(unsigned long encrypted_kernel_vaddr, unsigned long decrypted_kernel_vaddr,
@@ -42,6 +43,8 @@ void __init sme_enable(struct boot_params *bp);int __init early_set_memory_decrypted (unsigned long vaddr,unsigned long size);int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size); +void __init early_set_mem_enc_dec_hypercall (unsigned long vaddr,int npages, +bool enc);/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void );
@@ -55,6 +58,7 @@ bool sev_active(void);#else /* !CONFIG_AMD_MEM_ENCRYPT */ #define sme_me_mask 0ULL +#define sev_live_mig_enabled falsestatic inline void __init sme_early_encrypt (resource_size_t paddr,unsigned long size) { }
@@ -76,6 +80,8 @@ static inline int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size) { return 0; }static inline int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size) {return 0 ; } +static inline void __init +early_set_mem_enc_dec_hypercall (unsigned long vaddr,int npages,bool enc) {}#define __bss_decrypted
@@ -102,6 +108,11 @@ static inline u64 sme_get_me_mask(void)return sme_me_mask; } +static inline bool sev_live_migration_enabled (void ) +{ +return sev_live_mig_enabled; +} +#endif /* __ASSEMBLY__ */ #endif /* __X86_MEM_ENCRYPT_H__ */
arch/x86/kernel/kvm.c +62 -0
80 lines not on this page · raw message
arch/x86/mm/mem_encrypt.c +11 -0
@@ -46,6 +46,8 @@ EXPORT_SYMBOL_GPL(sev_enable_key); bool sev_enabled __section(.data); +bool sev_live_mig_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) ;
@@ -204,6 +206,9 @@ static void set_memory_enc_dec_hypercall(unsigned long vaddr, int npages,unsigned long sz = npages <<PAGE_SHIFT ;unsigned long vaddr_end, vaddr_next; +if (!sev_live_migration_enabled ()) +return ; + vaddr_end = vaddr + sz;for (; vaddr < vaddr_end; vaddr = vaddr_next) {
@@ -374,6 +379,12 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size)return early_set_memory_enc_dec (vaddr, size, true); } +void __init early_set_mem_enc_dec_hypercall (unsigned long vaddr,int npages, +bool enc) +{ +set_memory_enc_dec_hypercall (vaddr, npages, enc); +} +/* * SME and SEV are very similar but they are not the same, so there are * times that the kernel will need to distinguish between SME and SEV. The
Signature · 1 line
2.17.1
Re: [PATCH v8 15/18] KVM: x86: Add guest support for detecting and enabling SEV Live Migration feature.
Quoted 207 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
The guest support for detecting and enabling SEV Live migration feature uses the following logic :
-
kvm_init_plaform()checks if its booted under the EFI- If not EFI,
i) check for the
KVM_FEATURE_CPUIDii) if CPUID reports that migration is support then issue wrmsrl
to enable the SEV migration support- If EFI,
i) Check the
KVM_FEATURE_CPUID.ii) If CPUID reports that migration is supported, then reads the UEFI enviroment variable which
indicates OVMF support for live migration.iii) If variable is set then wrmsr to enable the SEV migration support.
The EFI live migration check is done using a
late_initcall()callback.Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/include/asm/mem_encrypt.h | 11 ++++++ arch/x86/kernel/kvm.c | 62 ++++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt.c | 11 ++++++ 3 files changed, 84 insertions(+)arch/x86/include/asm/mem_encrypt.h +11
-0@@ -20,6 +20,7 @@extern u64 sme_me_mask;extern bool sev_enabled; +extern bool sev_live_mig_enabled; void sme_encrypt_execute(unsigned long encrypted_kernel_vaddr, unsigned long decrypted_kernel_vaddr,@@ -42,6 +43,8 @@ void __init sme_enable(struct boot_params *bp);int __init early_set_memory_decrypted (unsigned long vaddr,unsigned long size);int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size); +void __init early_set_mem_enc_dec_hypercall (unsigned long vaddr,int npages, +bool enc);/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void );@@ -55,6 +58,7 @@ bool sev_active(void);#else /* !CONFIG_AMD_MEM_ENCRYPT */ #define sme_me_mask 0ULL +#define sev_live_mig_enabled falsestatic inline void __init sme_early_encrypt (resource_size_t paddr,unsigned long size) { }@@ -76,6 +80,8 @@ static inline int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size) { return 0; }static inline int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size) {return 0 ; } +static inline void __init +early_set_mem_enc_dec_hypercall (unsigned long vaddr,int npages,bool enc) {}#define __bss_decrypted@@ -102,6 +108,11 @@ static inline u64 sme_get_me_mask(void)return sme_me_mask; } +static inline bool sev_live_migration_enabled (void ) +{ +return sev_live_mig_enabled; +} +#endif /* __ASSEMBLY__ */ #endif /* __X86_MEM_ENCRYPT_H__ */ arch/x86/kernel/kvm.c +62
-0@@ -24,6 +24,7 @@#include <linux/debugfs.h> #include <linux/nmi.h> #include <linux/swait.h> +#include <linux/efi.h> #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h> @@ -403,6 +404,53 @@ static inline void __set_percpu_decrypted(void *ptr, unsigned long size)early_set_memory_decrypted ((unsigned long ) ptr, size); } +#ifdef CONFIG_EFI +static bool setup_kvm_sev_migration (void ) +{ +efi_char16_t efi_Sev_Live_Mig_support_name[] =L"SevLiveMigrationEnabled" ; +efi_guid_t efi_variable_guid =MEM_ENCRYPT_GUID ; +efi_status_t status; +unsigned long size; +bool enabled; + +if (!sev_live_migration_enabled ()) +return false; + + size =sizeof (enabled); + +if (!efi_enabled (EFI_RUNTIME_SERVICES )) { +pr_info ("setup_kvm_sev_migration: no efi\n" ); +return false; + } + +/* Get variable contents into buffer */ + status = efi.get_variable (efi_Sev_Live_Mig_support_name, + &efi_variable_guid,NULL , &size, &enabled); + +if (status ==EFI_NOT_FOUND ) { +pr_info ("setup_kvm_sev_migration: variable not found\n" ); +return false; + } + +if (status !=EFI_SUCCESS ) { +pr_info ("setup_kvm_sev_migration: get_variable fail\n" ); +return false; + } + +if (enabled ==0 ) { +pr_info ("setup_kvm_sev_migration: live migration disabled in OVMF\n" ); +return false; + } + +pr_info ("setup_kvm_sev_migration: live migration enabled in OVMF\n" ); +wrmsrl (MSR_KVM_SEV_LIVE_MIG_EN ,KVM_SEV_LIVE_MIGRATION_ENABLED ); + +return true; +} + +late_initcall (setup_kvm_sev_migration); +#endif +/* * Iterate through all possible CPUs and map the memory region pointed * by apf_reason, steal_time and kvm_apic_eoi as decrypted at once. @@ -725,6 +773,20 @@ static void __init kvm_apic_init(void)static void __init kvm_init_platform (void ) { +#ifdef CONFIG_AMD_MEM_ENCRYPT +if (sev_active () && +kvm_para_has_feature (KVM_FEATURE_SEV_LIVE_MIGRATION )) { +printk (KERN_INFO "KVM enable live migration\n" ); + sev_live_mig_enabled = true; +/* +* If not booted using EFI, enable Live migration support. +*/ +if (!efi_enabled (EFI_BOOT )) +wrmsrl (MSR_KVM_SEV_LIVE_MIG_EN , +KVM_SEV_LIVE_MIGRATION_ENABLED ); + }else +printk (KERN_INFO "KVM enable live migration feature unsupported\n" ); +#endif kvmclock_init (); x86_platform.apic_post_init = kvm_apic_init; }arch/x86/mm/mem_encrypt.c +11
-1@@ -46,6 +46,8 @@ EXPORT_SYMBOL_GPL(sev_enable_key); bool sev_enabled __section(.data); +bool sev_live_mig_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) ;@@ -204,6 +206,9 @@ static void set_memory_enc_dec_hypercall(unsigned long vaddr, int npages,unsigned long sz = npages <<PAGE_SHIFT ;unsigned long vaddr_end, vaddr_next; +if (!sev_live_migration_enabled ()) +return ; + vaddr_end = vaddr + sz;for (; vaddr < vaddr_end; vaddr = vaddr_next) {@@ -374,6 +379,12 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size)return early_set_memory_enc_dec (vaddr, size, true); } +void __init early_set_mem_enc_dec_hypercall (unsigned long vaddr,int npages, +bool enc) +{ +set_memory_enc_dec_hypercall (vaddr, npages, enc); +} +/* * SME and SEV are very similar but they are not the same, so there are * times that the kernel will need to distinguish between SME and SEV. The --
Quoted 2 lines
2.17.1
PATCH v8 16/18 KVM: x86: Mark _bss_decrypted section variables as decrypted in page encryption bitmap.
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
Ensure that _bss_decrypted section variables such as hv_clock_boot and wall_clock are marked as decrypted in the page encryption bitmap if sev liv migration is supported.
--- arch/x86/kernel/kvmclock.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/x86/kernel/kvmclock.c +12 -0
@@ -334,6 +334,18 @@ void __init kvmclock_init(void)pr_info ("kvm-clock: Using msrs %x and %x" , msr_kvm_system_time, msr_kvm_wall_clock); +if (sev_live_migration_enabled ()) { +unsigned long nr_pages; +/* +* sizeof(hv_clock_boot) is already PAGE_SIZE aligned +*/ +early_set_mem_enc_dec_hypercall ((unsigned long )hv_clock_boot, +1 ,0 ); + nr_pages =DIV_ROUND_UP (sizeof (wall_clock),PAGE_SIZE ); +early_set_mem_enc_dec_hypercall ((unsigned long )&wall_clock, + nr_pages,0 ); + } +this_cpu_write (hv_clock_per_cpu, &hv_clock_boot[0 ]);kvm_register_clock ("primary cpu clock" );pvclock_set_pvti_cpu0_va (hv_clock_boot);
Signature · 1 line
2.17.1
Re: [PATCH v8 16/18] KVM: x86: Mark _bss_decrypted section variables as decrypted in page encryption bitmap.
Quoted 36 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Ensure that
_bss_decryptedsection variables such ashv_clock_bootandwall_clockare marked as decrypted in the page encryption bitmap if sev liv migration is supported.Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kernel/kvmclock.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/x86/kernel/kvmclock.c +12
-1@@ -334,6 +334,18 @@ void __init kvmclock_init(void)pr_info ("kvm-clock: Using msrs %x and %x" , msr_kvm_system_time, msr_kvm_wall_clock); +if (sev_live_migration_enabled ()) { +unsigned long nr_pages; +/* +* sizeof(hv_clock_boot) is already PAGE_SIZE aligned +*/ +early_set_mem_enc_dec_hypercall ((unsigned long )hv_clock_boot, +1 ,0 ); + nr_pages =DIV_ROUND_UP (sizeof (wall_clock),PAGE_SIZE ); +early_set_mem_enc_dec_hypercall ((unsigned long )&wall_clock, + nr_pages,0 ); + } +this_cpu_write (hv_clock_per_cpu, &hv_clock_boot[0 ]);kvm_register_clock ("primary cpu clock" );pvclock_set_pvti_cpu0_va (hv_clock_boot); --
Quoted 2 lines
2.17.1
PATCH v8 17/18 KVM: x86: Add kexec support for SEV Live Migration.
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
Reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.
The host's page encryption bitmap is maintained for the guest to keep the encrypted/decrypted state of the guest pages, therefore we need to explicitly mark all shared pages as encrypted again before rebooting into the new guest kernel.
--- arch/x86/kernel/kvm.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/x86/kernel/kvm.c +28 -0
@@ -35,6 +35,7 @@#include <asm/hypervisor.h> #include <asm/tlb.h> #include <asm/cpuidle_haltpoll.h> +#include <asm/e820/api.h> static int kvmapf =1 ;
@@ -358,6 +359,33 @@ 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 page encryption bitmap related to kernel +* specific page encryption status settings before we load a +* new kernel by kexec. NOTE: We cannot reset the complete +* page encryption bitmap here as we need to retain the +* UEFI/OVMF firmware specific settings. +*/ +if (sev_live_migration_enabled () & (smp_processor_id () ==0 )) { +int i; +unsigned long nr_pages; + +for (i =0 ; i < e820_table->nr_entries; i++) { +struct e820_entry *entry = &e820_table->entries[i]; +unsigned long start_pfn; +unsigned long end_pfn; + +if (entry->type !=E820_TYPE_RAM ) +continue ; + + start_pfn = entry->addr >>PAGE_SHIFT ; + end_pfn = (entry->addr + entry->size) >>PAGE_SHIFT ; + 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 (); }
Signature · 1 line
2.17.1
Re: [PATCH v8 17/18] KVM: x86: Add kexec support for SEV Live Migration.
Quoted 43 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.
The host's page encryption bitmap is maintained for the guest to keep the encrypted/decrypted state of the guest pages, therefore we need to explicitly mark all shared pages as encrypted again before rebooting into the new guest kernel.
Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kernel/kvm.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/x86/kernel/kvm.c +9
-0@@ -35,6 +35,7 @@#include <asm/hypervisor.h> #include <asm/tlb.h> #include <asm/cpuidle_haltpoll.h> +#include <asm/e820/api.h> static int kvmapf =1 ;@@ -358,6 +359,33 @@ 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 page encryption bitmap related to kernel +* specific page encryption status settings before we load a +* new kernel by kexec. NOTE: We cannot reset the complete +* page encryption bitmap here as we need to retain the +* UEFI/OVMF firmware specific settings. +*/ +if (sev_live_migration_enabled () & (smp_processor_id () ==0 )) {
arch/x86/kernel/kvm.c static void kvm_pv_guest_cpu_reboot(void *unused) · line 379
Quoted 10 lines
arch/x86/kernel/kvm.c +10
-0+int i; +unsigned long nr_pages; + +for (i =0 ; i < e820_table->nr_entries; i++) { +struct e820_entry *entry = &e820_table->entries[i]; +unsigned long start_pfn; +unsigned long end_pfn; + +if (entry->type !=E820_TYPE_RAM ) +continue ;
What should the behavior be for other memory types that are not expected to be mucked with by firmware? Should we avoid resetting the enc status of pmem/pram pages?
My intuition here is that we should only preserve the enc status of those bits that are set by the firmware.
Quoted 15 lines
arch/x86/kernel/kvm.c +9
-1+ + start_pfn = entry->addr >>PAGE_SHIFT ; + end_pfn = (entry->addr + entry->size) >>PAGE_SHIFT ; + 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
PATCH v8 18/18 KVM: SVM: Enable SEV live migration feature implicitly on Incoming VM(s).
In reply to Ashish KalraFrom: Ashish Kalra <[email protected]>
For source VM, live migration feature is enabled explicitly when the guest is booting, for the incoming VM(s) it is implied. This is required for handling A->B->C->... VM migrations case.
--- arch/x86/kvm/svm/sev.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kvm/svm/sev.c +7 -0
@@ -1592,6 +1592,13 @@ int svm_set_page_enc_bitmap(struct kvm *kvm,if (ret) goto unlock; +/* +* For source VM, live migration feature is enabled +* explicitly when the guest is booting, for the +* incoming VM(s) it is implied. +*/ +sev_update_migration_flags (kvm,KVM_SEV_LIVE_MIGRATION_ENABLED ); +bitmap_copy (sev->page_enc_bmap +BIT_WORD (gfn_start), bitmap, (gfn_end - gfn_start));
Signature · 1 line
2.17.1
Re: [PATCH v8 18/18] KVM: SVM: Enable SEV live migration feature implicitly on Incoming VM(s).
Quoted 31 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For source VM, live migration feature is enabled explicitly when the guest is booting, for the incoming VM(s) it is implied. This is required for handling A->B->C->... VM migrations case.
Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kvm/svm/sev.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/kvm/svm/sev.c +7
-1@@ -1592,6 +1592,13 @@ int svm_set_page_enc_bitmap(struct kvm *kvm,if (ret) goto unlock; +/* +* For source VM, live migration feature is enabled +* explicitly when the guest is booting, for the +* incoming VM(s) it is implied. +*/ +sev_update_migration_flags (kvm,KVM_SEV_LIVE_MIGRATION_ENABLED ); +bitmap_copy (sev->page_enc_bmap +BIT_WORD (gfn_start), bitmap, (gfn_end - gfn_start)); --
Quoted 2 lines
2.17.1
Paolo Bonzini
maintainerRe: [PATCH v8 18/18] KVM: SVM: Enable SEV live migration feature implicitly on Incoming VM(s).
In reply to Ashish KalraQuoted 18 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For source VM, live migration feature is enabled explicitly when the guest is booting, for the incoming VM(s) it is implied. This is required for handling A->B->C->... VM migrations case.
Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kvm/svm/sev.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/kvm/svm/sev.c +0
-0@@ -1592,6 +1592,13 @@ int svm_set_page_enc_bitmap(struct kvm *kvm,if (ret) goto unlock;
arch/x86/kvm/svm/sev.c int svm_set_page_enc_bitmap(struct kvm *kvm, · line 1603
Quoted 10 lines
arch/x86/kvm/svm/sev.c +7
-0+/* +* For source VM, live migration feature is enabled +* explicitly when the guest is booting, for the +* incoming VM(s) it is implied. +*/ +sev_update_migration_flags (kvm,KVM_SEV_LIVE_MIGRATION_ENABLED ); +bitmap_copy (sev->page_enc_bmap +BIT_WORD (gfn_start), bitmap, (gfn_end - gfn_start));
Why? I'd prefer the host to do this manually using a KVM_ENABLE_CAP. The hook in patch 12 would also be enabled/disabled using KVM_ENABLE_CAP.
Paolo
Paolo Bonzini
maintainerRe: [PATCH v8 18/18] KVM: SVM: Enable SEV live migration feature implicitly on Incoming VM(s).
In reply to Ashish KalraQuoted 20 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For source VM, live migration feature is enabled explicitly when the guest is booting, for the incoming VM(s) it is implied. This is required for handling A->B->C->... VM migrations case.
Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kvm/svm/sev.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/kvm/svm/sev.c +0
-0@@ -1592,6 +1592,13 @@ int svm_set_page_enc_bitmap(struct kvm *kvm,if (ret) goto unlock;
arch/x86/kvm/svm/sev.c int svm_set_page_enc_bitmap(struct kvm *kvm, · line 1604
Quoted 10 lines
arch/x86/kvm/svm/sev.c +7
-0+/* +* For source VM, live migration feature is enabled +* explicitly when the guest is booting, for the +* incoming VM(s) it is implied. +*/ +sev_update_migration_flags (kvm,KVM_SEV_LIVE_MIGRATION_ENABLED ); +bitmap_copy (sev->page_enc_bmap +BIT_WORD (gfn_start), bitmap, (gfn_end - gfn_start));
I would prefer that userspace does this using KVM_SET_MSR instead.
Paolo
Re: [PATCH v8 18/18] KVM: SVM: Enable SEV live migration feature implicitly on Incoming VM(s).
Hello Paolo,
Quoted 23 lines · Paolo Bonzini
Quoted 22 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For source VM, live migration feature is enabled explicitly when the guest is booting, for the incoming VM(s) it is implied. This is required for handling A->B->C->... VM migrations case.
Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kvm/svm/sev.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/kvm/svm/sev.c +4
-0@@ -1592,6 +1592,13 @@ int svm_set_page_enc_bitmap(struct kvm *kvm,if (ret) goto unlock; +/* +* For source VM, live migration feature is enabled +* explicitly when the guest is booting, for the +* incoming VM(s) it is implied.
Quoted 10 lines
arch/x86/kvm/svm/sev.c int svm_set_page_enc_bitmap(struct kvm *kvm, · line 1604
Quoted 6 lines
arch/x86/kvm/svm/sev.c +3
-0+*/ +sev_update_migration_flags (kvm,KVM_SEV_LIVE_MIGRATION_ENABLED ); +bitmap_copy (sev->page_enc_bmap +BIT_WORD (gfn_start), bitmap, (gfn_end - gfn_start));I would prefer that userspace does this using
KVM_SET_MSRinstead.
Ok.
But, this is for a VM which has already been migrated based on feature support on host and guest and host negotation and enablement of the live migration support, so i am assuming that a VM which has already been migrated can have this support enabled implicitly for further migration.
Thanks,
Ashish
Paolo Bonzini
maintainerRe: [PATCH v8 18/18] KVM: SVM: Enable SEV live migration feature implicitly on Incoming VM(s).
Quoted 8 lines · Ashish Kalra
Quoted 1 line
I would prefer that userspace does this using
KVM_SET_MSRinstead.Ok.
But, this is for a VM which has already been migrated based on feature support on host and guest and host negotation and enablement of the live migration support, so i am assuming that a VM which has already been migrated can have this support enabled implicitly for further migration.
It's just that it is a unexpected side effect of KVM_SET_PAGE_ENC_BITMAP. I prefer to have it tied to the more obvious KVM_SET_MSR ioctl.
Paolo
Hello All,
Any other feedback, review or comments on this patch-set ?
Thanks,
Ashish
Quoted 177 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
The series add support for AMD SEV guest live migration commands. To protect the confidentiality of an SEV protected guest memory while in transit we need to use the SEV commands defined in SEV API spec [1].
SEV guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. The commands provided by the SEV FW are meant to be used for the private memory only. The patch series introduces a new hypercall. The guest OS can use this hypercall to notify the page encryption status. If the page is encrypted with guest specific-key then we use SEV command during the migration. If page is not encrypted then fallback to default.
The patch adds new ioctls KVM_{SET,GET}_PAGE_ENC_BITMAP. The ioctl can be used by the qemu to get the page encrypted bitmap. Qemu can consult this bitmap during the migration to know whether the page is encrypted.
This section descibes how the SEV live migration feature is negotiated between the host and guest, the host indicates this feature support via
KVM_FEATURE_CPUID. The guest firmware (OVMF) detects this feature and sets a UEFI enviroment variable indicating OVMF support for live migration, the guest kernel also detects the host support for this feature via cpuid and in case of an EFI boot verifies if OVMF also supports this feature by getting the UEFI enviroment variable and if it set then enables live migration feature on host by writing to a custom MSR, if not booted under EFI, then it simply enables the feature by again writing to the custom MSR. The host returns error as part ofSET_PAGE_ENC_BITMAPioctl if guest has not enabled live migration.A branch containing these patches is available here:
https://github.com/AMDESE/linux/tree/sev-migration-v8[1] https://developer.amd.com/wp-content/resources/55766.PDF
Changes since v7:
- Removed the hypervisor specific hypercall/paravirt callback for SEV live migration and moved back to callingkvm_sev_hypercall3directly.
- Fix build errors asbuild error when
CONFIG_HYPERVISOR_GUEST=yandCONFIG_AMD_MEM_ENCRYPT=n.
- Implicitly enabled live migration for incoming VM(s) to handle A->B->C->... VM migrations.
- Fixed Documentation as per comments on v6 patches.
- Fixed error return path insev_send_update_data()as per comments on v6 patches.Changes since v6:
- Rebasing to mainline and refactoring to the new split SVM infrastructre.
- Move to static allocation of the unified Page Encryption bitmap instead of the dynamic resizing of the bitmap, the static allocation is done implicitly by extendingkvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap.
- FixedKVM_SET_PAGE_ENC_BITMAPioctl to set the whole bitmap instead of simply clearing specific bits.
- RemovedKVM_PAGE_ENC_BITMAP_RESETioctl, which is now performed usingKVM_SET_PAGE_ENC_BITMAP.
- Extended guest support for enabling Live Migration feature by adding a check for UEFI environment variable indicating OVMF support for Live Migration feature and additionally checking for KVM capability for the same feature. If not booted under EFI, then we simply check for KVM capability.
- Add hypervisor specific hypercall for SEV live migration by adding a new paravirt callback as part ofx86_hyper_runtime.
(x86 hypervisor specific runtime callbacks)
- Moving MSR handling forMSR_KVM_SEV_LIVE_MIG_ENinto svm/sev code and adding check for SEV live migration enabled by guest in theKVM_GET_PAGE_ENC_BITMAPioctl.
- Instead of the complete__bss_decryptedsection, only specific variables such ashv_clock_bootandwall_clockare marked as decrypted in the page encryption bitmapChanges since v5:
- Fix build errors asReported-by kbuild test robot <[email protected]>Changes since v4:
- Host support has been added to extend KVM capabilities/feature bits to include a newKVM_FEATURE_SEV_LIVE_MIGRATION, which the guest can query for host-side support for SEV live migration and a new custom MSRMSR_KVM_SEV_LIVE_MIG_ENis added for guest to enable the SEV live migration feature.
- Ensure that_bss_decryptedsection is marked as decrypted in the page encryption bitmap.
- FixingKVM_GET_PAGE_ENC_BITMAPioctl to return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copybmap->num_pagesbytes in the userspace buffer, ifbmap->num_pagesis not byte aligned we read the trailing bits from the userspace and copy those bits as is. This fixes guest page(s) corruption issues observed after migration completion.
- Add kexec support for SEV Live Migration to reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.Changes since v3:
- Rebasing to mainline and testing.
- Adding a newKVM_PAGE_ENC_BITMAP_RESETioctl, which resets the page encryption bitmap on a guest reboot event.
- Adding a more reliable sanity check for GPA range being passed to the hypercall to ensure that guest MMIO ranges are also marked in the page encryption bitmap.Changes since v2:
- reset the page encryption bitmap on vcpu rebootChanges since v1:
- Add support to share the page encryption between the source and target machine.
- Fix review feedbacks from Tom Lendacky.
- Add check to limit the session blob length.
- UpdateKVM_GET_PAGE_ENC_BITMAPicotl to use thebase_gfninstead of the memory slot when querying the bitmap.Ashish Kalra (7):
KVM: SVM: Add support for static allocation of unified Page Encryption
Bitmap.
KVM: x86: Introduce newKVM_FEATURE_SEV_LIVE_MIGRATIONfeature &
Custom MSR.
EFI: Introduce the new AMD Memory Encryption GUID.
KVM: x86: Add guest support for detecting and enabling SEV Live
Migration feature.
KVM: x86: Mark_bss_decryptedsection variables as decrypted in page
encryption bitmap.
KVM: x86: Add kexec support for SEV Live Migration.
KVM: SVM: Enable SEV live migration feature implicitly on IncomingVM(s).Brijesh Singh (11):
KVM: SVM: AddKVM_SEVSEND_STARTcommand
KVM: SVM: AddKVM_SEND_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_SEND_FINISHcommand
KVM: SVM: Add support forKVM_SEV_RECEIVE_STARTcommand
KVM: SVM: AddKVM_SEV_RECEIVE_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_RECEIVE_FINISHcommand
KVM: x86: Add AMD SEV specific Hypercall3
KVM: X86: IntroduceKVM_HC_PAGE_ENC_STATUShypercall
KVM: x86: IntroduceKVM_GET_PAGE_ENC_BITMAPioctl
mm: x86: Invoke hypercall when page encryption status is changed
KVM: x86: IntroduceKVM_SET_PAGE_ENC_BITMAPioctl.../virt/kvm/amd-memory-encryption.rst | 120 +++ Documentation/virt/kvm/api.rst | 71 ++ Documentation/virt/kvm/cpuid.rst | 5 + Documentation/virt/kvm/hypercalls.rst | 15 + Documentation/virt/kvm/msr.rst | 10 + arch/x86/include/asm/kvm_host.h | 7 + arch/x86/include/asm/kvm_para.h | 12 + arch/x86/include/asm/mem_encrypt.h | 11 + arch/x86/include/asm/paravirt.h | 10 + arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/include/uapi/asm/kvm_para.h | 5 + arch/x86/kernel/kvm.c | 90 +++ arch/x86/kernel/kvmclock.c | 12 + arch/x86/kernel/paravirt.c | 1 + arch/x86/kvm/svm/sev.c | 732 +++++++++++++++++- arch/x86/kvm/svm/svm.c | 21 + arch/x86/kvm/svm/svm.h | 9 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 35 + arch/x86/mm/mem_encrypt.c | 68 +- arch/x86/mm/pat/set_memory.c | 7 + include/linux/efi.h | 1 + include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 52 ++ include/uapi/linux/kvm_para.h | 1 + 25 files changed, 1297 insertions(+), 9 deletions(-)Signature · 1 line
2.17.1
Quoted 186 lines · Ashish Kalra
Hello All,
Any other feedback, review or comments on this patch-set ?
Thanks,
AshishQuoted 177 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
The series add support for AMD SEV guest live migration commands. To protect the confidentiality of an SEV protected guest memory while in transit we need to use the SEV commands defined in SEV API spec [1].
SEV guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. The commands provided by the SEV FW are meant to be used for the private memory only. The patch series introduces a new hypercall. The guest OS can use this hypercall to notify the page encryption status. If the page is encrypted with guest specific-key then we use SEV command during the migration. If page is not encrypted then fallback to default.
The patch adds new ioctls KVM_{SET,GET}_PAGE_ENC_BITMAP. The ioctl can be used by the qemu to get the page encrypted bitmap. Qemu can consult this bitmap during the migration to know whether the page is encrypted.
This section descibes how the SEV live migration feature is negotiated between the host and guest, the host indicates this feature support via
KVM_FEATURE_CPUID. The guest firmware (OVMF) detects this feature and sets a UEFI enviroment variable indicating OVMF support for live migration, the guest kernel also detects the host support for this feature via cpuid and in case of an EFI boot verifies if OVMF also supports this feature by getting the UEFI enviroment variable and if it set then enables live migration feature on host by writing to a custom MSR, if not booted under EFI, then it simply enables the feature by again writing to the custom MSR. The host returns error as part ofSET_PAGE_ENC_BITMAPioctl if guest has not enabled live migration.A branch containing these patches is available here:
https://github.com/AMDESE/linux/tree/sev-migration-v8[1] https://developer.amd.com/wp-content/resources/55766.PDF
Changes since v7:
- Removed the hypervisor specific hypercall/paravirt callback for SEV live migration and moved back to callingkvm_sev_hypercall3directly.
- Fix build errors asbuild error when
CONFIG_HYPERVISOR_GUEST=yandCONFIG_AMD_MEM_ENCRYPT=n.
- Implicitly enabled live migration for incoming VM(s) to handle A->B->C->... VM migrations.
- Fixed Documentation as per comments on v6 patches.
- Fixed error return path insev_send_update_data()as per comments on v6 patches.Changes since v6:
- Rebasing to mainline and refactoring to the new split SVM infrastructre.
- Move to static allocation of the unified Page Encryption bitmap instead of the dynamic resizing of the bitmap, the static allocation is done implicitly by extendingkvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap.
- FixedKVM_SET_PAGE_ENC_BITMAPioctl to set the whole bitmap instead of simply clearing specific bits.
- RemovedKVM_PAGE_ENC_BITMAP_RESETioctl, which is now performed usingKVM_SET_PAGE_ENC_BITMAP.
- Extended guest support for enabling Live Migration feature by adding a check for UEFI environment variable indicating OVMF support for Live Migration feature and additionally checking for KVM capability for the same feature. If not booted under EFI, then we simply check for KVM capability.
- Add hypervisor specific hypercall for SEV live migration by adding a new paravirt callback as part ofx86_hyper_runtime.
(x86 hypervisor specific runtime callbacks)
- Moving MSR handling forMSR_KVM_SEV_LIVE_MIG_ENinto svm/sev code and adding check for SEV live migration enabled by guest in theKVM_GET_PAGE_ENC_BITMAPioctl.
- Instead of the complete__bss_decryptedsection, only specific variables such ashv_clock_bootandwall_clockare marked as decrypted in the page encryption bitmapChanges since v5:
- Fix build errors asReported-by kbuild test robot <[email protected]>Changes since v4:
- Host support has been added to extend KVM capabilities/feature bits to include a newKVM_FEATURE_SEV_LIVE_MIGRATION, which the guest can query for host-side support for SEV live migration and a new custom MSRMSR_KVM_SEV_LIVE_MIG_ENis added for guest to enable the SEV live migration feature.
- Ensure that_bss_decryptedsection is marked as decrypted in the page encryption bitmap.
- FixingKVM_GET_PAGE_ENC_BITMAPioctl to return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copybmap->num_pagesbytes in the userspace buffer, ifbmap->num_pagesis not byte aligned we read the trailing bits from the userspace and copy those bits as is. This fixes guest page(s) corruption issues observed after migration completion.
- Add kexec support for SEV Live Migration to reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.Changes since v3:
- Rebasing to mainline and testing.
- Adding a newKVM_PAGE_ENC_BITMAP_RESETioctl, which resets the page encryption bitmap on a guest reboot event.
- Adding a more reliable sanity check for GPA range being passed to the hypercall to ensure that guest MMIO ranges are also marked in the page encryption bitmap.Changes since v2:
- reset the page encryption bitmap on vcpu rebootChanges since v1:
- Add support to share the page encryption between the source and target machine.
- Fix review feedbacks from Tom Lendacky.
- Add check to limit the session blob length.
- UpdateKVM_GET_PAGE_ENC_BITMAPicotl to use thebase_gfninstead of the memory slot when querying the bitmap.Ashish Kalra (7):
KVM: SVM: Add support for static allocation of unified Page Encryption
Bitmap.
KVM: x86: Introduce newKVM_FEATURE_SEV_LIVE_MIGRATIONfeature &
Custom MSR.
EFI: Introduce the new AMD Memory Encryption GUID.
KVM: x86: Add guest support for detecting and enabling SEV Live
Migration feature.
KVM: x86: Mark_bss_decryptedsection variables as decrypted in page
encryption bitmap.
KVM: x86: Add kexec support for SEV Live Migration.
KVM: SVM: Enable SEV live migration feature implicitly on IncomingVM(s).Brijesh Singh (11):
KVM: SVM: AddKVM_SEVSEND_STARTcommand
KVM: SVM: AddKVM_SEND_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_SEND_FINISHcommand
KVM: SVM: Add support forKVM_SEV_RECEIVE_STARTcommand
KVM: SVM: AddKVM_SEV_RECEIVE_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_RECEIVE_FINISHcommand
KVM: x86: Add AMD SEV specific Hypercall3
KVM: X86: IntroduceKVM_HC_PAGE_ENC_STATUShypercall
KVM: x86: IntroduceKVM_GET_PAGE_ENC_BITMAPioctl
mm: x86: Invoke hypercall when page encryption status is changed
KVM: x86: IntroduceKVM_SET_PAGE_ENC_BITMAPioctl.../virt/kvm/amd-memory-encryption.rst | 120 +++ Documentation/virt/kvm/api.rst | 71 ++ Documentation/virt/kvm/cpuid.rst | 5 + Documentation/virt/kvm/hypercalls.rst | 15 + Documentation/virt/kvm/msr.rst | 10 + arch/x86/include/asm/kvm_host.h | 7 + arch/x86/include/asm/kvm_para.h | 12 + arch/x86/include/asm/mem_encrypt.h | 11 + arch/x86/include/asm/paravirt.h | 10 + arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/include/uapi/asm/kvm_para.h | 5 + arch/x86/kernel/kvm.c | 90 +++ arch/x86/kernel/kvmclock.c | 12 + arch/x86/kernel/paravirt.c | 1 + arch/x86/kvm/svm/sev.c | 732 +++++++++++++++++- arch/x86/kvm/svm/svm.c | 21 + arch/x86/kvm/svm/svm.h | 9 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 35 + arch/x86/mm/mem_encrypt.c | 68 +- arch/x86/mm/pat/set_memory.c | 7 + include/linux/efi.h | 1 + include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 52 ++ include/uapi/linux/kvm_para.h | 1 + 25 files changed, 1297 insertions(+), 9 deletions(-)--
2.17.1
Hey all,
These patches look pretty reasonable at this point. What's the next step for getting them merged?
Thanks,
Steve
Hello Steve,
Quoted 184 lines · Steve Rutherford
Quoted 183 lines · Ashish Kalra
Hello All,
Any other feedback, review or comments on this patch-set ?
Thanks,
AshishQuoted 174 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
The series add support for AMD SEV guest live migration commands. To protect the confidentiality of an SEV protected guest memory while in transit we need to use the SEV commands defined in SEV API spec [1].
SEV guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. The commands provided by the SEV FW are meant to be used for the private memory only. The patch series introduces a new hypercall. The guest OS can use this hypercall to notify the page encryption status. If the page is encrypted with guest specific-key then we use SEV command during the migration. If page is not encrypted then fallback to default.
The patch adds new ioctls KVM_{SET,GET}_PAGE_ENC_BITMAP. The ioctl can be used by the qemu to get the page encrypted bitmap. Qemu can consult this bitmap during the migration to know whether the page is encrypted.
This section descibes how the SEV live migration feature is negotiated between the host and guest, the host indicates this feature support via
KVM_FEATURE_CPUID. The guest firmware (OVMF) detects this feature and sets a UEFI enviroment variable indicating OVMF support for live migration, the guest kernel also detects the host support for this feature via cpuid and in case of an EFI boot verifies if OVMF also supports this feature by getting the UEFI enviroment variable and if it set then enables live migration feature on host by writing to a custom MSR, if not booted under EFI, then it simply enables the feature by again writing to the custom MSR. The host returns error as part ofSET_PAGE_ENC_BITMAPioctl if guest has not enabled live migration.A branch containing these patches is available here:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FAMDESE%2Flinux%2Ftree%2Fsev-migration-v8&data=02%7C01%7Cashish.kalra%40amd.com%7Cb7da54c6f7784a548ed208d80666c99b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637266386411473155&sdata=igztZXTZl1i18e5T4DTlNJw07h6z3aBNCAD6%2BE7r9Ik%3D&reserved=0Changes since v7:
- Removed the hypervisor specific hypercall/paravirt callback for SEV live migration and moved back to callingkvm_sev_hypercall3directly.
- Fix build errors asbuild error when
CONFIG_HYPERVISOR_GUEST=yandCONFIG_AMD_MEM_ENCRYPT=n.
- Implicitly enabled live migration for incoming VM(s) to handle A->B->C->... VM migrations.
- Fixed Documentation as per comments on v6 patches.
- Fixed error return path insev_send_update_data()as per comments on v6 patches.Changes since v6:
- Rebasing to mainline and refactoring to the new split SVM infrastructre.
- Move to static allocation of the unified Page Encryption bitmap instead of the dynamic resizing of the bitmap, the static allocation is done implicitly by extendingkvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap.
- FixedKVM_SET_PAGE_ENC_BITMAPioctl to set the whole bitmap instead of simply clearing specific bits.
- RemovedKVM_PAGE_ENC_BITMAP_RESETioctl, which is now performed usingKVM_SET_PAGE_ENC_BITMAP.
- Extended guest support for enabling Live Migration feature by adding a check for UEFI environment variable indicating OVMF support for Live Migration feature and additionally checking for KVM capability for the same feature. If not booted under EFI, then we simply check for KVM capability.
- Add hypervisor specific hypercall for SEV live migration by adding a new paravirt callback as part ofx86_hyper_runtime.
(x86 hypervisor specific runtime callbacks)
- Moving MSR handling forMSR_KVM_SEV_LIVE_MIG_ENinto svm/sev code and adding check for SEV live migration enabled by guest in theKVM_GET_PAGE_ENC_BITMAPioctl.
- Instead of the complete__bss_decryptedsection, only specific variables such ashv_clock_bootandwall_clockare marked as decrypted in the page encryption bitmapChanges since v5:
- Fix build errors asReported-by kbuild test robot <[email protected]>Changes since v4:
- Host support has been added to extend KVM capabilities/feature bits to include a newKVM_FEATURE_SEV_LIVE_MIGRATION, which the guest can query for host-side support for SEV live migration and a new custom MSRMSR_KVM_SEV_LIVE_MIG_ENis added for guest to enable the SEV live migration feature.
- Ensure that_bss_decryptedsection is marked as decrypted in the page encryption bitmap.
- FixingKVM_GET_PAGE_ENC_BITMAPioctl to return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copybmap->num_pagesbytes in the userspace buffer, ifbmap->num_pagesis not byte aligned we read the trailing bits from the userspace and copy those bits as is. This fixes guest page(s) corruption issues observed after migration completion.
- Add kexec support for SEV Live Migration to reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.Changes since v3:
- Rebasing to mainline and testing.
- Adding a newKVM_PAGE_ENC_BITMAP_RESETioctl, which resets the page encryption bitmap on a guest reboot event.
- Adding a more reliable sanity check for GPA range being passed to the hypercall to ensure that guest MMIO ranges are also marked in the page encryption bitmap.Changes since v2:
- reset the page encryption bitmap on vcpu rebootChanges since v1:
- Add support to share the page encryption between the source and target machine.
- Fix review feedbacks from Tom Lendacky.
- Add check to limit the session blob length.
- UpdateKVM_GET_PAGE_ENC_BITMAPicotl to use thebase_gfninstead of the memory slot when querying the bitmap.Ashish Kalra (7):
KVM: SVM: Add support for static allocation of unified Page Encryption
Bitmap.
KVM: x86: Introduce newKVM_FEATURE_SEV_LIVE_MIGRATIONfeature &
Custom MSR.
EFI: Introduce the new AMD Memory Encryption GUID.
KVM: x86: Add guest support for detecting and enabling SEV Live
Migration feature.
KVM: x86: Mark_bss_decryptedsection variables as decrypted in page
encryption bitmap.
KVM: x86: Add kexec support for SEV Live Migration.
KVM: SVM: Enable SEV live migration feature implicitly on IncomingVM(s).Brijesh Singh (11):
KVM: SVM: AddKVM_SEVSEND_STARTcommand
KVM: SVM: AddKVM_SEND_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_SEND_FINISHcommand
KVM: SVM: Add support forKVM_SEV_RECEIVE_STARTcommand
KVM: SVM: AddKVM_SEV_RECEIVE_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_RECEIVE_FINISHcommand
KVM: x86: Add AMD SEV specific Hypercall3
KVM: X86: IntroduceKVM_HC_PAGE_ENC_STATUShypercall
KVM: x86: IntroduceKVM_GET_PAGE_ENC_BITMAPioctl
mm: x86: Invoke hypercall when page encryption status is changed
KVM: x86: IntroduceKVM_SET_PAGE_ENC_BITMAPioctl.../virt/kvm/amd-memory-encryption.rst | 120 +++ Documentation/virt/kvm/api.rst | 71 ++ Documentation/virt/kvm/cpuid.rst | 5 + Documentation/virt/kvm/hypercalls.rst | 15 + Documentation/virt/kvm/msr.rst | 10 + arch/x86/include/asm/kvm_host.h | 7 + arch/x86/include/asm/kvm_para.h | 12 + arch/x86/include/asm/mem_encrypt.h | 11 + arch/x86/include/asm/paravirt.h | 10 + arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/include/uapi/asm/kvm_para.h | 5 + arch/x86/kernel/kvm.c | 90 +++ arch/x86/kernel/kvmclock.c | 12 + arch/x86/kernel/paravirt.c | 1 + arch/x86/kvm/svm/sev.c | 732 +++++++++++++++++- arch/x86/kvm/svm/svm.c | 21 + arch/x86/kvm/svm/svm.h | 9 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 35 + arch/x86/mm/mem_encrypt.c | 68 +- arch/x86/mm/pat/set_memory.c | 7 + include/linux/efi.h | 1 + include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 52 ++ include/uapi/linux/kvm_para.h | 1 + 25 files changed, 1297 insertions(+), 9 deletions(-)
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
--
2.17.1Hey all,
These patches look pretty reasonable at this point. What's the next step for getting them merged?
I believe i have incorporated all your main comments and feedback, for example, no more dynamic resizing of the page encryption bitmap and static allocation of the same, fixing SET_PAGE_ENC_BITMAP ioctl to set the whole bitmap and also merging RESET_PAGE_ENC_BITMAP ioctl into it and other stuff like kexec support, etc.
I know you have some additional comments and i am waiting for some more feedback and comments from others on the mailing list.
But otherwise i believe these patches are fully ready to be merged at this point and i am looking forward to the same.
Thanks,
Ashish
Quoted 2 lines
Thanks,
Steve
Are these likely to get merged into 5.9?
Quoted 213 lines · Ashish Kalra
Hello Steve,
Quoted 184 lines · Steve Rutherford
Quoted 183 lines · Ashish Kalra
Hello All,
Any other feedback, review or comments on this patch-set ?
Thanks,
AshishQuoted 174 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
The series add support for AMD SEV guest live migration commands. To protect the confidentiality of an SEV protected guest memory while in transit we need to use the SEV commands defined in SEV API spec [1].
SEV guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. The commands provided by the SEV FW are meant to be used for the private memory only. The patch series introduces a new hypercall. The guest OS can use this hypercall to notify the page encryption status. If the page is encrypted with guest specific-key then we use SEV command during the migration. If page is not encrypted then fallback to default.
The patch adds new ioctls KVM_{SET,GET}_PAGE_ENC_BITMAP. The ioctl can be used by the qemu to get the page encrypted bitmap. Qemu can consult this bitmap during the migration to know whether the page is encrypted.
This section descibes how the SEV live migration feature is negotiated between the host and guest, the host indicates this feature support via
KVM_FEATURE_CPUID. The guest firmware (OVMF) detects this feature and sets a UEFI enviroment variable indicating OVMF support for live migration, the guest kernel also detects the host support for this feature via cpuid and in case of an EFI boot verifies if OVMF also supports this feature by getting the UEFI enviroment variable and if it set then enables live migration feature on host by writing to a custom MSR, if not booted under EFI, then it simply enables the feature by again writing to the custom MSR. The host returns error as part ofSET_PAGE_ENC_BITMAPioctl if guest has not enabled live migration.A branch containing these patches is available here:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FAMDESE%2Flinux%2Ftree%2Fsev-migration-v8&data=02%7C01%7Cashish.kalra%40amd.com%7Cb7da54c6f7784a548ed208d80666c99b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637266386411473155&sdata=igztZXTZl1i18e5T4DTlNJw07h6z3aBNCAD6%2BE7r9Ik%3D&reserved=0Changes since v7:
- Removed the hypervisor specific hypercall/paravirt callback for SEV live migration and moved back to callingkvm_sev_hypercall3directly.
- Fix build errors asbuild error when
CONFIG_HYPERVISOR_GUEST=yandCONFIG_AMD_MEM_ENCRYPT=n.
- Implicitly enabled live migration for incoming VM(s) to handle A->B->C->... VM migrations.
- Fixed Documentation as per comments on v6 patches.
- Fixed error return path insev_send_update_data()as per comments on v6 patches.Changes since v6:
- Rebasing to mainline and refactoring to the new split SVM infrastructre.
- Move to static allocation of the unified Page Encryption bitmap instead of the dynamic resizing of the bitmap, the static allocation is done implicitly by extendingkvm_arch_commit_memory_region()callack to add svm specificx86_opswhich can read the userspace provided memory region/memslots and calculate the amount of guest RAM managed by the KVM and grow the bitmap.
- FixedKVM_SET_PAGE_ENC_BITMAPioctl to set the whole bitmap instead of simply clearing specific bits.
- RemovedKVM_PAGE_ENC_BITMAP_RESETioctl, which is now performed usingKVM_SET_PAGE_ENC_BITMAP.
- Extended guest support for enabling Live Migration feature by adding a check for UEFI environment variable indicating OVMF support for Live Migration feature and additionally checking for KVM capability for the same feature. If not booted under EFI, then we simply check for KVM capability.
- Add hypervisor specific hypercall for SEV live migration by adding a new paravirt callback as part ofx86_hyper_runtime.
(x86 hypervisor specific runtime callbacks)
- Moving MSR handling forMSR_KVM_SEV_LIVE_MIG_ENinto svm/sev code and adding check for SEV live migration enabled by guest in theKVM_GET_PAGE_ENC_BITMAPioctl.
- Instead of the complete__bss_decryptedsection, only specific variables such ashv_clock_bootandwall_clockare marked as decrypted in the page encryption bitmapChanges since v5:
- Fix build errors asReported-by kbuild test robot <[email protected]>Changes since v4:
- Host support has been added to extend KVM capabilities/feature bits to include a newKVM_FEATURE_SEV_LIVE_MIGRATION, which the guest can query for host-side support for SEV live migration and a new custom MSRMSR_KVM_SEV_LIVE_MIG_ENis added for guest to enable the SEV live migration feature.
- Ensure that_bss_decryptedsection is marked as decrypted in the page encryption bitmap.
- FixingKVM_GET_PAGE_ENC_BITMAPioctl to return the correct bitmap as per the number of pages being requested by the user. Ensure that we only copybmap->num_pagesbytes in the userspace buffer, ifbmap->num_pagesis not byte aligned we read the trailing bits from the userspace and copy those bits as is. This fixes guest page(s) corruption issues observed after migration completion.
- Add kexec support for SEV Live Migration to reset the host's page encryption bitmap related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete page encryption bitmap here as we need to retain the UEFI/OVMF firmware specific settings.Changes since v3:
- Rebasing to mainline and testing.
- Adding a newKVM_PAGE_ENC_BITMAP_RESETioctl, which resets the page encryption bitmap on a guest reboot event.
- Adding a more reliable sanity check for GPA range being passed to the hypercall to ensure that guest MMIO ranges are also marked in the page encryption bitmap.Changes since v2:
- reset the page encryption bitmap on vcpu rebootChanges since v1:
- Add support to share the page encryption between the source and target machine.
- Fix review feedbacks from Tom Lendacky.
- Add check to limit the session blob length.
- UpdateKVM_GET_PAGE_ENC_BITMAPicotl to use thebase_gfninstead of the memory slot when querying the bitmap.Ashish Kalra (7):
KVM: SVM: Add support for static allocation of unified Page Encryption
Bitmap.
KVM: x86: Introduce newKVM_FEATURE_SEV_LIVE_MIGRATIONfeature &
Custom MSR.
EFI: Introduce the new AMD Memory Encryption GUID.
KVM: x86: Add guest support for detecting and enabling SEV Live
Migration feature.
KVM: x86: Mark_bss_decryptedsection variables as decrypted in page
encryption bitmap.
KVM: x86: Add kexec support for SEV Live Migration.
KVM: SVM: Enable SEV live migration feature implicitly on IncomingVM(s).Brijesh Singh (11):
KVM: SVM: AddKVM_SEVSEND_STARTcommand
KVM: SVM: AddKVM_SEND_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_SEND_FINISHcommand
KVM: SVM: Add support forKVM_SEV_RECEIVE_STARTcommand
KVM: SVM: AddKVM_SEV_RECEIVE_UPDATE_DATAcommand
KVM: SVM: AddKVM_SEV_RECEIVE_FINISHcommand
KVM: x86: Add AMD SEV specific Hypercall3
KVM: X86: IntroduceKVM_HC_PAGE_ENC_STATUShypercall
KVM: x86: IntroduceKVM_GET_PAGE_ENC_BITMAPioctl
mm: x86: Invoke hypercall when page encryption status is changed
KVM: x86: IntroduceKVM_SET_PAGE_ENC_BITMAPioctl.../virt/kvm/amd-memory-encryption.rst | 120 +++ Documentation/virt/kvm/api.rst | 71 ++ Documentation/virt/kvm/cpuid.rst | 5 + Documentation/virt/kvm/hypercalls.rst | 15 + Documentation/virt/kvm/msr.rst | 10 + arch/x86/include/asm/kvm_host.h | 7 + arch/x86/include/asm/kvm_para.h | 12 + arch/x86/include/asm/mem_encrypt.h | 11 + arch/x86/include/asm/paravirt.h | 10 + arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/include/uapi/asm/kvm_para.h | 5 + arch/x86/kernel/kvm.c | 90 +++ arch/x86/kernel/kvmclock.c | 12 + arch/x86/kernel/paravirt.c | 1 + arch/x86/kvm/svm/sev.c | 732 +++++++++++++++++- arch/x86/kvm/svm/svm.c | 21 + arch/x86/kvm/svm/svm.h | 9 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 35 + arch/x86/mm/mem_encrypt.c | 68 +- arch/x86/mm/pat/set_memory.c | 7 + include/linux/efi.h | 1 + include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 52 ++ include/uapi/linux/kvm_para.h | 1 + 25 files changed, 1297 insertions(+), 9 deletions(-)Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
--
2.17.1Hey all,
These patches look pretty reasonable at this point. What's the next step for getting them merged?I believe i have incorporated all your main comments and feedback, for example, no more dynamic resizing of the page encryption bitmap and static allocation of the same, fixing
SET_PAGE_ENC_BITMAPioctl to set the whole bitmap and also mergingRESET_PAGE_ENC_BITMAPioctl into it and other stuff like kexec support, etc.I know you have some additional comments and i am waiting for some more feedback and comments from others on the mailing list.
But otherwise i believe these patches are fully ready to be merged at this point and i am looking forward to the same.
Thanks,
AshishQuoted 2 lines
Thanks,
Steve