[Qemu-devel] [PATCH 0/2]
cover [Qemu-devel] [PATCH 0/2]
Fix a bug introduced with dynamic TLB sizing -- we forgot to account for possible TLB resizes during tlb_fill().
Max reported the bug and provided a reproducer here:
https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg02283.html
Thanks,
Emilio
PATCH 1/2 exec-all: document that tlb_fill can trigger a TLB resize
--- include/exec/exec-all.h | 5 +++++ 1 file changed, 5 insertions(+)
include/exec/exec-all.h +5 -0
@@ -475,6 +475,11 @@ static inline void assert_no_pages_locked(void)struct MemoryRegionSection *iotlb_to_section (CPUState *cpu,hwaddr index,MemTxAttrs attrs); +/* +* Note: tlb_fill() can trigger a resize of the TLB. This means that all of the +* caller's prior references to the TLB table (e.g. CPUTLBEntry pointers) must +* be discarded and looked up again (e.g. via tlb_entry()). +*/ void tlb_fill (CPUState *cpu,target_ulong addr,int size,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH 1/2] exec-all: document that tlb_fill can trigger a TLB resize
Quoted 1 line · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- include/exec/exec-all.h | 5 +++++ 1 file changed, 5 insertions(+)include/exec/exec-all.h +0
-0
include/exec/exec-all.h static inline void assert_no_pages_locked(void) · line 484
Quoted 10 lines
include/exec/exec-all.h +5
-0@@ -475,6 +475,11 @@ static inline void assert_no_pages_locked(void)struct MemoryRegionSection *iotlb_to_section (CPUState *cpu,hwaddr index,MemTxAttrs attrs); +/* +* Note: tlb_fill() can trigger a resize of the TLB. This means that all of the +* caller's prior references to the TLB table (e.g. CPUTLBEntry pointers) must +* be discarded and looked up again (e.g. via tlb_entry()). +*/ void tlb_fill (CPUState *cpu,target_ulong addr,int size,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr);
--
Alex Bennée
PATCH 2/2 cputlb: update TLB entry/index after tlb_fill
In reply to Emilio G. CotaWe are failing to take into account that tlb_fill() can cause a TLB resize, which renders prior TLB entry pointers/indices stale. Fix it by re-doing the TLB entry lookups immediately after tlb_fill.
--- accel/tcg/softmmu_template.h | 8 ++++++++ accel/tcg/cputlb.c | 4 ++++ 2 files changed, 12 insertions(+)
accel/tcg/softmmu_template.h +8 -0
@@ -129,6 +129,8 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr,if (!VICTIM_TLB_HIT (ADDR_READ , addr)) {tlb_fill (ENV_GET_CPU (env), addr,DATA_SIZE ,READ_ACCESS_TYPE , mmu_idx, retaddr); + index =tlb_index (env, mmu_idx, addr); + entry =tlb_entry (env, mmu_idx, addr); } tlb_addr = entry->ADDR_READ; }
@@ -198,6 +200,8 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr,if (!VICTIM_TLB_HIT (ADDR_READ , addr)) {tlb_fill (ENV_GET_CPU (env), addr,DATA_SIZE ,READ_ACCESS_TYPE , mmu_idx, retaddr); + index =tlb_index (env, mmu_idx, addr); + entry =tlb_entry (env, mmu_idx, addr); } tlb_addr = entry->ADDR_READ; }
@@ -294,6 +298,8 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,if (!VICTIM_TLB_HIT (addr_write, addr)) {tlb_fill (ENV_GET_CPU (env), addr,DATA_SIZE ,MMU_DATA_STORE , mmu_idx, retaddr); + index =tlb_index (env, mmu_idx, addr); + entry =tlb_entry (env, mmu_idx, addr); } tlb_addr =tlb_addr_write (entry) & ~TLB_INVALID_MASK ; }
@@ -372,6 +378,8 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,if (!VICTIM_TLB_HIT (addr_write, addr)) {tlb_fill (ENV_GET_CPU (env), addr,DATA_SIZE ,MMU_DATA_STORE , mmu_idx, retaddr); + index =tlb_index (env, mmu_idx, addr); + entry =tlb_entry (env, mmu_idx, addr); } tlb_addr =tlb_addr_write (entry) & ~TLB_INVALID_MASK ; }
accel/tcg/cputlb.c +4 -0
@@ -1045,6 +1045,8 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr)if (unlikely (!tlb_hit (entry->addr_code, addr))) {if (!VICTIM_TLB_HIT (addr_code, addr)) {tlb_fill (ENV_GET_CPU (env), addr,0 ,MMU_INST_FETCH , mmu_idx,0 ); + index =tlb_index (env, mmu_idx, addr); + entry =tlb_entry (env, mmu_idx, addr); }assert (tlb_hit (entry->addr_code, addr)); }
@@ -1125,6 +1127,8 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr,if (!VICTIM_TLB_HIT (addr_write, addr)) {tlb_fill (ENV_GET_CPU (env), addr,1 << s_bits,MMU_DATA_STORE , mmu_idx, retaddr); + index =tlb_index (env, mmu_idx, addr); + tlbe =tlb_entry (env, mmu_idx, addr); } tlb_addr =tlb_addr_write (tlbe) & ~TLB_INVALID_MASK ; }
Signature · 1 line
2.17.1
Quoted 5 lines · Emilio G. Cota
Fix a bug introduced with dynamic TLB sizing -- we forgot to account for possible TLB resizes during
tlb_fill().Max reported the bug and provided a reproducer here:
https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg02283.html
Thanks, queued.
r~