[v3,3/3] kvm/powerpc: Export HCALL reason codes

Message ID 1431046385-5772-3-git-send-email-hemant@linux.vnet.ibm.com
State New, archived
Headers show

Commit Message

Hemant Kumar May 8, 2015, 12:53 a.m.
For perf to analyze the KVM events like hcalls, we need the
hypervisor calls and their codes to be exported through uapi.

This patch moves most of the pSeries hcall codes from
arch/powerpc/include/asm/hvcall.h to
arch/powerpc/include/uapi/asm/hcall_codes.h.
It also moves the mapping <hcall_code-to-hcall_reason> from
arch/powerpc/kvm/trace_hv.h to
arch/powerpc/include/uapi/asm/trace_hcall.h.

Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
---
 arch/powerpc/include/asm/hvcall.h           | 120 +--------------------------
 arch/powerpc/include/uapi/asm/hcall_codes.h | 123 ++++++++++++++++++++++++++++
 arch/powerpc/include/uapi/asm/trace_hcall.h | 122 +++++++++++++++++++++++++++
 arch/powerpc/kvm/trace_hv.h                 | 117 +-------------------------
 4 files changed, 248 insertions(+), 234 deletions(-)
 create mode 100644 arch/powerpc/include/uapi/asm/hcall_codes.h
 create mode 100644 arch/powerpc/include/uapi/asm/trace_hcall.h

Comments

Scott Wood May 11, 2015, 10:14 p.m. | #1
On Fri, 2015-05-08 at 06:23 +0530, Hemant Kumar wrote:
> For perf to analyze the KVM events like hcalls, we need the
> hypervisor calls and their codes to be exported through uapi.
> 
> This patch moves most of the pSeries hcall codes from
> arch/powerpc/include/asm/hvcall.h to
> arch/powerpc/include/uapi/asm/hcall_codes.h.
> It also moves the mapping <hcall_code-to-hcall_reason> from
> arch/powerpc/kvm/trace_hv.h to
> arch/powerpc/include/uapi/asm/trace_hcall.h.
> 
> Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
> ---
>  arch/powerpc/include/asm/hvcall.h           | 120 +--------------------------
>  arch/powerpc/include/uapi/asm/hcall_codes.h | 123 ++++++++++++++++++++++++++++
>  arch/powerpc/include/uapi/asm/trace_hcall.h | 122 +++++++++++++++++++++++++++
>  arch/powerpc/kvm/trace_hv.h                 | 117 +-------------------------

When moving to uapi please add proper namespacing to indicate that this
is pseries specific.

> diff --git a/arch/powerpc/include/uapi/asm/trace_hcall.h b/arch/powerpc/include/uapi/asm/trace_hcall.h
> new file mode 100644
> index 0000000..00eac01
> --- /dev/null
> +++ b/arch/powerpc/include/uapi/asm/trace_hcall.h
> @@ -0,0 +1,122 @@
> +#ifndef _KVM_TRACE_HCALL_MAP_H
> +#define _KVM_TRACE_HCALL_MAP_H
> +
> +#include "hcall_codes.h"
> +
> +#define kvm_trace_symbol_hcall\
> +	{H_REMOVE,"H_REMOVE"},					\
> +	{H_ENTER,"H_ENTER"},					\
> +	{H_READ,"H_READ"},					\
> +	{H_CLEAR_MOD,"H_CLEAR_MOD"},				\

This is a rather odd way of exposing an array to userspace...

-Scott


--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Hemant Kumar May 12, 2015, 4:16 p.m. | #2
On 05/12/2015 03:44 AM, Scott Wood wrote:
> On Fri, 2015-05-08 at 06:23 +0530, Hemant Kumar wrote:
>> For perf to analyze the KVM events like hcalls, we need the
>> hypervisor calls and their codes to be exported through uapi.
>>
>> This patch moves most of the pSeries hcall codes from
>> arch/powerpc/include/asm/hvcall.h to
>> arch/powerpc/include/uapi/asm/hcall_codes.h.
>> It also moves the mapping <hcall_code-to-hcall_reason> from
>> arch/powerpc/kvm/trace_hv.h to
>> arch/powerpc/include/uapi/asm/trace_hcall.h.
>>
>> Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
>> ---
>>   arch/powerpc/include/asm/hvcall.h           | 120 +--------------------------
>>   arch/powerpc/include/uapi/asm/hcall_codes.h | 123 ++++++++++++++++++++++++++++
>>   arch/powerpc/include/uapi/asm/trace_hcall.h | 122 +++++++++++++++++++++++++++
>>   arch/powerpc/kvm/trace_hv.h                 | 117 +-------------------------
> When moving to uapi please add proper namespacing to indicate that this
> is pseries specific.
>

Sure, will add that.

