ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accel/tcg: Remove {encode,decode}_pbm_to_runon 

We will not be able to fit address + length into a 64-bit packet.
Drop this optimization before re-organizing this code.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210509151618.2331764-10-f4bug@amsat.org
Message-Id: <20210508201640.1045808-1-richard.henderson@linaro.org>
[PMD: Split from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMM: Moved patch earlier in the series]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-09 17:16:18 +02:00 committed by Peter Maydell
parent 3960a59f8d
commit d34e4d1afa
1 changed files with 20 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
accel/tcg/cputlb.c
View File

@ -789,34 +789,6 @@ tlb_flush_page_bits_by_mmuidx_async_0(CPUState *cpu,
} }
} }
static bool encode_pbm_to_runon(run_on_cpu_data *out,
TLBFlushRangeData d)
{
/* We need 6 bits to hold to hold @bits up to 63. */
if (d.idxmap <= MAKE_64BIT_MASK(0, TARGET_PAGE_BITS - 6)) {
*out = RUN_ON_CPU_TARGET_PTR(d.addr | (d.idxmap << 6) | d.bits);
return true;
}
return false;
}
static TLBFlushRangeData
decode_runon_to_pbm(run_on_cpu_data data)
{
target_ulong addr_map_bits = (target_ulong) data.target_ptr;
return (TLBFlushRangeData){
.addr = addr_map_bits & TARGET_PAGE_MASK,
.idxmap = (addr_map_bits & ~TARGET_PAGE_MASK) >> 6,
.bits = addr_map_bits & 0x3f
};
}
static void tlb_flush_page_bits_by_mmuidx_async_1(CPUState *cpu,
run_on_cpu_data runon)
{
tlb_flush_page_bits_by_mmuidx_async_0(cpu, decode_runon_to_pbm(runon));
}
static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu, static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu,
run_on_cpu_data data) run_on_cpu_data data)
{ {
@ -829,7 +801,6 @@ void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr,
uint16_t idxmap, unsigned bits) uint16_t idxmap, unsigned bits)
{ {
TLBFlushRangeData d; TLBFlushRangeData d;
run_on_cpu_data runon;
/* If all bits are significant, this devolves to tlb_flush_page. */ /* If all bits are significant, this devolves to tlb_flush_page. */
if (bits >= TARGET_LONG_BITS) { if (bits >= TARGET_LONG_BITS) {
@ -850,8 +821,6 @@ void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr,
if (qemu_cpu_is_self(cpu)) { if (qemu_cpu_is_self(cpu)) {
tlb_flush_page_bits_by_mmuidx_async_0(cpu, d); tlb_flush_page_bits_by_mmuidx_async_0(cpu, d);
} else if (encode_pbm_to_runon(&runon, d)) {
async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_1, runon);
} else { } else {
/* Otherwise allocate a structure, freed by the worker. */ /* Otherwise allocate a structure, freed by the worker. */
TLBFlushRangeData *p = g_memdup(&d, sizeof(d)); TLBFlushRangeData *p = g_memdup(&d, sizeof(d));
@ -866,7 +835,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus(CPUState *src_cpu,
unsigned bits) unsigned bits)
{ {
TLBFlushRangeData d; TLBFlushRangeData d;
run_on_cpu_data runon; CPUState *dst_cpu;
/* If all bits are significant, this devolves to tlb_flush_page. */ /* If all bits are significant, this devolves to tlb_flush_page. */
if (bits >= TARGET_LONG_BITS) { if (bits >= TARGET_LONG_BITS) {
@ -885,19 +854,13 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus(CPUState *src_cpu,
d.idxmap = idxmap; d.idxmap = idxmap;
d.bits = bits; d.bits = bits;
if (encode_pbm_to_runon(&runon, d)) { /* Allocate a separate data block for each destination cpu. */
flush_all_helper(src_cpu, tlb_flush_page_bits_by_mmuidx_async_1, runon); CPU_FOREACH(dst_cpu) {
} else { if (dst_cpu != src_cpu) {
CPUState *dst_cpu; TLBFlushRangeData *p = g_memdup(&d, sizeof(d));
async_run_on_cpu(dst_cpu,
/* Allocate a separate data block for each destination cpu. */ tlb_flush_page_bits_by_mmuidx_async_2,
CPU_FOREACH(dst_cpu) { RUN_ON_CPU_HOST_PTR(p));
if (dst_cpu != src_cpu) {
TLBFlushRangeData *p = g_memdup(&d, sizeof(d));
async_run_on_cpu(dst_cpu,
tlb_flush_page_bits_by_mmuidx_async_2,
RUN_ON_CPU_HOST_PTR(p));
}
} }
} }
@ -909,8 +872,8 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
uint16_t idxmap, uint16_t idxmap,
unsigned bits) unsigned bits)
{ {
TLBFlushRangeData d; TLBFlushRangeData d, *p;
run_on_cpu_data runon; CPUState *dst_cpu;
/* If all bits are significant, this devolves to tlb_flush_page. */ /* If all bits are significant, this devolves to tlb_flush_page. */
if (bits >= TARGET_LONG_BITS) { if (bits >= TARGET_LONG_BITS) {
@ -929,27 +892,18 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
d.idxmap = idxmap; d.idxmap = idxmap;
d.bits = bits; d.bits = bits;
if (encode_pbm_to_runon(&runon, d)) { /* Allocate a separate data block for each destination cpu. */
flush_all_helper(src_cpu, tlb_flush_page_bits_by_mmuidx_async_1, runon); CPU_FOREACH(dst_cpu) {
async_safe_run_on_cpu(src_cpu, tlb_flush_page_bits_by_mmuidx_async_1, if (dst_cpu != src_cpu) {
runon); p = g_memdup(&d, sizeof(d));
} else { async_run_on_cpu(dst_cpu, tlb_flush_page_bits_by_mmuidx_async_2,
CPUState *dst_cpu; RUN_ON_CPU_HOST_PTR(p));
TLBFlushRangeData *p;
/* Allocate a separate data block for each destination cpu. */
CPU_FOREACH(dst_cpu) {
if (dst_cpu != src_cpu) {
p = g_memdup(&d, sizeof(d));
async_run_on_cpu(dst_cpu, tlb_flush_page_bits_by_mmuidx_async_2,
RUN_ON_CPU_HOST_PTR(p));
}
} }
p = g_memdup(&d, sizeof(d));
async_safe_run_on_cpu(src_cpu, tlb_flush_page_bits_by_mmuidx_async_2,
RUN_ON_CPU_HOST_PTR(p));
} }
p = g_memdup(&d, sizeof(d));
async_safe_run_on_cpu(src_cpu, tlb_flush_page_bits_by_mmuidx_async_2,
RUN_ON_CPU_HOST_PTR(p));
} }
/* update the TLBs so that writes to code in the virtual page 'addr' /* update the TLBs so that writes to code in the virtual page 'addr'