[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/13] cputlb: destroy CPUTLB with tlb_destroy
From: |
Robert Foley |
Subject: |
[PATCH v2 04/13] cputlb: destroy CPUTLB with tlb_destroy |
Date: |
Fri, 5 Jun 2020 13:34:13 -0400 |
From: "Emilio G. Cota" <cota@braap.org>
I was after adding qemu_spin_destroy calls, but while at
it I noticed that we are leaking some memory.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
accel/tcg/cputlb.c | 15 +++++++++++++++
exec.c | 1 +
include/exec/exec-all.h | 8 ++++++++
3 files changed, 24 insertions(+)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index eb2cf9de5e..1e815357c7 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -270,6 +270,21 @@ void tlb_init(CPUState *cpu)
}
}
+void tlb_destroy(CPUState *cpu)
+{
+ CPUArchState *env = cpu->env_ptr;
+ int i;
+
+ qemu_spin_destroy(&env_tlb(env)->c.lock);
+ for (i = 0; i < NB_MMU_MODES; i++) {
+ CPUTLBDesc *desc = &env_tlb(env)->d[i];
+ CPUTLBDescFast *fast = &env_tlb(env)->f[i];
+
+ g_free(fast->table);
+ g_free(desc->iotlb);
+ }
+}
+
/* flush_all_helper: run fn across all cpus
*
* If the wait flag is set then the src cpu's helper will be queued as
diff --git a/exec.c b/exec.c
index 5162f0d12f..da3d60b034 100644
--- a/exec.c
+++ b/exec.c
@@ -892,6 +892,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
+ tlb_destroy(cpu);
cpu_list_remove(cpu);
if (cc->vmsd != NULL) {
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 8792bea07a..3cf88272df 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -124,6 +124,11 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
* @cpu: CPU whose TLB should be initialized
*/
void tlb_init(CPUState *cpu);
+/**
+ * tlb_destroy - destroy a CPU's TLB
+ * @cpu: CPU whose TLB should be destroyed
+ */
+void tlb_destroy(CPUState *cpu);
/**
* tlb_flush_page:
* @cpu: CPU whose TLB should be flushed
@@ -284,6 +289,9 @@ void tlb_set_page(CPUState *cpu, target_ulong vaddr,
static inline void tlb_init(CPUState *cpu)
{
}
+static inline void tlb_destroy(CPUState *cpu)
+{
+}
static inline void tlb_flush_page(CPUState *cpu, target_ulong addr)
{
}
--
2.17.1
- [PATCH v2 00/13] Add Thread Sanitizer support to QEMU, Robert Foley, 2020/06/05
- [PATCH v2 01/13] configure: add --enable-tsan flag + fiber annotations for coroutine-ucontext, Robert Foley, 2020/06/05
- [PATCH v2 02/13] cpu: convert queued work to a QSIMPLEQ, Robert Foley, 2020/06/05
- [PATCH v2 03/13] thread: add qemu_spin_destroy, Robert Foley, 2020/06/05
- [PATCH v2 04/13] cputlb: destroy CPUTLB with tlb_destroy,
Robert Foley <=
- [PATCH v2 05/13] qht: call qemu_spin_destroy for head buckets, Robert Foley, 2020/06/05
- [PATCH v2 06/13] tcg: call qemu_spin_destroy for tb->jmp_lock, Robert Foley, 2020/06/05
- [PATCH v2 07/13] translate-all: call qemu_spin_destroy for PageDesc, Robert Foley, 2020/06/05
- [PATCH v2 08/13] thread: add tsan annotations to QemuSpin, Robert Foley, 2020/06/05
- [PATCH v2 09/13] tests/docker: Added docker build support for TSan., Robert Foley, 2020/06/05
- [PATCH v2 10/13] include/qemu: Added tsan.h for annotations., Robert Foley, 2020/06/05