>> diff --git a/arch/powerpc/include/uapi/asm/trace_hcall.h b/arch/powerpc/include/uapi/asm/trace_hcall.h
>> new file mode 100644
>> index 0000000..00eac01
>> --- /dev/null
>> +++ b/arch/powerpc/include/uapi/asm/trace_hcall.h
>> @@ -0,0 +1,122 @@
>> +#ifndef _KVM_TRACE_HCALL_MAP_H
>> +#define _KVM_TRACE_HCALL_MAP_H
>> +
>> +#include "hcall_codes.h"
>> +
>> +#define kvm_trace_symbol_hcall\
>> +	{H_REMOVE,"H_REMOVE"},					\
>> +	{H_ENTER,"H_ENTER"},					\
>> +	{H_READ,"H_READ"},					\
>> +	{H_CLEAR_MOD,"H_CLEAR_MOD"},				\
> This is a rather odd way of exposing an array to userspace...
>

Didn't get you here. Can you please elaborate?

I see some other files like arch/x86/include/uapi/asm/vmx.h exposing the 
reasons in a similar way.

Thanks for the review.
Scott Wood May 13, 2015, 3:21 a.m. | #3
On Tue, 2015-05-12 at 21:46 +0530, Hemant Kumar wrote:
> On 05/12/2015 03:44 AM, Scott Wood wrote:
> > On Fri, 2015-05-08 at 06:23 +0530, Hemant Kumar wrote:
> >> For perf to analyze the KVM events like hcalls, we need the
> >> hypervisor calls and their codes to be exported through uapi.
> >>
> >> This patch moves most of the pSeries hcall codes from
> >> arch/powerpc/include/asm/hvcall.h to
> >> arch/powerpc/include/uapi/asm/hcall_codes.h.
> >> It also moves the mapping <hcall_code-to-hcall_reason> from
> >> arch/powerpc/kvm/trace_hv.h to
> >> arch/powerpc/include/uapi/asm/trace_hcall.h.
> >>
> >> Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
> >> ---
> >>   arch/powerpc/include/asm/hvcall.h           | 120 +--------------------------
> >>   arch/powerpc/include/uapi/asm/hcall_codes.h | 123 ++++++++++++++++++++++++++++
> >>   arch/powerpc/include/uapi/asm/trace_hcall.h | 122 +++++++++++++++++++++++++++
> >>   arch/powerpc/kvm/trace_hv.h                 | 117 +-------------------------
> > When moving to uapi please add proper namespacing to indicate that this
> > is pseries specific.
> >
> 
> Sure, will add that.

Thanks.

> >> diff --git a/arch/powerpc/include/uapi/asm/trace_hcall.h b/arch/powerpc/include/uapi/asm/trace_hcall.h
> >> new file mode 100644
> >> index 0000000..00eac01
> >> --- /dev/null
> >> +++ b/arch/powerpc/include/uapi/asm/trace_hcall.h
> >> @@ -0,0 +1,122 @@
> >> +#ifndef _KVM_TRACE_HCALL_MAP_H
> >> +#define _KVM_TRACE_HCALL_MAP_H
> >> +
> >> +#include "hcall_codes.h"
> >> +
> >> +#define kvm_trace_symbol_hcall\
> >> +	{H_REMOVE,"H_REMOVE"},					\
> >> +	{H_ENTER,"H_ENTER"},					\
> >> +	{H_READ,"H_READ"},					\
> >> +	{H_CLEAR_MOD,"H_CLEAR_MOD"},				\
> > This is a rather odd way of exposing an array to userspace...
> >
> 
> Didn't get you here. Can you please elaborate?
> 
> I see some other files like arch/x86/include/uapi/asm/vmx.h exposing the 
> reasons in a similar way.

It just seemed like sloppy API to not have any typing associated with it
and require the user to wrap it in an actual array; I wasn't aware there
was precedent for this construction in uapi.  I also would have expected
a macro that doesn't behave like a normal element of C syntax (function,
variable name, type, etc) to have been capitalized.

-Scott



--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 85bc8c0..799677d 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -155,124 +155,8 @@ 
 /* Each control block has to be on a 4K boundary */
 #define H_CB_ALIGNMENT          4096
 
