From a95faafa015e094f7252ef35afb74933d07a9334 Mon Sep 17 00:00:00 2001
From: panpingsheng <panpingsheng@hygon.cn>
Date: Sat, 12 Jun 2021 15:15:29 +0800
Subject: [PATCH 27/29] anolis: target/i386: get/set/migrate GHCB state

GHCB state is necessary to CSV2 guest when migrating to target.

Add GHCB related definition, it also adds corresponding part
to kvm_get/put, and vmstate.

Signed-off-by: hanliyang <hanliyang@hygon.cn>
---
 include/sysemu/kvm.h      |  1 +
 linux-headers/linux/kvm.h |  1 +
 target/i386/cpu.h         |  4 ++++
 target/i386/kvm/kvm.c     | 11 +++++++++++
 target/i386/machine.c     | 24 ++++++++++++++++++++++++
 target/i386/sev.c         | 10 ++++++++++
 6 files changed, 51 insertions(+)

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 7b22aeb6a..9f8099f48 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -46,6 +46,7 @@ extern bool kvm_readonly_mem_allowed;
 extern bool kvm_direct_msi_allowed;
 extern bool kvm_ioeventfd_any_length_allowed;
 extern bool kvm_msi_use_devid;
+extern bool kvm_has_msr_ghcb;
 
 #define kvm_enabled()           (kvm_allowed)
 /**
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index e5d282c75..4a177f81d 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -1154,6 +1154,7 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_S390_PROTECTED_DUMP 217
 #define KVM_CAP_S390_ZPCI_OP 221
 #define KVM_CAP_S390_CPU_TOPOLOGY 222
+#define KVM_CAP_SEV_ES_GHCB 500
 
 #define KVM_EXIT_HYPERCALL_VALID_MASK (1 << KVM_HC_MAP_GPA_RANGE)
 
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 5d2ddd81b..5c476a029 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -505,6 +505,8 @@ typedef enum X86Seg {
 
 #define MSR_VM_HSAVE_PA                 0xc0010117
 
+#define MSR_AMD64_SEV_ES_GHCB           0xc0010130
+
 #define MSR_IA32_XFD                    0x000001c4
 #define MSR_IA32_XFD_ERR                0x000001c5
 
@@ -1732,6 +1734,8 @@ typedef struct CPUX86State {
     TPRAccess tpr_access_type;
 
     unsigned nr_dies;
+
+    uint64_t ghcb_gpa;
 } CPUX86State;
 
 struct kvm_msrs;
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index f0b61ec3c..fb85cc698 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3346,6 +3346,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
         }
     }
 
+    if (kvm_has_msr_ghcb) {
+        kvm_msr_entry_add(cpu, MSR_AMD64_SEV_ES_GHCB, env->ghcb_gpa);
+    }
+
     return kvm_buf_set_msrs(cpu);
 }
 
@@ -3686,6 +3690,10 @@ static int kvm_get_msrs(X86CPU *cpu)
         kvm_msr_entry_add(cpu, MSR_IA32_XFD_ERR, 0);
     }
 
+    if (kvm_has_msr_ghcb) {
+        kvm_msr_entry_add(cpu, MSR_AMD64_SEV_ES_GHCB, 0);
+    }
+
     ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MSRS, cpu->kvm_msr_buf);
     if (ret < 0) {
         return ret;
@@ -3991,6 +3999,9 @@ static int kvm_get_msrs(X86CPU *cpu)
         case MSR_IA32_XFD_ERR:
             env->msr_xfd_err = msrs[i].data;
             break;
+        case MSR_AMD64_SEV_ES_GHCB:
+            env->ghcb_gpa = msrs[i].data;
+            break;
         }
     }
 
diff --git a/target/i386/machine.c b/target/i386/machine.c
index 3977e9d8f..8aa54432d 100644
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -1497,6 +1497,27 @@ static const VMStateDescription vmstate_amx_xtile = {
 };
 #endif
 
+#if defined(CONFIG_KVM) && defined(TARGET_X86_64)
+static bool msr_ghcb_gpa_needed(void *opaque)
+{
+    X86CPU *cpu = opaque;
+    CPUX86State *env = &cpu->env;
+
+    return env->ghcb_gpa != 0;
+}
+
+static const VMStateDescription vmstate_msr_ghcb_gpa = {
+    .name = "cpu/svm_msr_ghcb_gpa",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .needed = msr_ghcb_gpa_needed,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT64(env.ghcb_gpa, X86CPU),
+        VMSTATE_END_OF_LIST()
+    }
+};
+#endif
+
 const VMStateDescription vmstate_x86_cpu = {
     .name = "cpu",
     .version_id = 12,
@@ -1638,6 +1659,9 @@ const VMStateDescription vmstate_x86_cpu = {
         &vmstate_msr_xfd,
 #ifdef TARGET_X86_64
         &vmstate_amx_xtile,
+#endif
+#if defined(CONFIG_KVM) && defined(TARGET_X86_64)
+        &vmstate_msr_ghcb_gpa,
 #endif
         NULL
     }
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 9cdf3e6bf..26b6e84d3 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -215,6 +215,8 @@ static struct ConfidentialGuestMemoryEncryptionOps sev_memory_encryption_ops = {
     .load_incoming_cpu_state = csv_load_incoming_cpu_state,
 };
 
+bool kvm_has_msr_ghcb;
+
 static int
 sev_ioctl(int fd, int cmd, void *data, int *error)
 {
@@ -1174,6 +1176,14 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
     cgs_class->memory_encryption_ops = &sev_memory_encryption_ops;
     QTAILQ_INIT(&sev->shared_regions_list);
 
+    /* Determine whether support MSR_AMD64_SEV_ES_GHCB */
+    if (sev_es_enabled()) {
+        kvm_has_msr_ghcb =
+            kvm_vm_check_extension(kvm_state, KVM_CAP_SEV_ES_GHCB);
+    } else {
+        kvm_has_msr_ghcb = false;
+    }
+
     cgs->ready = true;
 
     return 0;
-- 
2.31.1