Commit 5a477a78 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging 



# gpg: Signature made Mon 17 Jul 2017 13:11:17 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: update old trace events in docs
  trace: [trivial] Statically enable all guest events
  trace: [tcg, trivial] Re-align generated code
  trace: [tcg] Do not generate TCG code to trace dynamically-disabled events
  exec: [tcg] Use different TBs according to the vCPU's dynamic tracing state
  trace: [tcg] Delay changes to dynamic state when translating
  trace: Allocate cpu->trace_dstate in place

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ca4e667d 304187c5

accel/tcg/cpu-exec.c

+6 −2
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ struct tb_desc { 
    CPUArchState *env;

    tb_page_addr_t phys_page1;

    uint32_t flags;

    uint32_t trace_vcpu_dstate;

};



static bool tb_cmp(const void *p, const void *d)
@@ -291,6 +292,7 @@ static bool tb_cmp(const void *p, const void *d) 
        tb->page_addr[0] == desc->phys_page1 &&

        tb->cs_base == desc->cs_base &&

        tb->flags == desc->flags &&

        tb->trace_vcpu_dstate == desc->trace_vcpu_dstate &&

        !atomic_read(&tb->invalid)) {

        /* check next page if needed */

        if (tb->page_addr[1] == -1) {
@@ -319,10 +321,11 @@ TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, 
    desc.env = (CPUArchState *)cpu->env_ptr;

    desc.cs_base = cs_base;

    desc.flags = flags;

    desc.trace_vcpu_dstate = *cpu->trace_dstate;

    desc.pc = pc;

    phys_pc = get_page_addr_code(desc.env, pc);

    desc.phys_page1 = phys_pc & TARGET_PAGE_MASK;

    h = tb_hash_func(phys_pc, pc, flags);

    h = tb_hash_func(phys_pc, pc, flags, *cpu->trace_dstate);

    return qht_lookup(&tcg_ctx.tb_ctx.htable, tb_cmp, &desc, h);

}
@@ -342,7 +345,8 @@ static inline TranslationBlock *tb_find(CPUState *cpu, 
    cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);

    tb = atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]);

    if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||

                 tb->flags != flags)) {

                 tb->flags != flags ||

                 tb->trace_vcpu_dstate != *cpu->trace_dstate)) {

        tb = tb_htable_lookup(cpu, pc, cs_base, flags);

        if (!tb) {

accel/tcg/translate-all.c

+9 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include "exec/tb-hash.h"

#include "translate-all.h"

#include "qemu/bitmap.h"

#include "qemu/error-report.h"

#include "qemu/timer.h"

#include "qemu/main-loop.h"

#include "exec/log.h"
@@ -112,6 +113,11 @@ typedef struct PageDesc { 
#define V_L2_BITS 10

#define V_L2_SIZE (1 << V_L2_BITS)



/* Make sure all possible CPU event bits fit in tb->trace_vcpu_dstate */

QEMU_BUILD_BUG_ON(CPU_TRACE_DSTATE_MAX_EVENTS >

                  sizeof(((TranslationBlock *)0)->trace_vcpu_dstate)

                  * BITS_PER_BYTE);



/*

 * L1 Mapping properties

 */
@@ -1071,7 +1077,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) 


    /* remove the TB from the hash list */

    phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);

    h = tb_hash_func(phys_pc, tb->pc, tb->flags);

    h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->trace_vcpu_dstate);

    qht_remove(&tcg_ctx.tb_ctx.htable, tb, h);



    /* remove the TB from the page list */
@@ -1216,7 +1222,7 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, 
    }



    /* add in the hash table */

    h = tb_hash_func(phys_pc, tb->pc, tb->flags);

    h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->trace_vcpu_dstate);

    qht_insert(&tcg_ctx.tb_ctx.htable, tb, h);



#ifdef DEBUG_TB_CHECK
@@ -1262,6 +1268,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
    tb->cs_base = cs_base;

    tb->flags = flags;

    tb->cflags = cflags;

    tb->trace_vcpu_dstate = *cpu->trace_dstate;

    tb->invalid = false;



#ifdef CONFIG_PROFILER

docs/devel/tracing.txt

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ for debugging, profiling, and observing execution. 


2. Create a file with the events you want to trace:



   echo bdrv_aio_readv   > /tmp/events

   echo bdrv_aio_writev >> /tmp/events

   echo memory_region_ops_read >/tmp/events



3. Run the virtual machine to produce a trace file:

include/exec/exec-all.h

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ struct TranslationBlock { 
#define CF_USE_ICOUNT  0x20000

#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */



    /* Per-vCPU dynamic tracing state used to generate this TB */

    uint32_t trace_vcpu_dstate;



    uint16_t invalid;



    void *tc_ptr;    /* pointer to the translated code */

include/exec/tb-hash-xx.h

+5 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
 * contiguous in memory.

 */

static inline

uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)

uint32_t tb_hash_func6(uint64_t a0, uint64_t b0, uint32_t e, uint32_t f)

{

    uint32_t v1 = TB_HASH_XX_SEED + PRIME32_1 + PRIME32_2;

    uint32_t v2 = TB_HASH_XX_SEED + PRIME32_2;
@@ -78,11 +78,14 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e) 
    v4 *= PRIME32_1;



    h32 = rol32(v1, 1) + rol32(v2, 7) + rol32(v3, 12) + rol32(v4, 18);

    h32 += 20;

    h32 += 24;



    h32 += e * PRIME32_3;

    h32  = rol32(h32, 17) * PRIME32_4;



    h32 += f * PRIME32_3;

    h32  = rol32(h32, 17) * PRIME32_4;



    h32 ^= h32 >> 15;

    h32 *= PRIME32_2;

    h32 ^= h32 >> 13;