From e7dc49f6bf6fd242b5b7a83bc270664a1ca45879 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Mon, 22 Jul 2019 18:22:08 +0100

Subject: [PATCH 27/39] KVM: Introduce kvm_arch_destroy_vcpu()

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20190722182220.19374-7-pbonzini@redhat.com>

Patchwork-id: 89623

O-Subject: [RHEL-8.1.0 PATCH qemu-kvm v3 06/18] KVM: Introduce kvm_arch_destroy_vcpu()

Bugzilla: 1689269

RH-Acked-by: Peter Xu <zhexu@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

From: Liran Alon <liran.alon@oracle.com>

Simiar to how kvm_init_vcpu() calls kvm_arch_init_vcpu() to perform

arch-dependent initialisation, introduce kvm_arch_destroy_vcpu()

to be called from kvm_destroy_vcpu() to perform arch-dependent

destruction.

This was added because some architectures (Such as i386)

currently do not free memory that it have allocated in

kvm_arch_init_vcpu().

Suggested-by: Maran Wilson <maran.wilson@oracle.com>

Reviewed-by: Maran Wilson <maran.wilson@oracle.com>

Signed-off-by: Liran Alon <liran.alon@oracle.com>

Message-Id: <20190619162140.133674-3-liran.alon@oracle.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit b1115c99919cf158bb859865f14c3198a0e6f679)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 accel/kvm/kvm-all.c  |  5 +++++

 include/sysemu/kvm.h |  1 +

 target/arm/kvm32.c   |  5 +++++

 target/arm/kvm64.c   |  5 +++++

 target/i386/kvm.c    | 12 ++++++++++++

 target/mips/kvm.c    |  5 +++++

 target/ppc/kvm.c     |  5 +++++

 target/s390x/kvm.c   | 10 ++++++++++

 8 files changed, 48 insertions(+)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c

index 3a7c8a3..a939b26 100644

--- a/accel/kvm/kvm-all.c

+++ b/accel/kvm/kvm-all.c

@@ -290,6 +290,11 @@ int kvm_destroy_vcpu(CPUState *cpu)

     DPRINTF("kvm_destroy_vcpu\n");

+    ret = kvm_arch_destroy_vcpu(cpu);

+    if (ret < 0) {

+        goto err;

+    }

+

     mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);

     if (mmap_size < 0) {

         ret = mmap_size;

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h

index 3d8f294..a5a6dff 100644

--- a/include/sysemu/kvm.h

+++ b/include/sysemu/kvm.h

@@ -372,6 +372,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level);

 int kvm_arch_init(MachineState *ms, KVMState *s);

 int kvm_arch_init_vcpu(CPUState *cpu);

+int kvm_arch_destroy_vcpu(CPUState *cpu);

 bool kvm_vcpu_id_is_valid(int vcpu_id);

diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c

index 1740cda..056f016 100644

--- a/target/arm/kvm32.c

+++ b/target/arm/kvm32.c

@@ -237,6 +237,11 @@ int kvm_arch_init_vcpu(CPUState *cs)

     return kvm_arm_init_cpreg_list(cpu);

 }

+int kvm_arch_destroy_vcpu(CPUState *cs)

+{

+	return 0;

+}

+

 typedef struct Reg {

     uint64_t id;

     int offset;

diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c

index e0b8246..c9c761e 100644

--- a/target/arm/kvm64.c

+++ b/target/arm/kvm64.c

@@ -549,6 +549,11 @@ int kvm_arch_init_vcpu(CPUState *cs)

     return kvm_arm_init_cpreg_list(cpu);

 }

+int kvm_arch_destroy_vcpu(CPUState *cs)

+{

+    return 0;

+}

+

 bool kvm_arm_reg_syncs_via_cpreg_list(uint64_t regidx)

 {

     /* Return true if the regidx is a register we should synchronize

diff --git a/target/i386/kvm.c b/target/i386/kvm.c

index 8e861a1..305809f 100644

--- a/target/i386/kvm.c

+++ b/target/i386/kvm.c

@@ -1196,6 +1196,18 @@ int kvm_arch_init_vcpu(CPUState *cs)

     return r;

 }

+int kvm_arch_destroy_vcpu(CPUState *cs)

+{

+    X86CPU *cpu = X86_CPU(cs);

+

+    if (cpu->kvm_msr_buf) {

+        g_free(cpu->kvm_msr_buf);

+        cpu->kvm_msr_buf = NULL;

+    }

+

+    return 0;

+}

+

 void kvm_arch_reset_vcpu(X86CPU *cpu)

 {

     CPUX86State *env = &cpu->env;

diff --git a/target/mips/kvm.c b/target/mips/kvm.c

index 8e72850..938f8f1 100644

--- a/target/mips/kvm.c

+++ b/target/mips/kvm.c

@@ -91,6 +91,11 @@ int kvm_arch_init_vcpu(CPUState *cs)

     return ret;

 }

+int kvm_arch_destroy_vcpu(CPUState *cs)

+{

+    return 0;

+}

+

 void kvm_mips_reset_vcpu(MIPSCPU *cpu)

 {

     CPUMIPSState *env = &cpu->env;

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c

index 058dcbe..b9858fa 100644

--- a/target/ppc/kvm.c

+++ b/target/ppc/kvm.c

@@ -607,6 +607,11 @@ int kvm_arch_init_vcpu(CPUState *cs)

     return ret;

 }

+int kvm_arch_destroy_vcpu(CPUState *cs)

+{

+    return 0;

+}

+

 static void kvm_sw_tlb_put(PowerPCCPU *cpu)

 {

     CPUPPCState *env = &cpu->env;

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c

index 1d6cc33..0814333 100644

--- a/target/s390x/kvm.c

+++ b/target/s390x/kvm.c

@@ -370,6 +370,16 @@ int kvm_arch_init_vcpu(CPUState *cs)

     return 0;

 }

+int kvm_arch_destroy_vcpu(CPUState *cs)

+{

+    S390CPU *cpu = S390_CPU(cs);

+

+    g_free(cpu->irqstate);

+    cpu->irqstate = NULL;

+

+    return 0;

+}

+

 void kvm_s390_reset_vcpu(S390CPU *cpu)

 {

     CPUState *cs = CPU(cpu);

-- 

1.8.3.1