cputlb: Use memset when flushing entries
PATCH 1/2 cputlb: Use memset when flushing entries
The size of tlb_table is 4k on a 64-bit host. For overwriting memory at this size, cacheline tricks can help.
--- cputlb.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
cputlb.c +2 -17
@@ -33,13 +33,6 @@/* statistics */ int tlb_flush_count; -static const CPUTLBEntry s_cputlb_empty_entry = { - .addr_read =-1 , - .addr_write =-1 , - .addr_code =-1 , - .addend =-1 , -}; -/* NOTE: * If flush_global is true (the usual case), flush all tlb entries. * If flush_global is false, flush (at least) all tlb entries not
@@ -55,7 +48,6 @@ static const CPUTLBEntry s_cputlb_empty_entry = {void tlb_flush (CPUArchState *env,int flush_global) {CPUState *cpu =ENV_GET_CPU (env); -int i;#if defined(DEBUG_TLB )printf ("tlb_flush:\n" );
@@ -64,14 +56,7 @@ void tlb_flush(CPUArchState *env, int flush_global)links while we are modifying them */ cpu->current_tb =NULL ; -for (i =0 ; i <CPU_TLB_SIZE ; i++) { -int mmu_idx; - -for (mmu_idx =0 ; mmu_idx <NB_MMU_MODES ; mmu_idx++) { - env->tlb_table[mmu_idx][i] = s_cputlb_empty_entry; - } - } - +memset (env->tlb_table,-1 ,sizeof (env->tlb_table));memset (env->tb_jmp_cache,0 ,TB_JMP_CACHE_SIZE *sizeof (void *)); env->tlb_flush_addr =-1 ;
@@ -87,7 +72,7 @@ static inline void tlb_flush_entry(CPUTLBEntry *tlb_entry, target_ulong addr) (TARGET_PAGE_MASK | TLB_INVALID_MASK)) || addr == (tlb_entry->addr_code & (TARGET_PAGE_MASK | TLB_INVALID_MASK))) { - *tlb_entry = s_cputlb_empty_entry; +memset (tlb_entry,-1 ,sizeof (*tlb_entry)); } }
Signature · 1 line
1.8.3.1
PATCH 2/2 cputlb: Tidy memset of arrays
Don't duplicate the array length computation in the memset when plain sizeof can produce the correct results.
--- cputlb.c | 2 +- translate-all.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
cputlb.c +1 -1
@@ -57,7 +57,7 @@ void tlb_flush(CPUArchState *env, int flush_global) cpu->current_tb =NULL ;memset (env->tlb_table,-1 ,sizeof (env->tlb_table)); -memset (env->tb_jmp_cache,0 ,TB_JMP_CACHE_SIZE *sizeof (void *)); +memset (env->tb_jmp_cache,0 ,sizeof (env->tb_jmp_cache)); env->tlb_flush_addr =-1 ; env->tlb_flush_mask =0 ;
translate-all.c +2 -3
@@ -699,11 +699,10 @@ void tb_flush(CPUArchState *env1)CPU_FOREACH (cpu) {CPUArchState *env = cpu->env_ptr; -memset (env->tb_jmp_cache,0 ,TB_JMP_CACHE_SIZE *sizeof (void *)); +memset (env->tb_jmp_cache,0 ,sizeof (env->tb_jmp_cache)); } -memset (tcg_ctx.tb_ctx.tb_phys_hash,0 , -CODE_GEN_PHYS_HASH_SIZE *sizeof (void *)); +memset (tcg_ctx.tb_ctx.tb_phys_hash,0 ,sizeof (tcg_ctx.tb_ctx.tb_phys_hash));page_flush_tb (); tcg_ctx.code_gen_ptr = tcg_ctx.code_gen_buffer;
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 2/2] cputlb: Tidy memset of arrays
Quoted 30 lines · Richard Henderson
Don't duplicate the array length computation in the memset when plain sizeof can produce the correct results.
Signed-off-by Richard Henderson <[email protected]>--- cputlb.c | 2 +- translate-all.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)cputlb.c +1
-1@@ -57,7 +57,7 @@ void tlb_flush(CPUArchState *env, int flush_global) cpu->current_tb =NULL ;memset (env->tlb_table,-1 ,sizeof (env->tlb_table)); -memset (env->tb_jmp_cache,0 ,TB_JMP_CACHE_SIZE *sizeof (void *)); +memset (env->tb_jmp_cache,0 ,sizeof (env->tb_jmp_cache)); env->tlb_flush_addr =-1 ; env->tlb_flush_mask =0 ;translate-all.c +0
-0@@ -699,11 +699,10 @@ void tb_flush(CPUArchState *env1)CPU_FOREACH (cpu) {CPUArchState *env = cpu->env_ptr;
translate-all.c void tb_flush(CPUArchState *env1) · line 708
Quoted 10 lines
translate-all.c +2
-3-memset (env->tb_jmp_cache,0 ,TB_JMP_CACHE_SIZE *sizeof (void *)); +memset (env->tb_jmp_cache,0 ,sizeof (env->tb_jmp_cache)); } -memset (tcg_ctx.tb_ctx.tb_phys_hash,0 , -CODE_GEN_PHYS_HASH_SIZE *sizeof (void *)); +memset (tcg_ctx.tb_ctx.tb_phys_hash,0 ,sizeof (tcg_ctx.tb_ctx.tb_phys_hash));page_flush_tb (); tcg_ctx.code_gen_ptr = tcg_ctx.code_gen_buffer;
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Quoted 51 lines · Richard Henderson
The size of
tlb_tableis 4k on a 64-bit host. For overwriting memory at this size, cacheline tricks can help.Signed-off-by Richard Henderson <[email protected]>--- cputlb.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)cputlb.c +1
-16@@ -33,13 +33,6 @@/* statistics */ int tlb_flush_count; -static const CPUTLBEntry s_cputlb_empty_entry = { - .addr_read =-1 , - .addr_write =-1 , - .addr_code =-1 , - .addend =-1 , -}; -/* NOTE: * If flush_global is true (the usual case), flush all tlb entries. * If flush_global is false, flush (at least) all tlb entries not @@ -55,7 +48,6 @@ static const CPUTLBEntry s_cputlb_empty_entry = {void tlb_flush (CPUArchState *env,int flush_global) {CPUState *cpu =ENV_GET_CPU (env); -int i;#if defined(DEBUG_TLB )printf ("tlb_flush:\n" );@@ -64,14 +56,7 @@ void tlb_flush(CPUArchState *env, int flush_global)links while we are modifying them */ cpu->current_tb =NULL ; -for (i =0 ; i <CPU_TLB_SIZE ; i++) { -int mmu_idx; - -for (mmu_idx =0 ; mmu_idx <NB_MMU_MODES ; mmu_idx++) { - env->tlb_table[mmu_idx][i] = s_cputlb_empty_entry; - } - } - +memset (env->tlb_table,-1 ,sizeof (env->tlb_table));memset (env->tb_jmp_cache,0 ,TB_JMP_CACHE_SIZE *sizeof (void *)); env->tlb_flush_addr =-1 ;
cputlb.c static inline void tlb_flush_entry(CPUTLBEntry *tlb_entry, target_ulong addr) · line 77
Quoted 7 lines
cputlb.c +1
-1@@ -87,7 +72,7 @@ static inline void tlb_flush_entry(CPUTLBEntry *tlb_entry, target_ulong addr) (TARGET_PAGE_MASK | TLB_INVALID_MASK)) || addr == (tlb_entry->addr_code & (TARGET_PAGE_MASK | TLB_INVALID_MASK))) { - *tlb_entry = s_cputlb_empty_entry; +memset (tlb_entry,-1 ,sizeof (*tlb_entry)); } }
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Am 22.12.2013 19:04, schrieb Aurelien Jarno:
Quoted 8 lines · Richard Henderson
Quoted 7 lines
The size of
tlb_tableis 4k on a 64-bit host. For overwriting memory at this size, cacheline tricks can help.Signed-off-by Richard Henderson <[email protected]>--- cputlb.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
[...]
Quoted 2 lines
Reviewed-by Aurelien Jarno <[email protected]>
Don't spot a matching cover letter - thanks, applied both to qom-cpu:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg