mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 18:13:04 +00:00
28c5bcf74f
TRACE_INCLUDE_PATH and TRACE_INCLUDE_FILE are used by
<trace/define_trace.h>, so like that #include, they should
be outside #ifdef protection.
They also need to be #undefed before defining, in case multiple trace
headers are included by the same C file. This became the case on
book3e after commit cf4a608515 ("powerpc/mm: Add missing tracepoint for
tlbie"), leading to the following build error:
CC arch/powerpc/kvm/powerpc.o
In file included from arch/powerpc/kvm/powerpc.c:51:0:
arch/powerpc/kvm/trace.h:9:0: error: "TRACE_INCLUDE_PATH" redefined
[-Werror]
#define TRACE_INCLUDE_PATH .
^
In file included from arch/powerpc/kvm/../mm/mmu_decl.h:25:0,
from arch/powerpc/kvm/powerpc.c:48:
./arch/powerpc/include/asm/trace.h:224:0: note: this is the location of
the previous definition
#define TRACE_INCLUDE_PATH asm
^
cc1: all warnings being treated as errors
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Scott Wood <oss@buserror.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
128 lines
2.8 KiB
C
128 lines
2.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_KVM_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM kvm
|
|
|
|
/*
|
|
* Tracepoint for guest mode entry.
|
|
*/
|
|
TRACE_EVENT(kvm_ppc_instr,
|
|
TP_PROTO(unsigned int inst, unsigned long _pc, unsigned int emulate),
|
|
TP_ARGS(inst, _pc, emulate),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( unsigned int, inst )
|
|
__field( unsigned long, pc )
|
|
__field( unsigned int, emulate )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->inst = inst;
|
|
__entry->pc = _pc;
|
|
__entry->emulate = emulate;
|
|
),
|
|
|
|
TP_printk("inst %u pc 0x%lx emulate %u\n",
|
|
__entry->inst, __entry->pc, __entry->emulate)
|
|
);
|
|
|
|
TRACE_EVENT(kvm_stlb_inval,
|
|
TP_PROTO(unsigned int stlb_index),
|
|
TP_ARGS(stlb_index),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( unsigned int, stlb_index )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->stlb_index = stlb_index;
|
|
),
|
|
|
|
TP_printk("stlb_index %u", __entry->stlb_index)
|
|
);
|
|
|
|
TRACE_EVENT(kvm_stlb_write,
|
|
TP_PROTO(unsigned int victim, unsigned int tid, unsigned int word0,
|
|
unsigned int word1, unsigned int word2),
|
|
TP_ARGS(victim, tid, word0, word1, word2),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( unsigned int, victim )
|
|
__field( unsigned int, tid )
|
|
__field( unsigned int, word0 )
|
|
__field( unsigned int, word1 )
|
|
__field( unsigned int, word2 )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->victim = victim;
|
|
__entry->tid = tid;
|
|
__entry->word0 = word0;
|
|
__entry->word1 = word1;
|
|
__entry->word2 = word2;
|
|
),
|
|
|
|
TP_printk("victim %u tid %u w0 %u w1 %u w2 %u",
|
|
__entry->victim, __entry->tid, __entry->word0,
|
|
__entry->word1, __entry->word2)
|
|
);
|
|
|
|
TRACE_EVENT(kvm_gtlb_write,
|
|
TP_PROTO(unsigned int gtlb_index, unsigned int tid, unsigned int word0,
|
|
unsigned int word1, unsigned int word2),
|
|
TP_ARGS(gtlb_index, tid, word0, word1, word2),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( unsigned int, gtlb_index )
|
|
__field( unsigned int, tid )
|
|
__field( unsigned int, word0 )
|
|
__field( unsigned int, word1 )
|
|
__field( unsigned int, word2 )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->gtlb_index = gtlb_index;
|
|
__entry->tid = tid;
|
|
__entry->word0 = word0;
|
|
__entry->word1 = word1;
|
|
__entry->word2 = word2;
|
|
),
|
|
|
|
TP_printk("gtlb_index %u tid %u w0 %u w1 %u w2 %u",
|
|
__entry->gtlb_index, __entry->tid, __entry->word0,
|
|
__entry->word1, __entry->word2)
|
|
);
|
|
|
|
TRACE_EVENT(kvm_check_requests,
|
|
TP_PROTO(struct kvm_vcpu *vcpu),
|
|
TP_ARGS(vcpu),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( __u32, cpu_nr )
|
|
__field( __u32, requests )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->cpu_nr = vcpu->vcpu_id;
|
|
__entry->requests = vcpu->requests;
|
|
),
|
|
|
|
TP_printk("vcpu=%x requests=%x",
|
|
__entry->cpu_nr, __entry->requests)
|
|
);
|
|
|
|
#endif /* _TRACE_KVM_H */
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#undef TRACE_INCLUDE_FILE
|
|
|
|
#define TRACE_INCLUDE_PATH .
|
|
#define TRACE_INCLUDE_FILE trace
|
|
|
|
#include <trace/define_trace.h>
|