| Message ID | 1380276233-17095-8-git-send-email-aneesh.kumar@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 27.09.2013, at 12:03, Aneesh Kumar K.V wrote: > From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> > > This patch moves PR related tracepoints to a separate header. This > enables in converting PR to a kernel module which will be done in > later patches > > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- > arch/powerpc/kvm/book3s_mmu_hpte.c | 2 +- > arch/powerpc/kvm/book3s_pr.c | 3 +- > arch/powerpc/kvm/trace.h | 234 +-------------------------- > arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++++++++++++++++++++++ > 5 files changed, 308 insertions(+), 230 deletions(-) > create mode 100644 arch/powerpc/kvm/trace_pr.h > > diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c > index 329a978..fd5b393 100644 > --- a/arch/powerpc/kvm/book3s_64_mmu_host.c > +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c > @@ -27,7 +27,7 @@ > #include <asm/machdep.h> > #include <asm/mmu_context.h> > #include <asm/hw_irq.h> > -#include "trace.h" > +#include "trace_pr.h" > > #define PTE_SIZE 12 > > diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c > index d2d280b..4556168 100644 > --- a/arch/powerpc/kvm/book3s_mmu_hpte.c > +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c > @@ -28,7 +28,7 @@ > #include <asm/mmu_context.h> > #include <asm/hw_irq.h> > > -#include "trace.h" > +#include "trace_pr.h" > > #define PTE_SIZE 12 > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index 2a97279..99d0839 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -41,7 +41,8 @@ > #include <linux/vmalloc.h> > #include <linux/highmem.h> > > -#include "trace.h" > +#define CREATE_TRACE_POINTS > +#include "trace_pr.h" > > /* #define EXIT_DEBUG */ > /* #define DEBUG_EXT */ > diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h > index a088e9a..7d5a136 100644 > --- a/arch/powerpc/kvm/trace.h > +++ b/arch/powerpc/kvm/trace.h > @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, > {41, "HV_PRIV"} > #endif > > +#ifndef CONFIG_KVM_BOOK3S_PR > +/* > + * For pr we define this in trace_pr.h since it pr can be built as > + * a module Not sure I understand the need. If the config option is available, so should the struct field. Worst case that happens with HV is that we get empty shadow_srr1 values in our trace, no? If your goal is to make it more obvious whether we are tracing in PR or HV land (which is a reasonable goal), then you should also split off all non-common trace points into a special hv trace header so that it's obvious whether we are looking at HV or PR. Alex
Alexander Graf <agraf@suse.de> writes: > On 27.09.2013, at 12:03, Aneesh Kumar K.V wrote: > >> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> >> >> This patch moves PR related tracepoints to a separate header. This >> enables in converting PR to a kernel module which will be done in >> later patches >> >> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> >> --- >> arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- >> arch/powerpc/kvm/book3s_mmu_hpte.c | 2 +- >> arch/powerpc/kvm/book3s_pr.c | 3 +- >> arch/powerpc/kvm/trace.h | 234 +-------------------------- >> arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++++++++++++++++++++++ >> 5 files changed, 308 insertions(+), 230 deletions(-) >> create mode 100644 arch/powerpc/kvm/trace_pr.h >> >> diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c >> index 329a978..fd5b393 100644 >> --- a/arch/powerpc/kvm/book3s_64_mmu_host.c >> +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c >> @@ -27,7 +27,7 @@ >> #include <asm/machdep.h> >> #include <asm/mmu_context.h> >> #include <asm/hw_irq.h> >> -#include "trace.h" >> +#include "trace_pr.h" >> >> #define PTE_SIZE 12 >> >> diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c >> index d2d280b..4556168 100644 >> --- a/arch/powerpc/kvm/book3s_mmu_hpte.c >> +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c >> @@ -28,7 +28,7 @@ >> #include <asm/mmu_context.h> >> #include <asm/hw_irq.h> >> >> -#include "trace.h" >> +#include "trace_pr.h" >> >> #define PTE_SIZE 12 >> >> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c >> index 2a97279..99d0839 100644 >> --- a/arch/powerpc/kvm/book3s_pr.c >> +++ b/arch/powerpc/kvm/book3s_pr.c >> @@ -41,7 +41,8 @@ >> #include <linux/vmalloc.h> >> #include <linux/highmem.h> >> >> -#include "trace.h" >> +#define CREATE_TRACE_POINTS >> +#include "trace_pr.h" >> >> /* #define EXIT_DEBUG */ >> /* #define DEBUG_EXT */ >> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h >> index a088e9a..7d5a136 100644 >> --- a/arch/powerpc/kvm/trace.h >> +++ b/arch/powerpc/kvm/trace.h >> @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, >> {41, "HV_PRIV"} >> #endif >> >> +#ifndef CONFIG_KVM_BOOK3S_PR >> +/* >> + * For pr we define this in trace_pr.h since it pr can be built as >> + * a module > > Not sure I understand the need. If the config option is available, so > should the struct field. Worst case that happens with HV is that we > get empty shadow_srr1 values in our trace, no? That is not the real reason. trace.h get built as part of kvm.ko or as part of kernel. These trace functions actually get called from kvm-pr.ko. To make they build i would either need EXPORT_SYMBOL or move the definition of them to kvm-pr.ko. I did the later and moved only pr related traces to kvm-pr.ko > > If your goal is to make it more obvious whether we are tracing in PR > or HV land (which is a reasonable goal), then you should also split > off all non-common trace points into a special hv trace header so that > it's obvious whether we are looking at HV or PR. -aneesh
On 27.09.2013, at 15:06, Aneesh Kumar K.V wrote: > Alexander Graf <agraf@suse.de> writes: > >> On 27.09.2013, at 12:03, Aneesh Kumar K.V wrote: >> >>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> >>> >>> This patch moves PR related tracepoints to a separate header. This >>> enables in converting PR to a kernel module which will be done in >>> later patches >>> >>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> >>> --- >>> arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- >>> arch/powerpc/kvm/book3s_mmu_hpte.c | 2 +- >>> arch/powerpc/kvm/book3s_pr.c | 3 +- >>> arch/powerpc/kvm/trace.h | 234 +-------------------------- >>> arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++++++++++++++++++++++ >>> 5 files changed, 308 insertions(+), 230 deletions(-) >>> create mode 100644 arch/powerpc/kvm/trace_pr.h >>> >>> diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c >>> index 329a978..fd5b393 100644 >>> --- a/arch/powerpc/kvm/book3s_64_mmu_host.c >>> +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c >>> @@ -27,7 +27,7 @@ >>> #include <asm/machdep.h> >>> #include <asm/mmu_context.h> >>> #include <asm/hw_irq.h> >>> -#include "trace.h" >>> +#include "trace_pr.h" >>> >>> #define PTE_SIZE 12 >>> >>> diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c >>> index d2d280b..4556168 100644 >>> --- a/arch/powerpc/kvm/book3s_mmu_hpte.c >>> +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c >>> @@ -28,7 +28,7 @@ >>> #include <asm/mmu_context.h> >>> #include <asm/hw_irq.h> >>> >>> -#include "trace.h" >>> +#include "trace_pr.h" >>> >>> #define PTE_SIZE 12 >>> >>> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c >>> index 2a97279..99d0839 100644 >>> --- a/arch/powerpc/kvm/book3s_pr.c >>> +++ b/arch/powerpc/kvm/book3s_pr.c >>> @@ -41,7 +41,8 @@ >>> #include <linux/vmalloc.h> >>> #include <linux/highmem.h> >>> >>> -#include "trace.h" >>> +#define CREATE_TRACE_POINTS >>> +#include "trace_pr.h" >>> >>> /* #define EXIT_DEBUG */ >>> /* #define DEBUG_EXT */ >>> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h >>> index a088e9a..7d5a136 100644 >>> --- a/arch/powerpc/kvm/trace.h >>> +++ b/arch/powerpc/kvm/trace.h >>> @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, >>> {41, "HV_PRIV"} >>> #endif >>> >>> +#ifndef CONFIG_KVM_BOOK3S_PR >>> +/* >>> + * For pr we define this in trace_pr.h since it pr can be built as >>> + * a module >> >> Not sure I understand the need. If the config option is available, so >> should the struct field. Worst case that happens with HV is that we >> get empty shadow_srr1 values in our trace, no? > > That is not the real reason. trace.h get built as part of kvm.ko or as > part of kernel. These trace functions actually get called from > kvm-pr.ko. To make they build i would either need EXPORT_SYMBOL or move > the definition of them to kvm-pr.ko. I did the later and moved only pr > related traces to kvm-pr.ko I fail to see why we wouldn't have a trace_hv.h file then, as that can also be built as a module, no? And at that point I don't see why we would need any conditionals at all in trace.h anymore, as it would only cover generic code. Alex
Alexander Graf <agraf@suse.de> writes: > On 27.09.2013, at 15:06, Aneesh Kumar K.V wrote: > >> Alexander Graf <agraf@suse.de> writes: >> >>> On 27.09.2013, at 12:03, Aneesh Kumar K.V wrote: >>> >>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> >>>> >>>> This patch moves PR related tracepoints to a separate header. This >>>> enables in converting PR to a kernel module which will be done in >>>> later patches >>>> >>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> >>>> --- >>>> arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- >>>> arch/powerpc/kvm/book3s_mmu_hpte.c | 2 +- >>>> arch/powerpc/kvm/book3s_pr.c | 3 +- >>>> arch/powerpc/kvm/trace.h | 234 +-------------------------- >>>> arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++++++++++++++++++++++ >>>> 5 files changed, 308 insertions(+), 230 deletions(-) >>>> create mode 100644 arch/powerpc/kvm/trace_pr.h >>>> >>>> diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c >>>> index 329a978..fd5b393 100644 >>>> --- a/arch/powerpc/kvm/book3s_64_mmu_host.c >>>> +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c >>>> @@ -27,7 +27,7 @@ >>>> #include <asm/machdep.h> >>>> #include <asm/mmu_context.h> >>>> #include <asm/hw_irq.h> >>>> -#include "trace.h" >>>> +#include "trace_pr.h" >>>> >>>> #define PTE_SIZE 12 >>>> >>>> diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c >>>> index d2d280b..4556168 100644 >>>> --- a/arch/powerpc/kvm/book3s_mmu_hpte.c >>>> +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c >>>> @@ -28,7 +28,7 @@ >>>> #include <asm/mmu_context.h> >>>> #include <asm/hw_irq.h> >>>> >>>> -#include "trace.h" >>>> +#include "trace_pr.h" >>>> >>>> #define PTE_SIZE 12 >>>> >>>> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c >>>> index 2a97279..99d0839 100644 >>>> --- a/arch/powerpc/kvm/book3s_pr.c >>>> +++ b/arch/powerpc/kvm/book3s_pr.c >>>> @@ -41,7 +41,8 @@ >>>> #include <linux/vmalloc.h> >>>> #include <linux/highmem.h> >>>> >>>> -#include "trace.h" >>>> +#define CREATE_TRACE_POINTS >>>> +#include "trace_pr.h" >>>> >>>> /* #define EXIT_DEBUG */ >>>> /* #define DEBUG_EXT */ >>>> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h >>>> index a088e9a..7d5a136 100644 >>>> --- a/arch/powerpc/kvm/trace.h >>>> +++ b/arch/powerpc/kvm/trace.h >>>> @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, >>>> {41, "HV_PRIV"} >>>> #endif >>>> >>>> +#ifndef CONFIG_KVM_BOOK3S_PR >>>> +/* >>>> + * For pr we define this in trace_pr.h since it pr can be built as >>>> + * a module >>> >>> Not sure I understand the need. If the config option is available, so >>> should the struct field. Worst case that happens with HV is that we >>> get empty shadow_srr1 values in our trace, no? >> >> That is not the real reason. trace.h get built as part of kvm.ko or as >> part of kernel. These trace functions actually get called from >> kvm-pr.ko. To make they build i would either need EXPORT_SYMBOL or move >> the definition of them to kvm-pr.ko. I did the later and moved only pr >> related traces to kvm-pr.ko > > I fail to see why we wouldn't have a trace_hv.h file then, as that can > also be built as a module, no? And at that point I don't see why we > would need any conditionals at all in trace.h anymore, as it would > only cover generic code. Currently HV module is not using any tracepoints. Once it start using tracepoints we would have trace_hv.h -aneesh
On 09/30/2013 02:57 PM, Aneesh Kumar K.V wrote: > Alexander Graf<agraf@suse.de> writes: > >> On 27.09.2013, at 15:06, Aneesh Kumar K.V wrote: >> >>> Alexander Graf<agraf@suse.de> writes: >>> >>>> On 27.09.2013, at 12:03, Aneesh Kumar K.V wrote: >>>> >>>>> From: "Aneesh Kumar K.V"<aneesh.kumar@linux.vnet.ibm.com> >>>>> >>>>> This patch moves PR related tracepoints to a separate header. This >>>>> enables in converting PR to a kernel module which will be done in >>>>> later patches >>>>> >>>>> Signed-off-by: Aneesh Kumar K.V<aneesh.kumar@linux.vnet.ibm.com> >>>>> --- >>>>> arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- >>>>> arch/powerpc/kvm/book3s_mmu_hpte.c | 2 +- >>>>> arch/powerpc/kvm/book3s_pr.c | 3 +- >>>>> arch/powerpc/kvm/trace.h | 234 +-------------------------- >>>>> arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++++++++++++++++++++++ >>>>> 5 files changed, 308 insertions(+), 230 deletions(-) >>>>> create mode 100644 arch/powerpc/kvm/trace_pr.h >>>>> >>>>> diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c >>>>> index 329a978..fd5b393 100644 >>>>> --- a/arch/powerpc/kvm/book3s_64_mmu_host.c >>>>> +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c >>>>> @@ -27,7 +27,7 @@ >>>>> #include<asm/machdep.h> >>>>> #include<asm/mmu_context.h> >>>>> #include<asm/hw_irq.h> >>>>> -#include "trace.h" >>>>> +#include "trace_pr.h" >>>>> >>>>> #define PTE_SIZE 12 >>>>> >>>>> diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c >>>>> index d2d280b..4556168 100644 >>>>> --- a/arch/powerpc/kvm/book3s_mmu_hpte.c >>>>> +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c >>>>> @@ -28,7 +28,7 @@ >>>>> #include<asm/mmu_context.h> >>>>> #include<asm/hw_irq.h> >>>>> >>>>> -#include "trace.h" >>>>> +#include "trace_pr.h" >>>>> >>>>> #define PTE_SIZE 12 >>>>> >>>>> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c >>>>> index 2a97279..99d0839 100644 >>>>> --- a/arch/powerpc/kvm/book3s_pr.c >>>>> +++ b/arch/powerpc/kvm/book3s_pr.c >>>>> @@ -41,7 +41,8 @@ >>>>> #include<linux/vmalloc.h> >>>>> #include<linux/highmem.h> >>>>> >>>>> -#include "trace.h" >>>>> +#define CREATE_TRACE_POINTS >>>>> +#include "trace_pr.h" >>>>> >>>>> /* #define EXIT_DEBUG */ >>>>> /* #define DEBUG_EXT */ >>>>> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h >>>>> index a088e9a..7d5a136 100644 >>>>> --- a/arch/powerpc/kvm/trace.h >>>>> +++ b/arch/powerpc/kvm/trace.h >>>>> @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, >>>>> {41, "HV_PRIV"} >>>>> #endif >>>>> >>>>> +#ifndef CONFIG_KVM_BOOK3S_PR >>>>> +/* >>>>> + * For pr we define this in trace_pr.h since it pr can be built as >>>>> + * a module >>>> Not sure I understand the need. If the config option is available, so >>>> should the struct field. Worst case that happens with HV is that we >>>> get empty shadow_srr1 values in our trace, no? >>> That is not the real reason. trace.h get built as part of kvm.ko or as >>> part of kernel. These trace functions actually get called from >>> kvm-pr.ko. To make they build i would either need EXPORT_SYMBOL or move >>> the definition of them to kvm-pr.ko. I did the later and moved only pr >>> related traces to kvm-pr.ko >> I fail to see why we wouldn't have a trace_hv.h file then, as that can >> also be built as a module, no? And at that point I don't see why we >> would need any conditionals at all in trace.h anymore, as it would >> only cover generic code. > Currently HV module is not using any tracepoints. Once it start using > tracepoints we would have trace_hv.h So why would there be an #ifndef in trace.h? Alex
Alexander Graf <agraf@suse.de> writes: > On 09/30/2013 02:57 PM, Aneesh Kumar K.V wrote: >> Alexander Graf<agraf@suse.de> writes: >>>>>> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h >>>>>> index a088e9a..7d5a136 100644 >>>>>> --- a/arch/powerpc/kvm/trace.h >>>>>> +++ b/arch/powerpc/kvm/trace.h >>>>>> @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, >>>>>> {41, "HV_PRIV"} >>>>>> #endif >>>>>> >>>>>> +#ifndef CONFIG_KVM_BOOK3S_PR >>>>>> +/* >>>>>> + * For pr we define this in trace_pr.h since it pr can be built as >>>>>> + * a module >>>>> Not sure I understand the need. If the config option is available, so >>>>> should the struct field. Worst case that happens with HV is that we >>>>> get empty shadow_srr1 values in our trace, no? >>>> That is not the real reason. trace.h get built as part of kvm.ko or as >>>> part of kernel. These trace functions actually get called from >>>> kvm-pr.ko. To make they build i would either need EXPORT_SYMBOL or move >>>> the definition of them to kvm-pr.ko. I did the later and moved only pr >>>> related traces to kvm-pr.ko >>> I fail to see why we wouldn't have a trace_hv.h file then, as that can >>> also be built as a module, no? And at that point I don't see why we >>> would need any conditionals at all in trace.h anymore, as it would >>> only cover generic code. >> Currently HV module is not using any tracepoints. Once it start using >> tracepoints we would have trace_hv.h > > So why would there be an #ifndef in trace.h? > to handle things like trace_kvm_exit in booke.c. For that we still don't have kernel module, and booke.c include trace.h. -aneesh
On 09/30/2013 05:53 PM, Aneesh Kumar K.V wrote: > Alexander Graf<agraf@suse.de> writes: > >> On 09/30/2013 02:57 PM, Aneesh Kumar K.V wrote: >>> Alexander Graf<agraf@suse.de> writes: >>>>>>> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h >>>>>>> index a088e9a..7d5a136 100644 >>>>>>> --- a/arch/powerpc/kvm/trace.h >>>>>>> +++ b/arch/powerpc/kvm/trace.h >>>>>>> @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, >>>>>>> {41, "HV_PRIV"} >>>>>>> #endif >>>>>>> >>>>>>> +#ifndef CONFIG_KVM_BOOK3S_PR >>>>>>> +/* >>>>>>> + * For pr we define this in trace_pr.h since it pr can be built as >>>>>>> + * a module >>>>>> Not sure I understand the need. If the config option is available, so >>>>>> should the struct field. Worst case that happens with HV is that we >>>>>> get empty shadow_srr1 values in our trace, no? >>>>> That is not the real reason. trace.h get built as part of kvm.ko or as >>>>> part of kernel. These trace functions actually get called from >>>>> kvm-pr.ko. To make they build i would either need EXPORT_SYMBOL or move >>>>> the definition of them to kvm-pr.ko. I did the later and moved only pr >>>>> related traces to kvm-pr.ko >>>> I fail to see why we wouldn't have a trace_hv.h file then, as that can >>>> also be built as a module, no? And at that point I don't see why we >>>> would need any conditionals at all in trace.h anymore, as it would >>>> only cover generic code. >>> Currently HV module is not using any tracepoints. Once it start using >>> tracepoints we would have trace_hv.h >> So why would there be an #ifndef in trace.h? >> > to handle things like trace_kvm_exit in booke.c. For that we still don't > have kernel module, and booke.c include trace.h. Ah, so it's for booke! :) Just move them to trace_booke.h then to clarify things. Alex
diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c index 329a978..fd5b393 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_host.c +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c @@ -27,7 +27,7 @@ #include <asm/machdep.h> #include <asm/mmu_context.h> #include <asm/hw_irq.h> -#include "trace.h" +#include "trace_pr.h" #define PTE_SIZE 12 diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c index d2d280b..4556168 100644 --- a/arch/powerpc/kvm/book3s_mmu_hpte.c +++ b/arch/powerpc/kvm/book3s_mmu_hpte.c @@ -28,7 +28,7 @@ #include <asm/mmu_context.h> #include <asm/hw_irq.h> -#include "trace.h" +#include "trace_pr.h" #define PTE_SIZE 12 diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 2a97279..99d0839 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -41,7 +41,8 @@ #include <linux/vmalloc.h> #include <linux/highmem.h> -#include "trace.h" +#define CREATE_TRACE_POINTS +#include "trace_pr.h" /* #define EXIT_DEBUG */ /* #define DEBUG_EXT */ diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h index a088e9a..7d5a136 100644 --- a/arch/powerpc/kvm/trace.h +++ b/arch/powerpc/kvm/trace.h @@ -85,6 +85,12 @@ TRACE_EVENT(kvm_ppc_instr, {41, "HV_PRIV"} #endif +#ifndef CONFIG_KVM_BOOK3S_PR +/* + * For pr we define this in trace_pr.h since it pr can be built as + * a module + */ + TRACE_EVENT(kvm_exit, TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), TP_ARGS(exit_nr, vcpu), @@ -94,9 +100,6 @@ TRACE_EVENT(kvm_exit, __field( unsigned long, pc ) __field( unsigned long, msr ) __field( unsigned long, dar ) -#ifdef CONFIG_KVM_BOOK3S_PR - __field( unsigned long, srr1 ) -#endif __field( unsigned long, last_inst ) ), @@ -105,9 +108,6 @@ TRACE_EVENT(kvm_exit, __entry->pc = kvmppc_get_pc(vcpu); __entry->dar = kvmppc_get_fault_dar(vcpu); __entry->msr = vcpu->arch.shared->msr; -#ifdef CONFIG_KVM_BOOK3S_PR - __entry->srr1 = vcpu->arch.shadow_srr1; -#endif __entry->last_inst = vcpu->arch.last_inst; ), @@ -115,18 +115,12 @@ TRACE_EVENT(kvm_exit, " | pc=0x%lx" " | msr=0x%lx" " | dar=0x%lx" -#ifdef CONFIG_KVM_BOOK3S_PR - " | srr1=0x%lx" -#endif " | last_inst=0x%lx" , __print_symbolic(__entry->exit_nr, kvm_trace_symbol_exit), __entry->pc, __entry->msr, __entry->dar, -#ifdef CONFIG_KVM_BOOK3S_PR - __entry->srr1, -#endif __entry->last_inst ) ); @@ -145,6 +139,7 @@ TRACE_EVENT(kvm_unmap_hva, TP_printk("unmap hva 0x%lx\n", __entry->hva) ); +#endif TRACE_EVENT(kvm_stlb_inval, TP_PROTO(unsigned int stlb_index), @@ -231,221 +226,6 @@ TRACE_EVENT(kvm_check_requests, __entry->cpu_nr, __entry->requests) ); - -/************************************************************************* - * Book3S trace points * - *************************************************************************/ - -#ifdef CONFIG_KVM_BOOK3S_PR - -TRACE_EVENT(kvm_book3s_reenter, - TP_PROTO(int r, struct kvm_vcpu *vcpu), - TP_ARGS(r, vcpu), - - TP_STRUCT__entry( - __field( unsigned int, r ) - __field( unsigned long, pc ) - ), - - TP_fast_assign( - __entry->r = r; - __entry->pc = kvmppc_get_pc(vcpu); - ), - - TP_printk("reentry r=%d | pc=0x%lx", __entry->r, __entry->pc) -); - -#ifdef CONFIG_PPC_BOOK3S_64 - -TRACE_EVENT(kvm_book3s_64_mmu_map, - TP_PROTO(int rflags, ulong hpteg, ulong va, pfn_t hpaddr, - struct kvmppc_pte *orig_pte), - TP_ARGS(rflags, hpteg, va, hpaddr, orig_pte), - - TP_STRUCT__entry( - __field( unsigned char, flag_w ) - __field( unsigned char, flag_x ) - __field( unsigned long, eaddr ) - __field( unsigned long, hpteg ) - __field( unsigned long, va ) - __field( unsigned long long, vpage ) - __field( unsigned long, hpaddr ) - ), - - TP_fast_assign( - __entry->flag_w = ((rflags & HPTE_R_PP) == 3) ? '-' : 'w'; - __entry->flag_x = (rflags & HPTE_R_N) ? '-' : 'x'; - __entry->eaddr = orig_pte->eaddr; - __entry->hpteg = hpteg; - __entry->va = va; - __entry->vpage = orig_pte->vpage; - __entry->hpaddr = hpaddr; - ), - - TP_printk("KVM: %c%c Map 0x%lx: [%lx] 0x%lx (0x%llx) -> %lx", - __entry->flag_w, __entry->flag_x, __entry->eaddr, - __entry->hpteg, __entry->va, __entry->vpage, __entry->hpaddr) -); - -#endif /* CONFIG_PPC_BOOK3S_64 */ - -TRACE_EVENT(kvm_book3s_mmu_map, - TP_PROTO(struct hpte_cache *pte), - TP_ARGS(pte), - - TP_STRUCT__entry( - __field( u64, host_vpn ) - __field( u64, pfn ) - __field( ulong, eaddr ) - __field( u64, vpage ) - __field( ulong, raddr ) - __field( int, flags ) - ), - - TP_fast_assign( - __entry->host_vpn = pte->host_vpn; - __entry->pfn = pte->pfn; - __entry->eaddr = pte->pte.eaddr; - __entry->vpage = pte->pte.vpage; - __entry->raddr = pte->pte.raddr; - __entry->flags = (pte->pte.may_read ? 0x4 : 0) | - (pte->pte.may_write ? 0x2 : 0) | - (pte->pte.may_execute ? 0x1 : 0); - ), - - TP_printk("Map: hvpn=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]", - __entry->host_vpn, __entry->pfn, __entry->eaddr, - __entry->vpage, __entry->raddr, __entry->flags) -); - -TRACE_EVENT(kvm_book3s_mmu_invalidate, - TP_PROTO(struct hpte_cache *pte), - TP_ARGS(pte), - - TP_STRUCT__entry( - __field( u64, host_vpn ) - __field( u64, pfn ) - __field( ulong, eaddr ) - __field( u64, vpage ) - __field( ulong, raddr ) - __field( int, flags ) - ), - - TP_fast_assign( - __entry->host_vpn = pte->host_vpn; - __entry->pfn = pte->pfn; - __entry->eaddr = pte->pte.eaddr; - __entry->vpage = pte->pte.vpage; - __entry->raddr = pte->pte.raddr; - __entry->flags = (pte->pte.may_read ? 0x4 : 0) | - (pte->pte.may_write ? 0x2 : 0) | - (pte->pte.may_execute ? 0x1 : 0); - ), - - TP_printk("Flush: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]", - __entry->host_vpn, __entry->pfn, __entry->eaddr, - __entry->vpage, __entry->raddr, __entry->flags) -); - -TRACE_EVENT(kvm_book3s_mmu_flush, - TP_PROTO(const char *type, struct kvm_vcpu *vcpu, unsigned long long p1, - unsigned long long p2), - TP_ARGS(type, vcpu, p1, p2), - - TP_STRUCT__entry( - __field( int, count ) - __field( unsigned long long, p1 ) - __field( unsigned long long, p2 ) - __field( const char *, type ) - ), - - TP_fast_assign( - __entry->count = to_book3s(vcpu)->hpte_cache_count; - __entry->p1 = p1; - __entry->p2 = p2; - __entry->type = type; - ), - - TP_printk("Flush %d %sPTEs: %llx - %llx", - __entry->count, __entry->type, __entry->p1, __entry->p2) -); - -TRACE_EVENT(kvm_book3s_slb_found, - TP_PROTO(unsigned long long gvsid, unsigned long long hvsid), - TP_ARGS(gvsid, hvsid), - - TP_STRUCT__entry( - __field( unsigned long long, gvsid ) - __field( unsigned long long, hvsid ) - ), - - TP_fast_assign( - __entry->gvsid = gvsid; - __entry->hvsid = hvsid; - ), - - TP_printk("%llx -> %llx", __entry->gvsid, __entry->hvsid) -); - -TRACE_EVENT(kvm_book3s_slb_fail, - TP_PROTO(u16 sid_map_mask, unsigned long long gvsid), - TP_ARGS(sid_map_mask, gvsid), - - TP_STRUCT__entry( - __field( unsigned short, sid_map_mask ) - __field( unsigned long long, gvsid ) - ), - - TP_fast_assign( - __entry->sid_map_mask = sid_map_mask; - __entry->gvsid = gvsid; - ), - - TP_printk("%x/%x: %llx", __entry->sid_map_mask, - SID_MAP_MASK - __entry->sid_map_mask, __entry->gvsid) -); - -TRACE_EVENT(kvm_book3s_slb_map, - TP_PROTO(u16 sid_map_mask, unsigned long long gvsid, - unsigned long long hvsid), - TP_ARGS(sid_map_mask, gvsid, hvsid), - - TP_STRUCT__entry( - __field( unsigned short, sid_map_mask ) - __field( unsigned long long, guest_vsid ) - __field( unsigned long long, host_vsid ) - ), - - TP_fast_assign( - __entry->sid_map_mask = sid_map_mask; - __entry->guest_vsid = gvsid; - __entry->host_vsid = hvsid; - ), - - TP_printk("%x: %llx -> %llx", __entry->sid_map_mask, - __entry->guest_vsid, __entry->host_vsid) -); - -TRACE_EVENT(kvm_book3s_slbmte, - TP_PROTO(u64 slb_vsid, u64 slb_esid), - TP_ARGS(slb_vsid, slb_esid), - - TP_STRUCT__entry( - __field( u64, slb_vsid ) - __field( u64, slb_esid ) - ), - - TP_fast_assign( - __entry->slb_vsid = slb_vsid; - __entry->slb_esid = slb_esid; - ), - - TP_printk("%llx, %llx", __entry->slb_vsid, __entry->slb_esid) -); - -#endif /* CONFIG_PPC_BOOK3S */ - - /************************************************************************* * Book3E trace points * *************************************************************************/ diff --git a/arch/powerpc/kvm/trace_pr.h b/arch/powerpc/kvm/trace_pr.h new file mode 100644 index 0000000..8b22e47 --- /dev/null +++ b/arch/powerpc/kvm/trace_pr.h @@ -0,0 +1,297 @@ + +#if !defined(_TRACE_KVM_PR_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_PR_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm_pr +#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_FILE trace_pr + +#define kvm_trace_symbol_exit \ + {0x100, "SYSTEM_RESET"}, \ + {0x200, "MACHINE_CHECK"}, \ + {0x300, "DATA_STORAGE"}, \ + {0x380, "DATA_SEGMENT"}, \ + {0x400, "INST_STORAGE"}, \ + {0x480, "INST_SEGMENT"}, \ + {0x500, "EXTERNAL"}, \ + {0x501, "EXTERNAL_LEVEL"}, \ + {0x502, "EXTERNAL_HV"}, \ + {0x600, "ALIGNMENT"}, \ + {0x700, "PROGRAM"}, \ + {0x800, "FP_UNAVAIL"}, \ + {0x900, "DECREMENTER"}, \ + {0x980, "HV_DECREMENTER"}, \ + {0xc00, "SYSCALL"}, \ + {0xd00, "TRACE"}, \ + {0xe00, "H_DATA_STORAGE"}, \ + {0xe20, "H_INST_STORAGE"}, \ + {0xe40, "H_EMUL_ASSIST"}, \ + {0xf00, "PERFMON"}, \ + {0xf20, "ALTIVEC"}, \ + {0xf40, "VSX"} + +TRACE_EVENT(kvm_book3s_reenter, + TP_PROTO(int r, struct kvm_vcpu *vcpu), + TP_ARGS(r, vcpu), + + TP_STRUCT__entry( + __field( unsigned int, r ) + __field( unsigned long, pc ) + ), + + TP_fast_assign( + __entry->r = r; + __entry->pc = kvmppc_get_pc(vcpu); + ), + + TP_printk("reentry r=%d | pc=0x%lx", __entry->r, __entry->pc) +); + +#ifdef CONFIG_PPC_BOOK3S_64 + +TRACE_EVENT(kvm_book3s_64_mmu_map, + TP_PROTO(int rflags, ulong hpteg, ulong va, pfn_t hpaddr, + struct kvmppc_pte *orig_pte), + TP_ARGS(rflags, hpteg, va, hpaddr, orig_pte), + + TP_STRUCT__entry( + __field( unsigned char, flag_w ) + __field( unsigned char, flag_x ) + __field( unsigned long, eaddr ) + __field( unsigned long, hpteg ) + __field( unsigned long, va ) + __field( unsigned long long, vpage ) + __field( unsigned long, hpaddr ) + ), + + TP_fast_assign( + __entry->flag_w = ((rflags & HPTE_R_PP) == 3) ? '-' : 'w'; + __entry->flag_x = (rflags & HPTE_R_N) ? '-' : 'x'; + __entry->eaddr = orig_pte->eaddr; + __entry->hpteg = hpteg; + __entry->va = va; + __entry->vpage = orig_pte->vpage; + __entry->hpaddr = hpaddr; + ), + + TP_printk("KVM: %c%c Map 0x%lx: [%lx] 0x%lx (0x%llx) -> %lx", + __entry->flag_w, __entry->flag_x, __entry->eaddr, + __entry->hpteg, __entry->va, __entry->vpage, __entry->hpaddr) +); + +#endif /* CONFIG_PPC_BOOK3S_64 */ + +TRACE_EVENT(kvm_book3s_mmu_map, + TP_PROTO(struct hpte_cache *pte), + TP_ARGS(pte), + + TP_STRUCT__entry( + __field( u64, host_vpn ) + __field( u64, pfn ) + __field( ulong, eaddr ) + __field( u64, vpage ) + __field( ulong, raddr ) + __field( int, flags ) + ), + + TP_fast_assign( + __entry->host_vpn = pte->host_vpn; + __entry->pfn = pte->pfn; + __entry->eaddr = pte->pte.eaddr; + __entry->vpage = pte->pte.vpage; + __entry->raddr = pte->pte.raddr; + __entry->flags = (pte->pte.may_read ? 0x4 : 0) | + (pte->pte.may_write ? 0x2 : 0) | + (pte->pte.may_execute ? 0x1 : 0); + ), + + TP_printk("Map: hvpn=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]", + __entry->host_vpn, __entry->pfn, __entry->eaddr, + __entry->vpage, __entry->raddr, __entry->flags) +); + +TRACE_EVENT(kvm_book3s_mmu_invalidate, + TP_PROTO(struct hpte_cache *pte), + TP_ARGS(pte), + + TP_STRUCT__entry( + __field( u64, host_vpn ) + __field( u64, pfn ) + __field( ulong, eaddr ) + __field( u64, vpage ) + __field( ulong, raddr ) + __field( int, flags ) + ), + + TP_fast_assign( + __entry->host_vpn = pte->host_vpn; + __entry->pfn = pte->pfn; + __entry->eaddr = pte->pte.eaddr; + __entry->vpage = pte->pte.vpage; + __entry->raddr = pte->pte.raddr; + __entry->flags = (pte->pte.may_read ? 0x4 : 0) | + (pte->pte.may_write ? 0x2 : 0) | + (pte->pte.may_execute ? 0x1 : 0); + ), + + TP_printk("Flush: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]", + __entry->host_vpn, __entry->pfn, __entry->eaddr, + __entry->vpage, __entry->raddr, __entry->flags) +); + +TRACE_EVENT(kvm_book3s_mmu_flush, + TP_PROTO(const char *type, struct kvm_vcpu *vcpu, unsigned long long p1, + unsigned long long p2), + TP_ARGS(type, vcpu, p1, p2), + + TP_STRUCT__entry( + __field( int, count ) + __field( unsigned long long, p1 ) + __field( unsigned long long, p2 ) + __field( const char *, type ) + ), + + TP_fast_assign( + __entry->count = to_book3s(vcpu)->hpte_cache_count; + __entry->p1 = p1; + __entry->p2 = p2; + __entry->type = type; + ), + + TP_printk("Flush %d %sPTEs: %llx - %llx", + __entry->count, __entry->type, __entry->p1, __entry->p2) +); + +TRACE_EVENT(kvm_book3s_slb_found, + TP_PROTO(unsigned long long gvsid, unsigned long long hvsid), + TP_ARGS(gvsid, hvsid), + + TP_STRUCT__entry( + __field( unsigned long long, gvsid ) + __field( unsigned long long, hvsid ) + ), + + TP_fast_assign( + __entry->gvsid = gvsid; + __entry->hvsid = hvsid; + ), + + TP_printk("%llx -> %llx", __entry->gvsid, __entry->hvsid) +); + +TRACE_EVENT(kvm_book3s_slb_fail, + TP_PROTO(u16 sid_map_mask, unsigned long long gvsid), + TP_ARGS(sid_map_mask, gvsid), + + TP_STRUCT__entry( + __field( unsigned short, sid_map_mask ) + __field( unsigned long long, gvsid ) + ), + + TP_fast_assign( + __entry->sid_map_mask = sid_map_mask; + __entry->gvsid = gvsid; + ), + + TP_printk("%x/%x: %llx", __entry->sid_map_mask, + SID_MAP_MASK - __entry->sid_map_mask, __entry->gvsid) +); + +TRACE_EVENT(kvm_book3s_slb_map, + TP_PROTO(u16 sid_map_mask, unsigned long long gvsid, + unsigned long long hvsid), + TP_ARGS(sid_map_mask, gvsid, hvsid), + + TP_STRUCT__entry( + __field( unsigned short, sid_map_mask ) + __field( unsigned long long, guest_vsid ) + __field( unsigned long long, host_vsid ) + ), + + TP_fast_assign( + __entry->sid_map_mask = sid_map_mask; + __entry->guest_vsid = gvsid; + __entry->host_vsid = hvsid; + ), + + TP_printk("%x: %llx -> %llx", __entry->sid_map_mask, + __entry->guest_vsid, __entry->host_vsid) +); + +TRACE_EVENT(kvm_book3s_slbmte, + TP_PROTO(u64 slb_vsid, u64 slb_esid), + TP_ARGS(slb_vsid, slb_esid), + + TP_STRUCT__entry( + __field( u64, slb_vsid ) + __field( u64, slb_esid ) + ), + + TP_fast_assign( + __entry->slb_vsid = slb_vsid; + __entry->slb_esid = slb_esid; + ), + + TP_printk("%llx, %llx", __entry->slb_vsid, __entry->slb_esid) +); + +TRACE_EVENT(kvm_exit, + TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), + TP_ARGS(exit_nr, vcpu), + + TP_STRUCT__entry( + __field( unsigned int, exit_nr ) + __field( unsigned long, pc ) + __field( unsigned long, msr ) + __field( unsigned long, dar ) + __field( unsigned long, srr1 ) + __field( unsigned long, last_inst ) + ), + + TP_fast_assign( + __entry->exit_nr = exit_nr; + __entry->pc = kvmppc_get_pc(vcpu); + __entry->dar = kvmppc_get_fault_dar(vcpu); + __entry->msr = vcpu->arch.shared->msr; + __entry->srr1 = vcpu->arch.shadow_srr1; + __entry->last_inst = vcpu->arch.last_inst; + ), + + TP_printk("exit=%s" + " | pc=0x%lx" + " | msr=0x%lx" + " | dar=0x%lx" + " | srr1=0x%lx" + " | last_inst=0x%lx" + , + __print_symbolic(__entry->exit_nr, kvm_trace_symbol_exit), + __entry->pc, + __entry->msr, + __entry->dar, + __entry->srr1, + __entry->last_inst + ) +); + +TRACE_EVENT(kvm_unmap_hva, + TP_PROTO(unsigned long hva), + TP_ARGS(hva), + + TP_STRUCT__entry( + __field( unsigned long, hva ) + ), + + TP_fast_assign( + __entry->hva = hva; + ), + + TP_printk("unmap hva 0x%lx\n", __entry->hva) +); + +#endif /* _TRACE_KVM_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h>