OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

accel/tcg: Use QEMU_IOTHREAD_LOCK_GUARD in io_readx/io_writex

Browse Source 
Narrow the scope of the lock to the actual read/write,
moving the cpu_transation_failed call outside the lock.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-11-17 19:59:16 -08:00
parent 50c9c512ac
commit 61b59fb269
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
accel/tcg/cputlb.c
View File

@ -1356,7 +1356,6 @@ static uint64_t io_readx(CPUArchState *env, CPUTLBEntryFull *full,
MemoryRegionSection *section; MemoryRegionSection *section;
MemoryRegion *mr; MemoryRegion *mr;
uint64_t val; uint64_t val;
bool locked = false;
MemTxResult r; MemTxResult r;
section = iotlb_to_section(cpu, full->xlat_section, full->attrs); section = iotlb_to_section(cpu, full->xlat_section, full->attrs);
@ -1367,11 +1366,11 @@ static uint64_t io_readx(CPUArchState *env, CPUTLBEntryFull *full,
cpu_io_recompile(cpu, retaddr); cpu_io_recompile(cpu, retaddr);
} }
if (!qemu_mutex_iothread_locked()) { {
qemu_mutex_lock_iothread(); QEMU_IOTHREAD_LOCK_GUARD();
locked = true; r = memory_region_dispatch_read(mr, mr_offset, &val, op, full->attrs);
} }
r = memory_region_dispatch_read(mr, mr_offset, &val, op, full->attrs);
if (r != MEMTX_OK) { if (r != MEMTX_OK) {
hwaddr physaddr = mr_offset + hwaddr physaddr = mr_offset +
section->offset_within_address_space - section->offset_within_address_space -
@ -1380,10 +1379,6 @@ static uint64_t io_readx(CPUArchState *env, CPUTLBEntryFull *full,
cpu_transaction_failed(cpu, physaddr, addr, memop_size(op), access_type, cpu_transaction_failed(cpu, physaddr, addr, memop_size(op), access_type,
mmu_idx, full->attrs, r, retaddr); mmu_idx, full->attrs, r, retaddr);
} }
if (locked) {
qemu_mutex_unlock_iothread();
}
return val; return val;
} }
@ -1410,7 +1405,6 @@ static void io_writex(CPUArchState *env, CPUTLBEntryFull *full,
hwaddr mr_offset; hwaddr mr_offset;
MemoryRegionSection *section; MemoryRegionSection *section;
MemoryRegion *mr; MemoryRegion *mr;
bool locked = false;
MemTxResult r; MemTxResult r;
section = iotlb_to_section(cpu, full->xlat_section, full->attrs); section = iotlb_to_section(cpu, full->xlat_section, full->attrs);
@ -1427,11 +1421,11 @@ static void io_writex(CPUArchState *env, CPUTLBEntryFull *full,
*/ */
save_iotlb_data(cpu, section, mr_offset); save_iotlb_data(cpu, section, mr_offset);
if (!qemu_mutex_iothread_locked()) { {
qemu_mutex_lock_iothread(); QEMU_IOTHREAD_LOCK_GUARD();
locked = true; r = memory_region_dispatch_write(mr, mr_offset, val, op, full->attrs);
} }
r = memory_region_dispatch_write(mr, mr_offset, val, op, full->attrs);
if (r != MEMTX_OK) { if (r != MEMTX_OK) {
hwaddr physaddr = mr_offset + hwaddr physaddr = mr_offset +
section->offset_within_address_space - section->offset_within_address_space -
@ -1441,9 +1435,6 @@ static void io_writex(CPUArchState *env, CPUTLBEntryFull *full,
MMU_DATA_STORE, mmu_idx, full->attrs, r, MMU_DATA_STORE, mmu_idx, full->attrs, r,
retaddr); retaddr);
} }
if (locked) {
qemu_mutex_unlock_iothread();
}
} }
static inline target_ulong tlb_read_ofs(CPUTLBEntry *entry, size_t ofs) static inline target_ulong tlb_read_ofs(CPUTLBEntry *entry, size_t ofs)