-/* pSeries hypervisor opcodes */
-#define H_REMOVE		0x04
-#define H_ENTER			0x08
-#define H_READ			0x0c
-#define H_CLEAR_MOD		0x10
-#define H_CLEAR_REF		0x14
-#define H_PROTECT		0x18
-#define H_GET_TCE		0x1c
-#define H_PUT_TCE		0x20
-#define H_SET_SPRG0		0x24
-#define H_SET_DABR		0x28
-#define H_PAGE_INIT		0x2c
-#define H_SET_ASR		0x30
-#define H_ASR_ON		0x34
-#define H_ASR_OFF		0x38
-#define H_LOGICAL_CI_LOAD	0x3c
-#define H_LOGICAL_CI_STORE	0x40
-#define H_LOGICAL_CACHE_LOAD	0x44
-#define H_LOGICAL_CACHE_STORE	0x48
-#define H_LOGICAL_ICBI		0x4c
-#define H_LOGICAL_DCBF		0x50
-#define H_GET_TERM_CHAR		0x54
-#define H_PUT_TERM_CHAR		0x58
-#define H_REAL_TO_LOGICAL	0x5c
-#define H_HYPERVISOR_DATA	0x60
-#define H_EOI			0x64
-#define H_CPPR			0x68
-#define H_IPI			0x6c
-#define H_IPOLL			0x70
-#define H_XIRR			0x74
-#define H_PERFMON		0x7c
-#define H_MIGRATE_DMA		0x78
-#define H_REGISTER_VPA		0xDC
-#define H_CEDE			0xE0
-#define H_CONFER		0xE4
-#define H_PROD			0xE8
-#define H_GET_PPP		0xEC
-#define H_SET_PPP		0xF0
-#define H_PURR			0xF4
-#define H_PIC			0xF8
-#define H_REG_CRQ		0xFC
-#define H_FREE_CRQ		0x100
-#define H_VIO_SIGNAL		0x104
-#define H_SEND_CRQ		0x108
-#define H_COPY_RDMA		0x110
-#define H_REGISTER_LOGICAL_LAN	0x114
-#define H_FREE_LOGICAL_LAN	0x118
-#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
-#define H_SEND_LOGICAL_LAN	0x120
-#define H_BULK_REMOVE		0x124
-#define H_MULTICAST_CTRL	0x130
-#define H_SET_XDABR		0x134
-#define H_STUFF_TCE		0x138
-#define H_PUT_TCE_INDIRECT	0x13C
-#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
-#define H_VTERM_PARTNER_INFO	0x150
-#define H_REGISTER_VTERM	0x154
-#define H_FREE_VTERM		0x158
-#define H_RESET_EVENTS          0x15C
-#define H_ALLOC_RESOURCE        0x160
-#define H_FREE_RESOURCE         0x164
-#define H_MODIFY_QP             0x168
-#define H_QUERY_QP              0x16C
-#define H_REREGISTER_PMR        0x170
-#define H_REGISTER_SMR          0x174
-#define H_QUERY_MR              0x178
-#define H_QUERY_MW              0x17C
-#define H_QUERY_HCA             0x180
-#define H_QUERY_PORT            0x184
-#define H_MODIFY_PORT           0x188
-#define H_DEFINE_AQP1           0x18C
-#define H_GET_TRACE_BUFFER      0x190
-#define H_DEFINE_AQP0           0x194
-#define H_RESIZE_MR             0x198
-#define H_ATTACH_MCQP           0x19C
-#define H_DETACH_MCQP           0x1A0
-#define H_CREATE_RPT            0x1A4
-#define H_REMOVE_RPT            0x1A8
-#define H_REGISTER_RPAGES       0x1AC
-#define H_DISABLE_AND_GETC      0x1B0
-#define H_ERROR_DATA            0x1B4
-#define H_GET_HCA_INFO          0x1B8
-#define H_GET_PERF_COUNT        0x1BC
-#define H_MANAGE_TRACE          0x1C0
-#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4
-#define H_QUERY_INT_STATE       0x1E4
-#define H_POLL_PENDING		0x1D8
-#define H_ILLAN_ATTRIBUTES	0x244
-#define H_MODIFY_HEA_QP		0x250
-#define H_QUERY_HEA_QP		0x254
-#define H_QUERY_HEA		0x258
-#define H_QUERY_HEA_PORT	0x25C
-#define H_MODIFY_HEA_PORT	0x260
-#define H_REG_BCMC		0x264
-#define H_DEREG_BCMC		0x268
-#define H_REGISTER_HEA_RPAGES	0x26C
-#define H_DISABLE_AND_GET_HEA	0x270
-#define H_GET_HEA_INFO		0x274
-#define H_ALLOC_HEA_RESOURCE	0x278
-#define H_ADD_CONN		0x284
-#define H_DEL_CONN		0x288
-#define H_JOIN			0x298
-#define H_VASI_STATE            0x2A4
-#define H_ENABLE_CRQ		0x2B0
-#define H_GET_EM_PARMS		0x2B8
-#define H_SET_MPP		0x2D0
-#define H_GET_MPP		0x2D4
-#define H_HOME_NODE_ASSOCIATIVITY 0x2EC
-#define H_BEST_ENERGY		0x2F4
-#define H_XIRR_X		0x2FC
-#define H_RANDOM		0x300
-#define H_COP			0x304
-#define H_GET_MPP_X		0x314
-#define H_SET_MODE		0x31C
-#define MAX_HCALL_OPCODE	H_SET_MODE
-
-/* Platform specific hcalls, used by KVM */
-#define H_RTAS			0xf000
+/* Include pSeries hypervisor opcodes */
+#include <uapi/asm/hcall_codes.h>
 
 /* "Platform specific hcalls", provided by PHYP */
 #define H_GET_24X7_CATALOG_PAGE	0xF078
