- 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)
80 lines
2.0 KiB
Diff
80 lines
2.0 KiB
Diff
From 454079664e1492eeb9b90d1d05598e84dc436f11 Mon Sep 17 00:00:00 2001
|
|
From: jiangxin <jiangxin@hygon.cn>
|
|
Date: Fri, 17 Jun 2022 09:25:19 +0800
|
|
Subject: [PATCH] linux-headers: update kernel headers to include CSV3
|
|
migration cmds
|
|
|
|
Four new migration commands are added to support CSV3 migration.
|
|
|
|
KVM_CSV3_SEND_ENCRYPT_DATA/KVM_CSV3_RECEIVE_ENCRYPT_DATA cmds are
|
|
used to migrate guest's pages.
|
|
|
|
KVM_CSV3_SEND_ENCRYPT_CONTEXT/KVM_CSV3_RECEIVE_ENCRYPT_CONTEXT cmds
|
|
are used to migration guest's runtime context.
|
|
|
|
Signed-off-by: Xin Jiang <jiangxin@hygon.cn>
|
|
Signed-off-by: hanliyang <hanliyang@hygon.cn>
|
|
---
|
|
linux-headers/linux/kvm.h | 38 ++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 38 insertions(+)
|
|
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index 8487d0889b..8543db844e 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -2115,6 +2115,12 @@ enum csv3_cmd_id {
|
|
KVM_CSV3_INIT = KVM_CSV3_NR_MIN,
|
|
KVM_CSV3_LAUNCH_ENCRYPT_DATA,
|
|
KVM_CSV3_LAUNCH_ENCRYPT_VMCB,
|
|
+ KVM_CSV3_SEND_ENCRYPT_DATA,
|
|
+ KVM_CSV3_SEND_ENCRYPT_CONTEXT,
|
|
+ KVM_CSV3_RECEIVE_ENCRYPT_DATA,
|
|
+ KVM_CSV3_RECEIVE_ENCRYPT_CONTEXT,
|
|
+
|
|
+ KVM_CSV3_NR_MAX,
|
|
};
|
|
|
|
struct kvm_csv3_launch_encrypt_data {
|
|
@@ -2127,6 +2133,38 @@ struct kvm_csv3_init_data {
|
|
__u64 nodemask;
|
|
};
|
|
|
|
+struct kvm_csv3_send_encrypt_data {
|
|
+ __u64 hdr_uaddr;
|
|
+ __u32 hdr_len;
|
|
+ __u64 guest_addr_data;
|
|
+ __u32 guest_addr_len;
|
|
+ __u64 trans_uaddr;
|
|
+ __u32 trans_len;
|
|
+};
|
|
+
|
|
+struct kvm_csv3_send_encrypt_context {
|
|
+ __u64 hdr_uaddr;
|
|
+ __u32 hdr_len;
|
|
+ __u64 trans_uaddr;
|
|
+ __u32 trans_len;
|
|
+};
|
|
+
|
|
+struct kvm_csv3_receive_encrypt_data {
|
|
+ __u64 hdr_uaddr;
|
|
+ __u32 hdr_len;
|
|
+ __u64 guest_addr_data;
|
|
+ __u32 guest_addr_len;
|
|
+ __u64 trans_uaddr;
|
|
+ __u32 trans_len;
|
|
+};
|
|
+
|
|
+struct kvm_csv3_receive_encrypt_context {
|
|
+ __u64 hdr_uaddr;
|
|
+ __u32 hdr_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)
|
|
--
|
|
2.41.0.windows.1
|
|
|