Patchwork Refactor flush of per-CPU virtual TB cache

login
register
mail settings
Submitter =?utf-8?Q?Llu=C3=ADs?=
Date Oct. 19, 2010, 7:57 p.m.
Message ID <878w1qf5cc.fsf@ginnungagap.bsc.es>
Download mbox | patch
Permalink /patch/68904/
State New
Headers show

Comments

=?utf-8?Q?Llu=C3=ADs?= - Oct. 19, 2010, 7:57 p.m.
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
 exec-all.h |    2 ++
 exec.c     |    9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
Nathan Froyd - Oct. 22, 2010, 6:53 p.m.
On Tue, Oct 19, 2010 at 09:57:13PM +0200, Lluís wrote:
> --- a/exec.c
> +++ b/exec.c
> @@ -688,6 +688,11 @@ static void page_flush_tb(void)
>      }
>  }
>  
> +void tb_flush_jmp_cache (CPUState * env)
> +{
> +    memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
> +}
> +

This is only used in this file.  Why not make it static?

-Nathan
=?utf-8?Q?Llu=C3=ADs?= - Oct. 22, 2010, 7:34 p.m.
Nathan Froyd writes:

> On Tue, Oct 19, 2010 at 09:57:13PM +0200, Lluís wrote:
>> --- a/exec.c
>> +++ b/exec.c
>> @@ -688,6 +688,11 @@ static void page_flush_tb(void)
>> }
>> }
>> 
>> +void tb_flush_jmp_cache (CPUState * env)
>> +{
>> +    memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
>> +}
>> +

> This is only used in this file.  Why not make it static?

I use it later on the instrumentation set of patches. Which reminds me
that I should have defined it as "inline".

Lluis

Patch

diff --git a/exec-all.h b/exec-all.h
index 3a53fe6..2ae09c5 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -182,6 +182,8 @@  static inline unsigned int tb_phys_hash_func(tb_page_addr_t pc)
 
 TranslationBlock *tb_alloc(target_ulong pc);
 void tb_free(TranslationBlock *tb);
+/** Flush the per-CPU virtual translation block cache. */
+void tb_flush_jmp_cache(CPUState *env);
 void tb_flush(CPUState *env);
 void tb_link_page(TranslationBlock *tb,
                   tb_page_addr_t phys_pc, tb_page_addr_t phys_page2);
diff --git a/exec.c b/exec.c
index 1fbe91c..516960a 100644
--- a/exec.c
+++ b/exec.c
@@ -688,6 +688,11 @@  static void page_flush_tb(void)
     }
 }
 
+void tb_flush_jmp_cache (CPUState * env)
+{
+    memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
+}
+
 /* flush all the translation blocks */
 /* XXX: tb_flush is currently not thread safe */
 void tb_flush(CPUState *env1)
@@ -705,7 +710,7 @@  void tb_flush(CPUState *env1)
     nb_tbs = 0;
 
     for(env = first_cpu; env != NULL; env = env->next_cpu) {
-        memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
+        tb_flush_jmp_cache(env);
     }
 
     memset (tb_phys_hash, 0, CODE_GEN_PHYS_HASH_SIZE * sizeof (void *));
@@ -1941,7 +1946,7 @@  void tlb_flush(CPUState *env, int flush_global)
         }
     }
 
-    memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
+    tb_flush_jmp_cache(env);
 
     env->tlb_flush_addr = -1;
     env->tlb_flush_mask = 0;