diff --git a/arch/powerpc/include/uapi/asm/hcall_codes.h b/arch/powerpc/include/uapi/asm/hcall_codes.h
new file mode 100644
index 0000000..59a3761
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/hcall_codes.h
@@ -0,0 +1,123 @@ 
+#ifndef _ASM_POWERPC_HVCALL_CODES_H
+#define _ASM_POWERPC_HVCALL_CODES_H
+
+/* pSeries hypervisor opcodes */
+#define H_REMOVE		0x04
+#define H_ENTER			0x08
+#define H_READ			0x0c
+#define H_CLEAR_MOD		0x10
+#define H_CLEAR_REF		0x14
+#define H_PROTECT		0x18
+#define H_GET_TCE		0x1c
+#define H_PUT_TCE		0x20
+#define H_SET_SPRG0		0x24
+#define H_SET_DABR		0x28
+#define H_PAGE_INIT		0x2c
+#define H_SET_ASR		0x30
+#define H_ASR_ON		0x34
+#define H_ASR_OFF		0x38
+#define H_LOGICAL_CI_LOAD	0x3c
+#define H_LOGICAL_CI_STORE	0x40
+#define H_LOGICAL_CACHE_LOAD	0x44
+#define H_LOGICAL_CACHE_STORE	0x48
+#define H_LOGICAL_ICBI		0x4c
+#define H_LOGICAL_DCBF		0x50
+#define H_GET_TERM_CHAR		0x54
+#define H_PUT_TERM_CHAR		0x58
+#define H_REAL_TO_LOGICAL	0x5c
+#define H_HYPERVISOR_DATA	0x60
+#define H_EOI			0x64
+#define H_CPPR			0x68
+#define H_IPI			0x6c
+#define H_IPOLL			0x70
+#define H_XIRR			0x74
+#define H_PERFMON		0x7c
+#define H_MIGRATE_DMA		0x78
+#define H_REGISTER_VPA		0xDC
+#define H_CEDE			0xE0
+#define H_CONFER		0xE4
+#define H_PROD			0xE8
+#define H_GET_PPP		0xEC
+#define H_SET_PPP		0xF0
+#define H_PURR			0xF4
+#define H_PIC			0xF8
+#define H_REG_CRQ		0xFC
+#define H_FREE_CRQ		0x100
+#define H_VIO_SIGNAL		0x104
+#define H_SEND_CRQ		0x108
+#define H_COPY_RDMA		0x110
+#define H_REGISTER_LOGICAL_LAN	0x114
+#define H_FREE_LOGICAL_LAN	0x118
+#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
+#define H_SEND_LOGICAL_LAN	0x120
+#define H_BULK_REMOVE		0x124
+#define H_MULTICAST_CTRL	0x130
+#define H_SET_XDABR		0x134
+#define H_STUFF_TCE		0x138
+#define H_PUT_TCE_INDIRECT	0x13C
+#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
+#define H_VTERM_PARTNER_INFO	0x150
+#define H_REGISTER_VTERM	0x154
+#define H_FREE_VTERM		0x158
+#define H_RESET_EVENTS          0x15C
+#define H_ALLOC_RESOURCE        0x160
+#define H_FREE_RESOURCE         0x164
+#define H_MODIFY_QP             0x168
+#define H_QUERY_QP              0x16C
+#define H_REREGISTER_PMR        0x170
+#define H_REGISTER_SMR          0x174
+#define H_QUERY_MR              0x178
+#define H_QUERY_MW              0x17C
+#define H_QUERY_HCA             0x180
+#define H_QUERY_PORT            0x184
+#define H_MODIFY_PORT           0x188
+#define H_DEFINE_AQP1           0x18C
+#define H_GET_TRACE_BUFFER      0x190
+#define H_DEFINE_AQP0           0x194
+#define H_RESIZE_MR             0x198
+#define H_ATTACH_MCQP           0x19C
+#define H_DETACH_MCQP           0x1A0
+#define H_CREATE_RPT            0x1A4
+#define H_REMOVE_RPT            0x1A8
+#define H_REGISTER_RPAGES       0x1AC
+#define H_DISABLE_AND_GETC      0x1B0
+#define H_ERROR_DATA            0x1B4
+#define H_GET_HCA_INFO          0x1B8
+#define H_GET_PERF_COUNT        0x1BC
+#define H_MANAGE_TRACE          0x1C0
+#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4
+#define H_QUERY_INT_STATE       0x1E4
+#define H_POLL_PENDING		0x1D8
+#define H_ILLAN_ATTRIBUTES	0x244
+#define H_MODIFY_HEA_QP		0x250
+#define H_QUERY_HEA_QP		0x254
+#define H_QUERY_HEA		0x258
+#define H_QUERY_HEA_PORT	0x25C
+#define H_MODIFY_HEA_PORT	0x260
+#define H_REG_BCMC		0x264
+#define H_DEREG_BCMC		0x268
+#define H_REGISTER_HEA_RPAGES	0x26C
+#define H_DISABLE_AND_GET_HEA	0x270
+#define H_GET_HEA_INFO		0x274
+#define H_ALLOC_HEA_RESOURCE	0x278
+#define H_ADD_CONN		0x284
+#define H_DEL_CONN		0x288
+#define H_JOIN			0x298
+#define H_VASI_STATE            0x2A4
+#define H_ENABLE_CRQ		0x2B0
+#define H_GET_EM_PARMS		0x2B8
+#define H_SET_MPP		0x2D0
+#define H_GET_MPP		0x2D4
+#define H_HOME_NODE_ASSOCIATIVITY 0x2EC
+#define H_BEST_ENERGY		0x2F4
+#define H_XIRR_X		0x2FC
+#define H_RANDOM		0x300
+#define H_COP			0x304
+#define H_GET_MPP_X		0x314
+#define H_SET_MODE		0x31C
+#define MAX_HCALL_OPCODE	H_SET_MODE
+
+/* Platform specific hcalls, used by KVM */
+#define H_RTAS			0xf000
+
+#endif
diff --git a/arch/powerpc/include/uapi/asm/trace_hcall.h b/arch/powerpc/include/uapi/asm/trace_hcall.h
new file mode 100644
index 0000000..00eac01
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/trace_hcall.h
@@ -0,0 +1,122 @@ 
+#ifndef _KVM_TRACE_HCALL_MAP_H
+#define _KVM_TRACE_HCALL_MAP_H
+
+#include "hcall_codes.h"
+
+#define kvm_trace_symbol_hcall\
+	{H_REMOVE,"H_REMOVE"},					\
+	{H_ENTER,"H_ENTER"},					\
+	{H_READ,"H_READ"},					\
+	{H_CLEAR_MOD,"H_CLEAR_MOD"},				\
+	{H_CLEAR_REF,"H_CLEAR_REF"},				\
+	{H_PROTECT,"H_PROTECT"},				\
+	{H_GET_TCE,"H_GET_TCE"},				\
+	{H_PUT_TCE,"H_PUT_TCE"},				\
+	{H_SET_SPRG0,"H_SET_SPRG0"},				\
+	{H_SET_DABR,"H_SET_DABR"},				\
+	{H_PAGE_INIT,"H_PAGE_INIT"},				\
+	{H_SET_ASR,"H_SET_ASR"},				\
+	{H_ASR_ON,"H_ASR_ON"},					\
+	{H_ASR_OFF,"H_ASR_OFF"},				\
+	{H_LOGICAL_CI_LOAD,"H_LOGICAL_CI_LOAD"},		\
+	{H_LOGICAL_CI_STORE,"H_LOGICAL_CI_STORE"},		\
+	{H_LOGICAL_CACHE_LOAD,"H_LOGICAL_CACHE_LOAD"},		\
+	{H_LOGICAL_CACHE_STORE,"H_LOGICAL_CACHE_STORE"},	\
+	{H_LOGICAL_ICBI,"H_LOGICAL_ICBI"},			\
+	{H_LOGICAL_DCBF,"H_LOGICAL_DCBF"},			\
+	{H_GET_TERM_CHAR,"H_GET_TERM_CHAR"},			\
+	{H_PUT_TERM_CHAR,"H_PUT_TERM_CHAR"},			\
+	{H_REAL_TO_LOGICAL,"H_REAL_TO_LOGICAL"},		\
+	{H_HYPERVISOR_DATA,"H_HYPERVISOR_DATA"},		\
+	{H_EOI,"H_EOI"},					\
+	{H_CPPR,"H_CPPR"},					\
+	{H_IPI,"H_IPI"},					\
+	{H_IPOLL,"H_IPOLL"},					\
+	{H_XIRR,"H_XIRR"},					\
+	{H_PERFMON,"H_PERFMON"},				\
+	{H_MIGRATE_DMA,"H_MIGRATE_DMA"},			\
+	{H_REGISTER_VPA,"H_REGISTER_VPA"},			\
+	{H_CEDE,"H_CEDE"},					\
+	{H_CONFER,"H_CONFER"},					\
+	{H_PROD,"H_PROD"},					\
+	{H_GET_PPP,"H_GET_PPP"},				\
+	{H_SET_PPP,"H_SET_PPP"},				\
+	{H_PURR,"H_PURR"},					\
+	{H_PIC,"H_PIC"},					\
+	{H_REG_CRQ,"H_REG_CRQ"},				\
+	{H_FREE_CRQ,"H_FREE_CRQ"},				\
+	{H_VIO_SIGNAL,"H_VIO_SIGNAL"},				\
+	{H_SEND_CRQ,"H_SEND_CRQ"},				\
+	{H_COPY_RDMA,"H_COPY_RDMA"},				\
+	{H_REGISTER_LOGICAL_LAN,"H_REGISTER_LOGICAL_LAN"},	\
+	{H_FREE_LOGICAL_LAN,"H_FREE_LOGICAL_LAN"},		\
+	{H_ADD_LOGICAL_LAN_BUFFER,"H_ADD_LOGICAL_LAN_BUFFER"},	\
+	{H_SEND_LOGICAL_LAN,"H_SEND_LOGICAL_LAN"},		\
+	{H_BULK_REMOVE,"H_BULK_REMOVE"},			\
+	{H_MULTICAST_CTRL,"H_MULTICAST_CTRL"},			\
+	{H_SET_XDABR,"H_SET_XDABR"},				\
+	{H_STUFF_TCE,"H_STUFF_TCE"},				\
+	{H_PUT_TCE_INDIRECT,"H_PUT_TCE_INDIRECT"},		\
+	{H_CHANGE_LOGICAL_LAN_MAC,"H_CHANGE_LOGICAL_LAN_MAC"},	\
+	{H_VTERM_PARTNER_INFO,"H_VTERM_PARTNER_INFO"},		\
+	{H_REGISTER_VTERM,"H_REGISTER_VTERM"},			\
+	{H_FREE_VTERM,"H_FREE_VTERM"},				\
+	{H_RESET_EVENTS,"H_RESET_EVENTS"},			\
+	{H_ALLOC_RESOURCE,"H_ALLOC_RESOURCE"},			\
+	{H_FREE_RESOURCE,"H_FREE_RESOURCE"},			\
+	{H_MODIFY_QP,"H_MODIFY_QP"},				\
+	{H_QUERY_QP,"H_QUERY_QP"},				\
+	{H_REREGISTER_PMR,"H_REREGISTER_PMR"},			\
+	{H_REGISTER_SMR,"H_REGISTER_SMR"},			\
+	{H_QUERY_MR,"H_QUERY_MR"},				\
+	{H_QUERY_MW,"H_QUERY_MW"},				\
+	{H_QUERY_HCA,"H_QUERY_HCA"},				\
+	{H_QUERY_PORT,"H_QUERY_PORT"},				\
+	{H_MODIFY_PORT,"H_MODIFY_PORT"},			\
+	{H_DEFINE_AQP1,"H_DEFINE_AQP1"},			\
+	{H_GET_TRACE_BUFFER,"H_GET_TRACE_BUFFER"},		\
+	{H_DEFINE_AQP0,"H_DEFINE_AQP0"},			\
+	{H_RESIZE_MR,"H_RESIZE_MR"},				\
+	{H_ATTACH_MCQP,"H_ATTACH_MCQP"},			\
+	{H_DETACH_MCQP,"H_DETACH_MCQP"},			\
+	{H_CREATE_RPT,"H_CREATE_RPT"},				\
+	{H_REMOVE_RPT,"H_REMOVE_RPT"},				\
+	{H_REGISTER_RPAGES,"H_REGISTER_RPAGES"},		\
+	{H_DISABLE_AND_GETC,"H_DISABLE_AND_GETC"},		\
+	{H_ERROR_DATA,"H_ERROR_DATA"},				\
+	{H_GET_HCA_INFO,"H_GET_HCA_INFO"},			\
+	{H_GET_PERF_COUNT,"H_GET_PERF_COUNT"},			\
+	{H_MANAGE_TRACE,"H_MANAGE_TRACE"},			\
+	{H_FREE_LOGICAL_LAN_BUFFER,"H_FREE_LOGICAL_LAN_BUFFER"},\
+	{H_QUERY_INT_STATE,"H_QUERY_INT_STATE"},		\
+	{H_POLL_PENDING,"H_POLL_PENDING"},			\
+	{H_ILLAN_ATTRIBUTES,"H_ILLAN_ATTRIBUTES"},		\
+	{H_MODIFY_HEA_QP,"H_MODIFY_HEA_QP"},			\
+	{H_QUERY_HEA_QP,"H_QUERY_HEA_QP"},			\
+	{H_QUERY_HEA,"H_QUERY_HEA"},				\
+	{H_QUERY_HEA_PORT,"H_QUERY_HEA_PORT"},			\
+	{H_MODIFY_HEA_PORT,"H_MODIFY_HEA_PORT"},		\
+	{H_REG_BCMC,"H_REG_BCMC"},				\
+	{H_DEREG_BCMC,"H_DEREG_BCMC"},				\
+	{H_REGISTER_HEA_RPAGES,"H_REGISTER_HEA_RPAGES"},	\
+	{H_DISABLE_AND_GET_HEA,"H_DISABLE_AND_GET_HEA"},	\
+	{H_GET_HEA_INFO,"H_GET_HEA_INFO"},			\
+	{H_ALLOC_HEA_RESOURCE,"H_ALLOC_HEA_RESOURCE"},		\
+	{H_ADD_CONN,"H_ADD_CONN"},				\
+	{H_DEL_CONN,"H_DEL_CONN"},				\
+	{H_JOIN,"H_JOIN"},					\
+	{H_VASI_STATE,"H_VASI_STATE"},				\
+	{H_ENABLE_CRQ,"H_ENABLE_CRQ"},				\
+	{H_GET_EM_PARMS,"H_GET_EM_PARMS"},			\
+	{H_SET_MPP,"H_SET_MPP"},				\
+	{H_GET_MPP,"H_GET_MPP"},				\
+	{H_HOME_NODE_ASSOCIATIVITY,"H_HOME_NODE_ASSOCIATIVITY"},\
+	{H_BEST_ENERGY,"H_BEST_ENERGY"},			\
+	{H_XIRR_X,"H_XIRR_X"},					\
+	{H_RANDOM,"H_RANDOM"},					\
+	{H_COP,"H_COP"},					\
+	{H_GET_MPP_X,"H_GET_MPP_X"},				\
+	{H_SET_MODE,"H_SET_MODE"},				\
+	{H_RTAS,"H_RTAS"}
+
+#endif
diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h
index 02d0a07..6063aa9 100644
--- a/arch/powerpc/kvm/trace_hv.h
+++ b/arch/powerpc/kvm/trace_hv.h
@@ -3,6 +3,7 @@ 
 
 #include <linux/tracepoint.h>
 #include <uapi/asm/trace_book3s.h>
+#include <uapi/asm/trace_hcall.h>
 #include <asm/hvcall.h>
 #include <asm/kvm_asm.h>
 
@@ -11,122 +12,6 @@ 
 #define TRACE_INCLUDE_PATH .
 #define TRACE_INCLUDE_FILE trace_hv
 
-#define kvm_trace_symbol_hcall \
-	{H_REMOVE,			"H_REMOVE"}, \
-	{H_ENTER,			"H_ENTER"}, \
-	{H_READ,			"H_READ"}, \
-	{H_CLEAR_MOD,			"H_CLEAR_MOD"}, \
-	{H_CLEAR_REF,			"H_CLEAR_REF"}, \
-	{H_PROTECT,			"H_PROTECT"}, \
-	{H_GET_TCE,			"H_GET_TCE"}, \
-	{H_PUT_TCE,			"H_PUT_TCE"}, \
-	{H_SET_SPRG0,			"H_SET_SPRG0"}, \
-	{H_SET_DABR,			"H_SET_DABR"}, \
-	{H_PAGE_INIT,			"H_PAGE_INIT"}, \
-	{H_SET_ASR,			"H_SET_ASR"}, \
-	{H_ASR_ON,			"H_ASR_ON"}, \
-	{H_ASR_OFF,			"H_ASR_OFF"}, \
-	{H_LOGICAL_CI_LOAD,		"H_LOGICAL_CI_LOAD"}, \
-	{H_LOGICAL_CI_STORE,		"H_LOGICAL_CI_STORE"}, \
-	{H_LOGICAL_CACHE_LOAD,		"H_LOGICAL_CACHE_LOAD"}, \
-	{H_LOGICAL_CACHE_STORE,		"H_LOGICAL_CACHE_STORE"}, \
-	{H_LOGICAL_ICBI,		"H_LOGICAL_ICBI"}, \
-	{H_LOGICAL_DCBF,		"H_LOGICAL_DCBF"}, \
-	{H_GET_TERM_CHAR,		"H_GET_TERM_CHAR"}, \
-	{H_PUT_TERM_CHAR,		"H_PUT_TERM_CHAR"}, \
-	{H_REAL_TO_LOGICAL,		"H_REAL_TO_LOGICAL"}, \
-	{H_HYPERVISOR_DATA,		"H_HYPERVISOR_DATA"}, \
-	{H_EOI,				"H_EOI"}, \
-	{H_CPPR,			"H_CPPR"}, \
-	{H_IPI,				"H_IPI"}, \
-	{H_IPOLL,			"H_IPOLL"}, \
-	{H_XIRR,			"H_XIRR"}, \
-	{H_PERFMON,			"H_PERFMON"}, \
-	{H_MIGRATE_DMA,			"H_MIGRATE_DMA"}, \
-	{H_REGISTER_VPA,		"H_REGISTER_VPA"}, \
-	{H_CEDE,			"H_CEDE"}, \
-	{H_CONFER,			"H_CONFER"}, \
-	{H_PROD,			"H_PROD"}, \
-	{H_GET_PPP,			"H_GET_PPP"}, \
-	{H_SET_PPP,			"H_SET_PPP"}, \
-	{H_PURR,			"H_PURR"}, \
-	{H_PIC,				"H_PIC"}, \
-	{H_REG_CRQ,			"H_REG_CRQ"}, \
-	{H_FREE_CRQ,			"H_FREE_CRQ"}, \
-	{H_VIO_SIGNAL,			"H_VIO_SIGNAL"}, \
-	{H_SEND_CRQ,			"H_SEND_CRQ"}, \
-	{H_COPY_RDMA,			"H_COPY_RDMA"}, \
-	{H_REGISTER_LOGICAL_LAN,	"H_REGISTER_LOGICAL_LAN"}, \
-	{H_FREE_LOGICAL_LAN,		"H_FREE_LOGICAL_LAN"}, \
-	{H_ADD_LOGICAL_LAN_BUFFER,	"H_ADD_LOGICAL_LAN_BUFFER"}, \
-	{H_SEND_LOGICAL_LAN,		"H_SEND_LOGICAL_LAN"}, \
-	{H_BULK_REMOVE,			"H_BULK_REMOVE"}, \
-	{H_MULTICAST_CTRL,		"H_MULTICAST_CTRL"}, \
-	{H_SET_XDABR,			"H_SET_XDABR"}, \
-	{H_STUFF_TCE,			"H_STUFF_TCE"}, \
-	{H_PUT_TCE_INDIRECT,		"H_PUT_TCE_INDIRECT"}, \
-	{H_CHANGE_LOGICAL_LAN_MAC,	"H_CHANGE_LOGICAL_LAN_MAC"}, \
-	{H_VTERM_PARTNER_INFO,		"H_VTERM_PARTNER_INFO"}, \
-	{H_REGISTER_VTERM,		"H_REGISTER_VTERM"}, \
-	{H_FREE_VTERM,			"H_FREE_VTERM"}, \
-	{H_RESET_EVENTS,		"H_RESET_EVENTS"}, \
-	{H_ALLOC_RESOURCE,		"H_ALLOC_RESOURCE"}, \
-	{H_FREE_RESOURCE,		"H_FREE_RESOURCE"}, \
-	{H_MODIFY_QP,			"H_MODIFY_QP"}, \
-	{H_QUERY_QP,			"H_QUERY_QP"}, \
-	{H_REREGISTER_PMR,		"H_REREGISTER_PMR"}, \
-	{H_REGISTER_SMR,		"H_REGISTER_SMR"}, \
-	{H_QUERY_MR,			"H_QUERY_MR"}, \
-	{H_QUERY_MW,			"H_QUERY_MW"}, \
-	{H_QUERY_HCA,			"H_QUERY_HCA"}, \
-	{H_QUERY_PORT,			"H_QUERY_PORT"}, \
-	{H_MODIFY_PORT,			"H_MODIFY_PORT"}, \
-	{H_DEFINE_AQP1,			"H_DEFINE_AQP1"}, \
-	{H_GET_TRACE_BUFFER,		"H_GET_TRACE_BUFFER"}, \
-	{H_DEFINE_AQP0,			"H_DEFINE_AQP0"}, \
-	{H_RESIZE_MR,			"H_RESIZE_MR"}, \
-	{H_ATTACH_MCQP,			"H_ATTACH_MCQP"}, \
-	{H_DETACH_MCQP,			"H_DETACH_MCQP"}, \
-	{H_CREATE_RPT,			"H_CREATE_RPT"}, \
-	{H_REMOVE_RPT,			"H_REMOVE_RPT"}, \
-	{H_REGISTER_RPAGES,		"H_REGISTER_RPAGES"}, \
-	{H_DISABLE_AND_GETC,		"H_DISABLE_AND_GETC"}, \
-	{H_ERROR_DATA,			"H_ERROR_DATA"}, \
-	{H_GET_HCA_INFO,		"H_GET_HCA_INFO"}, \
-	{H_GET_PERF_COUNT,		"H_GET_PERF_COUNT"}, \
-	{H_MANAGE_TRACE,		"H_MANAGE_TRACE"}, \
-	{H_FREE_LOGICAL_LAN_BUFFER,	"H_FREE_LOGICAL_LAN_BUFFER"}, \
-	{H_QUERY_INT_STATE,		"H_QUERY_INT_STATE"}, \
-	{H_POLL_PENDING,		"H_POLL_PENDING"}, \
-	{H_ILLAN_ATTRIBUTES,		"H_ILLAN_ATTRIBUTES"}, \
-	{H_MODIFY_HEA_QP,		"H_MODIFY_HEA_QP"}, \
-	{H_QUERY_HEA_QP,		"H_QUERY_HEA_QP"}, \
-	{H_QUERY_HEA,			"H_QUERY_HEA"}, \
-	{H_QUERY_HEA_PORT,		"H_QUERY_HEA_PORT"}, \
-	{H_MODIFY_HEA_PORT,		"H_MODIFY_HEA_PORT"}, \
-	{H_REG_BCMC,			"H_REG_BCMC"}, \
-	{H_DEREG_BCMC,			"H_DEREG_BCMC"}, \
-	{H_REGISTER_HEA_RPAGES,		"H_REGISTER_HEA_RPAGES"}, \
-	{H_DISABLE_AND_GET_HEA,		"H_DISABLE_AND_GET_HEA"}, \
-	{H_GET_HEA_INFO,		"H_GET_HEA_INFO"}, \
-	{H_ALLOC_HEA_RESOURCE,		"H_ALLOC_HEA_RESOURCE"}, \
-	{H_ADD_CONN,			"H_ADD_CONN"}, \
-	{H_DEL_CONN,			"H_DEL_CONN"}, \
-	{H_JOIN,			"H_JOIN"}, \
-	{H_VASI_STATE,			"H_VASI_STATE"}, \
-	{H_ENABLE_CRQ,			"H_ENABLE_CRQ"}, \
-	{H_GET_EM_PARMS,		"H_GET_EM_PARMS"}, \
-	{H_SET_MPP,			"H_SET_MPP"}, \
-	{H_GET_MPP,			"H_GET_MPP"}, \
-	{H_HOME_NODE_ASSOCIATIVITY,	"H_HOME_NODE_ASSOCIATIVITY"}, \
-	{H_BEST_ENERGY,			"H_BEST_ENERGY"}, \
-	{H_XIRR_X,			"H_XIRR_X"}, \
-	{H_RANDOM,			"H_RANDOM"}, \
-	{H_COP,				"H_COP"}, \
-	{H_GET_MPP_X,			"H_GET_MPP_X"}, \
-	{H_SET_MODE,			"H_SET_MODE"}, \
-	{H_RTAS,			"H_RTAS"}
-
 #define kvm_trace_symbol_kvmret \
 	{RESUME_GUEST,			"RESUME_GUEST"}, \
 	{RESUME_GUEST_NV,		"RESUME_GUEST_NV"}, \