[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/21] cputlb: destroy CPUTLB with tlb_destroy
From: |
Alex Bennée |
Subject: |
[PULL 07/21] cputlb: destroy CPUTLB with tlb_destroy |
Date: |
Tue, 16 Jun 2020 13:53:10 +0100 |
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200609200738.445-5-robert.foley@linaro.org>
Message-Id: <20200612190237.30436-8-alex.bennee@linaro.org>
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 8792bea07ab..3cf88272df9 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)
{
}
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index eb2cf9de5e6..1e815357c70 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 9c8f558590d..d6712fba7eb 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) {
--
2.20.1
- [PULL 00/21] testing and plugin updates (tsan, plugins, cross-builds), Alex Bennée, 2020/06/16
- [PULL 03/21] Makefile: remove old compatibility gunks, Alex Bennée, 2020/06/16
- [PULL 01/21] tests/docker: bump fedora to 32, Alex Bennée, 2020/06/16
- [PULL 06/21] thread: add qemu_spin_destroy, Alex Bennée, 2020/06/16
- [PULL 04/21] configure: add --enable-tsan flag + fiber annotations for coroutine-ucontext, Alex Bennée, 2020/06/16
- [PULL 02/21] Makefile: dtc: update, build the libfdt target, Alex Bennée, 2020/06/16
- [PULL 05/21] cpu: convert queued work to a QSIMPLEQ, Alex Bennée, 2020/06/16
- [PULL 07/21] cputlb: destroy CPUTLB with tlb_destroy,
Alex Bennée <=
- [PULL 13/21] include/qemu: Added tsan.h for annotations., Alex Bennée, 2020/06/16
- [PULL 14/21] util: Added tsan annotate for thread name., Alex Bennée, 2020/06/16
- [PULL 08/21] qht: call qemu_spin_destroy for head buckets, Alex Bennée, 2020/06/16
- [PULL 09/21] tcg: call qemu_spin_destroy for tb->jmp_lock, Alex Bennée, 2020/06/16
- [PULL 12/21] tests/docker: Added docker build support for TSan., Alex Bennée, 2020/06/16
- [PULL 10/21] translate-all: call qemu_spin_destroy for PageDesc, Alex Bennée, 2020/06/16
- [PULL 21/21] plugins: new lockstep plugin for debugging TCG changes, Alex Bennée, 2020/06/16
- [PULL 11/21] thread: add tsan annotations to QemuSpin, Alex Bennée, 2020/06/16
- [PULL 19/21] tests/tcg: build plugin list from contents of src directory, Alex Bennée, 2020/06/16
- [PULL 15/21] docs: Added details on TSan to testing.rst, Alex Bennée, 2020/06/16