Re: [PATCH for-4.14] mm: fix public declaration of struct xen_mem_acquire_resource

[Julien Grall <julien@xxxxxxx>]

On 23/06/2020 14:52, Roger Pau Monne wrote:
> XENMEM_acquire_resource and it's related structure is currently inside
> a __XEN__ or __XEN_TOOLS__ guarded section to limit it's scope to the
> hypervisor or the toolstack only. This is wrong as the hypercall is
> already being used by the Linux kernel at least, and as such needs to
> be public.
>
> Also switch the usage of uint64_aligned_t to plain uint64_t, as
> uint64_aligned_t is only to be used by the toolstack. Note that the
> layout of the structure will be the same, as the field is already
> naturally aligned to a 8 byte boundary.
>
> No functional change expected.
>
> Fixes: 3f8f12281dd20 ('x86/mm: add HYPERVISOR_memory_op to acquire guest 
> resources')
> Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>

> ---
> Would be good to get this fixed before the release in order to avoid
> shipping bogus headers. Should also be backported.
> ---
>   xen/include/public/memory.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
> index dbd35305df..1767d7d5f5 100644
> --- a/xen/include/public/memory.h
> +++ b/xen/include/public/memory.h
> @@ -607,6 +607,8 @@ struct xen_reserved_device_memory_map {
>   typedef struct xen_reserved_device_memory_map 
> xen_reserved_device_memory_map_t;
>   DEFINE_XEN_GUEST_HANDLE(xen_reserved_device_memory_map_t);
>   
> +#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
> +
>   /*
>    * Get the pages for a particular guest resource, so that they can be
>    * mapped directly by a tools domain.
> @@ -645,7 +647,7 @@ struct xen_mem_acquire_resource {
>        * IN - the index of the initial frame to be mapped. This parameter
>        *      is ignored if nr_frames is 0.
>        */
> -    uint64_aligned_t frame;
> +    uint64_t frame;
>   
>   #define XENMEM_resource_ioreq_server_frame_bufioreq 0
>   #define XENMEM_resource_ioreq_server_frame_ioreq(n) (1 + (n))
> @@ -666,8 +668,6 @@ struct xen_mem_acquire_resource {
>   typedef struct xen_mem_acquire_resource xen_mem_acquire_resource_t;
>   DEFINE_XEN_GUEST_HANDLE(xen_mem_acquire_resource_t);
>   
> -#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
> -
>   /*
>    * XENMEM_get_vnumainfo used by guest to get
>    * vNUMA topology from hypervisor.
--
Julien Grall