On Tue, 7 Aug 2012, Konrad Rzeszutek Wilk wrote:
On Mon, Aug 06, 2012 at 03:27:12PM +0100, Stefano Stabellini wrote:
All the original Xen headers have xen_ulong_t as unsigned long type, however when they have been imported in Linux, xen_ulong_t has been replaced with unsigned long. That might work for x86 and ia64 but it does not for arm. Bring back xen_ulong_t and let each architecture define xen_ulong_t as they see fit.
Also explicitly size pointers (__DEFINE_GUEST_HANDLE) to 64 bit.
Looks ok to me.
Considering that I'll have to change it a bit in the next version (remove the apic_physbase and multicall_entry changes), I won't add your acked-by here just yet.
Signed-off-by: Stefano Stabellini stefano.stabellini@eu.citrix.com
arch/arm/include/asm/xen/interface.h | 8 ++++++-- arch/ia64/include/asm/xen/interface.h | 1 + arch/x86/include/asm/xen/interface.h | 1 + include/xen/interface/memory.h | 12 ++++++------ include/xen/interface/physdev.h | 4 ++-- include/xen/interface/version.h | 2 +- include/xen/interface/xen.h | 6 +++--- 7 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/arch/arm/include/asm/xen/interface.h b/arch/arm/include/asm/xen/interface.h index f904dcc..1d3030c 100644 --- a/arch/arm/include/asm/xen/interface.h +++ b/arch/arm/include/asm/xen/interface.h @@ -9,8 +9,11 @@ #include <linux/types.h> +#define uint64_aligned_t uint64_t __attribute__((aligned(8)))
#define __DEFINE_GUEST_HANDLE(name, type) \
- typedef type * __guest_handle_ ## name
- typedef struct { union { type *p; uint64_aligned_t q; }; } \
__guest_handle_ ## name#define DEFINE_GUEST_HANDLE_STRUCT(name) \ __DEFINE_GUEST_HANDLE(name, struct name) @@ -21,13 +24,14 @@ do { \ if (sizeof(hnd) == 8) \ *(uint64_t *)&(hnd) = 0; \
(hnd) = val; \
(hnd).p = val; \#ifndef __ASSEMBLY__ /* Explicitly size integers that represent pfns in the interface with
- Xen so that we can have one ABI that works for 32 and 64 bit guests. */
typedef uint64_t xen_pfn_t; +typedef uint64_t xen_ulong_t; /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h index 686464e..7c83445 100644 --- a/arch/ia64/include/asm/xen/interface.h +++ b/arch/ia64/include/asm/xen/interface.h @@ -71,6 +71,7 @@
- with Xen so that we could have one ABI that works for 32 and 64 bit
- guests. */
typedef unsigned long xen_pfn_t; +typedef unsigned long xen_ulong_t; /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h index 555f94d..28fc621 100644 --- a/arch/x86/include/asm/xen/interface.h +++ b/arch/x86/include/asm/xen/interface.h @@ -51,6 +51,7 @@
- with Xen so that on ARM we can have one ABI that works for 32 and 64
- bit guests. */
typedef unsigned long xen_pfn_t; +typedef unsigned long xen_ulong_t; /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h index abbbff0..b5c3098 100644 --- a/include/xen/interface/memory.h +++ b/include/xen/interface/memory.h @@ -34,7 +34,7 @@ struct xen_memory_reservation { GUEST_HANDLE(xen_pfn_t) extent_start; /* Number of extents, and size/alignment of each (2^extent_order pages). */
- unsigned long nr_extents;
- xen_ulong_t nr_extents; unsigned int extent_order;
/* @@ -92,7 +92,7 @@ struct xen_memory_exchange { * command will be non-zero. * 5. THIS FIELD MUST BE INITIALISED TO ZERO BY THE CALLER! */
- unsigned long nr_exchanged;
- xen_ulong_t nr_exchanged;
}; DEFINE_GUEST_HANDLE_STRUCT(xen_memory_exchange); @@ -148,8 +148,8 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mfn_list); */ #define XENMEM_machphys_mapping 12 struct xen_machphys_mapping {
- unsigned long v_start, v_end; /* Start and end virtual addresses. */
- unsigned long max_mfn; /* Maximum MFN that can be looked up. */
- xen_ulong_t v_start, v_end; /* Start and end virtual addresses. */
- xen_ulong_t max_mfn; /* Maximum MFN that can be looked up. */
}; DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mapping_t); @@ -169,7 +169,7 @@ struct xen_add_to_physmap { unsigned int space; /* Index into source mapping space. */
- unsigned long idx;
- xen_ulong_t idx;
/* GPFN where the source mapping page should appear. */ xen_pfn_t gpfn; @@ -186,7 +186,7 @@ struct xen_translate_gpfn_list { domid_t domid; /* Length of list. */
- unsigned long nr_gpfns;
- xen_ulong_t nr_gpfns;
/* List of GPFNs to translate. */ GUEST_HANDLE(ulong) gpfn_list; diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h index 9ce788d..bc3ae14 100644 --- a/include/xen/interface/physdev.h +++ b/include/xen/interface/physdev.h @@ -56,7 +56,7 @@ struct physdev_eoi { #define PHYSDEVOP_pirq_eoi_gmfn_v2 28 struct physdev_pirq_eoi_gmfn { /* IN */
- unsigned long gmfn;
- xen_ulong_t gmfn;
}; /* @@ -108,7 +108,7 @@ struct physdev_set_iobitmap { #define PHYSDEVOP_apic_write 9 struct physdev_apic { /* IN */
- unsigned long apic_physbase;
- xen_ulong_t apic_physbase; uint32_t reg; /* IN or OUT */ uint32_t value;
diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h index e8b6519..30280c9 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -45,7 +45,7 @@ struct xen_changeset_info { #define XENVER_platform_parameters 5 struct xen_platform_parameters {
- unsigned long virt_start;
- xen_ulong_t virt_start;
}; #define XENVER_get_features 6 diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 42834a3..ec32115 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h @@ -274,9 +274,9 @@ DEFINE_GUEST_HANDLE_STRUCT(mmu_update);
- NB. The fields are natural register size for this architecture.
*/ struct multicall_entry {
- unsigned long op;
- long result;
- unsigned long args[6];
- xen_ulong_t op;
- xen_ulong_t result;
- xen_ulong_t args[6];
}; DEFINE_GUEST_HANDLE_STRUCT(multicall_entry); -- 1.7.2.5