dddaf7aa9e
- vdpa-dev: Fix initialisation order to restore VDUSE compatibility - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - migration: fix-possible-int-overflow - target/m68k: Map FPU exceptions to FPSR register - qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo - hvf: arm: Fix encodings for ID_AA64PFR1_EL1 and debug System registers - hw/intc/arm_gic: Fix handling of NS view of GICC_APR<n> - qio: Inherit follow_coroutine_ctx across TLS - target/riscv: Fix the element agnostic function problem - accel/tcg: Fix typo causing tb->page_addr[1] to not be recorded - tcg/loongarch64: Fix tcg_out_movi vs some pcrel pointers - migration: Fix file migration with fdset - ui/vnc: don't return an empty SASL mechlist to the client - target/arm: Fix FJCVTZS vs flush-to-zero - hw/ppc/e500: Prefer QOM cast - sphinx/qapidoc: Fix to generate doc for explicit, unboxed arguments - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - hw/i386/amd_iommu: Don't leak memory in amdvi_update_iotlb() - hw/arm/mps2-tz.c: fix RX/TX interrupts order - target/i386: csv: Add support to migrate the incoming context for CSV3 guest - target/i386: csv: Add support to migrate the outgoing context for CSV3 guest - target/i386: csv: Add support to migrate the incoming page for CSV3 guest - target/i386: csv: Add support to migrate the outgoing page for CSV3 guest - linux-headers: update kernel headers to include CSV3 migration cmds - vfio: Only map shared region for CSV3 virtual machine - vga: Force full update for CSV3 guest - target/i386: csv: Load initial image to private memory for CSV3 guest - target/i386: csv: Do not register/unregister guest secure memory for CSV3 guest - target/i386: cpu: Populate CPUID 0x8000_001F when CSV3 is active - target/i386: csv: Add command to load vmcb to CSV3 guest memory - target/i386: csv: Add command to load data to CSV3 guest memory - target/i386: csv: Add command to initialize CSV3 context - target/i386: csv: Add CSV3 context - next-kbd: convert to use qemu_input_handler_register() - qemu/bswap: Undefine CPU_CONVERT() once done - exec/memop: Remove unused memop_big_endian() helper - hw/nvme: fix handling of over-committed queues - 9pfs: fix crash on 'Treaddir' request - hw/misc/psp: Pin the hugepage memory specified by mem2 during use for psp - hw/misc: support tkm use mem2 memory - hw/i386: add mem2 option for qemu - kvm: add support for guest physical bits - target/i386: add guest-phys-bits cpu property Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit f45f35e88509a4ffa9f62332ee9601e9fe1f8d09)
109 lines
3.3 KiB
Diff
109 lines
3.3 KiB
Diff
From 368bf2c044fcdd21f10545de103af7cd2a5986f9 Mon Sep 17 00:00:00 2001
|
|
From: jiangxin <jiangxin@hygon.cn>
|
|
Date: Wed, 25 Aug 2021 12:25:05 +0800
|
|
Subject: [PATCH] target/i386: csv: Add command to load vmcb to CSV3 guest
|
|
memory
|
|
|
|
The KVM_CSV3_LAUNCH_ENCRYPT_VMCB command is used to load and encrypt
|
|
the initial VMCB data to secure memory in an isolated region that
|
|
guest owns.
|
|
|
|
Signed-off-by: Xin Jiang <jiangxin@hygon.cn>
|
|
Signed-off-by: hanliyang <hanliyang@hygon.cn>
|
|
---
|
|
linux-headers/linux/kvm.h | 1 +
|
|
target/i386/csv-sysemu-stub.c | 5 +++++
|
|
target/i386/csv.c | 21 +++++++++++++++++++++
|
|
target/i386/csv.h | 1 +
|
|
target/i386/sev.c | 8 ++++++--
|
|
5 files changed, 34 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index dd6d9c2e07..8487d0889b 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -2114,6 +2114,7 @@ enum csv3_cmd_id {
|
|
|
|
KVM_CSV3_INIT = KVM_CSV3_NR_MIN,
|
|
KVM_CSV3_LAUNCH_ENCRYPT_DATA,
|
|
+ KVM_CSV3_LAUNCH_ENCRYPT_VMCB,
|
|
};
|
|
|
|
struct kvm_csv3_launch_encrypt_data {
|
|
diff --git a/target/i386/csv-sysemu-stub.c b/target/i386/csv-sysemu-stub.c
|
|
index b0ccbd2f18..23d885f0f3 100644
|
|
--- a/target/i386/csv-sysemu-stub.c
|
|
+++ b/target/i386/csv-sysemu-stub.c
|
|
@@ -24,3 +24,8 @@ int csv3_load_data(uint64_t gpa, uint8_t *ptr, uint64_t len, Error **errp)
|
|
{
|
|
g_assert_not_reached();
|
|
}
|
|
+
|
|
+int csv3_launch_encrypt_vmcb(void)
|
|
+{
|
|
+ g_assert_not_reached();
|
|
+}
|
|
diff --git a/target/i386/csv.c b/target/i386/csv.c
|
|
index 2a596681b8..12282ba451 100644
|
|
--- a/target/i386/csv.c
|
|
+++ b/target/i386/csv.c
|
|
@@ -143,3 +143,24 @@ csv3_load_data(uint64_t gpa, uint8_t *ptr, uint64_t len, Error **errp)
|
|
|
|
return ret;
|
|
}
|
|
+
|
|
+int
|
|
+csv3_launch_encrypt_vmcb(void)
|
|
+{
|
|
+ int ret, fw_error;
|
|
+
|
|
+ if (!csv3_enabled()) {
|
|
+ error_report("%s: CSV3 is not enabled", __func__);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ ret = csv3_ioctl(KVM_CSV3_LAUNCH_ENCRYPT_VMCB, NULL, &fw_error);
|
|
+ if (ret) {
|
|
+ error_report("%s: CSV3 LAUNCH_ENCRYPT_VMCB ret=%d fw_error=%d '%s'",
|
|
+ __func__, ret, fw_error, fw_error_to_str(fw_error));
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
+err:
|
|
+ return ret;
|
|
+}
|
|
diff --git a/target/i386/csv.h b/target/i386/csv.h
|
|
index 27b66f7857..3caf216743 100644
|
|
--- a/target/i386/csv.h
|
|
+++ b/target/i386/csv.h
|
|
@@ -86,6 +86,7 @@ typedef struct Csv3GuestState Csv3GuestState;
|
|
|
|
extern struct Csv3GuestState csv3_guest;
|
|
extern int csv3_init(uint32_t policy, int fd, void *state, struct sev_ops *ops);
|
|
+extern int csv3_launch_encrypt_vmcb(void);
|
|
|
|
int csv3_load_data(uint64_t gpa, uint8_t *ptr, uint64_t len, Error **errp);
|
|
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
|
index 1c453b3148..6ff8891678 100644
|
|
--- a/target/i386/sev.c
|
|
+++ b/target/i386/sev.c
|
|
@@ -880,8 +880,12 @@ sev_launch_get_measure(Notifier *notifier, void *unused)
|
|
}
|
|
|
|
if (sev_es_enabled()) {
|
|
- /* measure all the VM save areas before getting launch_measure */
|
|
- ret = sev_launch_update_vmsa(sev);
|
|
+ if (csv3_enabled()) {
|
|
+ ret = csv3_launch_encrypt_vmcb();
|
|
+ } else {
|
|
+ /* measure all the VM save areas before getting launch_measure */
|
|
+ ret = sev_launch_update_vmsa(sev);
|
|
+ }
|
|
if (ret) {
|
|
exit(1);
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|