| Message ID | 20190617175658.135869-2-liran.alon@oracle.com |
|---|---|
| State | New |
| Headers | show |
| Series | : KVM: i386: Add support for save and restore of nested state | expand |
On 6/17/2019 10:56 AM, Liran Alon wrote: > 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> > Signed-off-by: Liran Alon <liran.alon@oracle.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 524c4ddfbd0f..59a3aa3a40da 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -292,6 +292,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 a6d1cd190fed..64f55e519df7 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -371,6 +371,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 4e54e372a668..51f78f722b18 100644 > --- a/target/arm/kvm32.c > +++ b/target/arm/kvm32.c > @@ -240,6 +240,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 998d21f399f4..22d19c9aec6f 100644 > --- a/target/arm/kvm64.c > +++ b/target/arm/kvm64.c > @@ -654,6 +654,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 3b29ce5c0d08..29889aa6b001 100644 > --- a/target/i386/kvm.c > +++ b/target/i386/kvm.c > @@ -1349,6 +1349,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 8e72850962e1..938f8f144b74 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 3bf0a46c3352..1967ccc51791 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -521,6 +521,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 e5e2b691f253..c2747c31649b 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -368,6 +368,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); Reviewed-by: Maran Wilson <maran.wilson@oracle.com> Thanks, -Maran
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 524c4ddfbd0f..59a3aa3a40da 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -292,6 +292,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 a6d1cd190fed..64f55e519df7 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -371,6 +371,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 4e54e372a668..51f78f722b18 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -240,6 +240,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 998d21f399f4..22d19c9aec6f 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -654,6 +654,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 3b29ce5c0d08..29889aa6b001 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1349,6 +1349,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 8e72850962e1..938f8f144b74 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 3bf0a46c3352..1967ccc51791 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -521,6 +521,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 e5e2b691f253..c2747c31649b 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -368,6 +368,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);
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> Signed-off-by: Liran Alon <liran.alon@oracle.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(+)