[PATCH 2/2] uapi: fix more linux/kfd_ioctl.h userspace compilation errors

[PATCH 2/2] uapi: fix more linux/kfd_ioctl.h userspace compilation errors

[Dmitry V. Levin]

Consistently use types provided by <linux/types.h> via <drm/drm.h>
to fix struct kfd_ioctl_get_queue_wave_state_args userspace compilation errors.

Fixes: 5df099e8bc83f ("drm/amdkfd: Add wavefront context save state retrieval ioctl")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
 include/uapi/linux/kfd_ioctl.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index dae897f38e59..b01eb502d49c 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -83,11 +83,11 @@ struct kfd_ioctl_set_cu_mask_args {
 };
 
 struct kfd_ioctl_get_queue_wave_state_args {
-	uint64_t ctl_stack_address;	/* to KFD */
-	uint32_t ctl_stack_used_size;	/* from KFD */
-	uint32_t save_area_used_size;	/* from KFD */
-	uint32_t queue_id;		/* to KFD */
-	uint32_t pad;
+	__u64 ctl_stack_address;	/* to KFD */
+	__u32 ctl_stack_used_size;	/* from KFD */
+	__u32 save_area_used_size;	/* from KFD */
+	__u32 queue_id;			/* to KFD */
+	__u32 pad;
 };
 
 /* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
-- 
ldv

Re: [PATCH 2/2] uapi: fix more linux/kfd_ioctl.h userspace compilation errors

[Kuehling, Felix]

On 2018-11-01 7:03 a.m., Dmitry V. Levin wrote:
> Consistently use types provided by <linux/types.h> via <drm/drm.h>
> to fix struct kfd_ioctl_get_queue_wave_state_args userspace compilation errors.
>
> Fixes: 5df099e8bc83f ("drm/amdkfd: Add wavefront context save state retrieval ioctl")
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

Thank you for catching this, and sorry for messing it up incrementally.
Our internal branch is already fixed, but I must have missed this when I
cherry-picked older patches.

The series is Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

I also applied it to our amd-staging-drm-next branch.

Regards,
  Felix


> ---
>  include/uapi/linux/kfd_ioctl.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
> index dae897f38e59..b01eb502d49c 100644
> --- a/include/uapi/linux/kfd_ioctl.h
> +++ b/include/uapi/linux/kfd_ioctl.h
> @@ -83,11 +83,11 @@ struct kfd_ioctl_set_cu_mask_args {
>  };
>  
>  struct kfd_ioctl_get_queue_wave_state_args {
> -	uint64_t ctl_stack_address;	/* to KFD */
> -	uint32_t ctl_stack_used_size;	/* from KFD */
> -	uint32_t save_area_used_size;	/* from KFD */
> -	uint32_t queue_id;		/* to KFD */
> -	uint32_t pad;
> +	__u64 ctl_stack_address;	/* to KFD */
> +	__u32 ctl_stack_used_size;	/* from KFD */
> +	__u32 save_area_used_size;	/* from KFD */
> +	__u32 queue_id;			/* to KFD */
> +	__u32 pad;
>  };
>  
>  /* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */