drm/xe/uapi: Fix various struct padding for 64b alignment

Let's respect Documentation/process/botching-up-ioctls.rst
and add the proper padding for a 64b alignment with all as
well as all the required checks and settings for the pads
and the reserved entries.

v2: Fix remaining holes and double check with pahole (Jose)
    Ensure with pahole that both 32b and 64b have exact same
    layout (Thomas)
    Do not set query's pad and reserved bits to zero since it
    is redundant and already done by kzalloc (Matt)

v3: Fix alignment after rebase (José Roberto de Souza)

v4: Fix pad check (Francois Dugast)

Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Francois Dugast <francois.dugast@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 0bd1b3581945a5a55abcda21621983805496eb05..9cc78986dbd3f9369364161bb67a546002fcdb12 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -1894,7 +1894,8 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data,
        u32 handle;
        int err;
 
-       if (XE_IOCTL_DBG(xe, args->extensions) || XE_IOCTL_DBG(xe, args->pad) ||
+       if (XE_IOCTL_DBG(xe, args->extensions) ||
+           XE_IOCTL_DBG(xe, args->pad[0] || args->pad[1] || args->pad[2]) ||
            XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]))
                return -EINVAL;
 

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index 4461dd1c9e4032aaea324022b3e00a506e92d10c..56d61bf596b2bc910e83daf1b76f077b58535db9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -372,6 +372,7 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query
                return -ENOMEM;
 
        gt_list->num_gt = xe->info.gt_count;
+
        for_each_gt(gt, xe, id) {
                if (xe_gt_is_media_type(gt))
                        gt_list->gt_list[id].type = DRM_XE_QUERY_GT_TYPE_MEDIA;

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index ff22eddc25785d434b5e86f15fdac909f0441ce3..622a869fd18e92900e99cb4b6ef872c216293180 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -2825,6 +2825,10 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe,
        int err;
        int i;
 
+       if (XE_IOCTL_DBG(xe, args->pad || args->pad2) ||
+           XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]))
+               return -EINVAL;
+
        if (XE_IOCTL_DBG(xe, args->extensions) ||
            XE_IOCTL_DBG(xe, !args->num_binds) ||
            XE_IOCTL_DBG(xe, args->num_binds > MAX_BINDS))
@@ -2963,6 +2967,10 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
        if (err)
                return err;
 
+       if (XE_IOCTL_DBG(xe, args->pad || args->pad2) ||
+           XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]))
+               return -EINVAL;
+
        if (args->exec_queue_id) {
                q = xe_exec_queue_lookup(xef, args->exec_queue_id);
                if (XE_IOCTL_DBG(xe, !q)) {

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 584fe08e775c79bbdc46f9bd14e2e1f2e70c710f..512c39ea5d5035081816e2515e1a49613be72dae 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -212,8 +212,6 @@ struct drm_xe_mem_region {
         * a unique pair.
         */
        __u16 instance;
-       /** @pad: MBZ */
-       __u32 pad;
        /**
         * @min_page_size: Min page-size in bytes for this region.
         *
@@ -382,6 +380,8 @@ struct drm_xe_gt {
        __u16 tile_id;
        /** @gt_id: Unique ID of this GT within the PCI Device */
        __u16 gt_id;
+       /** @pad: MBZ */
+       __u16 pad[3];
        /** @reference_clock: A clock frequency for timestamp */
        __u32 reference_clock;
        /**
@@ -601,7 +601,7 @@ struct drm_xe_gem_create {
 #define DRM_XE_GEM_CPU_CACHING_WC                      2
        __u16 cpu_caching;
        /** @pad: MBZ */
-       __u16 pad;
+       __u16 pad[3];
 
        /** @reserved: Reserved */
        __u64 reserved[2];
@@ -782,6 +782,9 @@ struct drm_xe_vm_bind_op {
         */
        __u32 prefetch_mem_region_instance;
 
+       /** @pad: MBZ */
+       __u32 pad2;
+
        /** @reserved: Reserved */
        __u64 reserved[3];
 };
@@ -800,12 +803,12 @@ struct drm_xe_vm_bind {
         */
        __u32 exec_queue_id;
 
-       /** @num_binds: number of binds in this IOCTL */
-       __u32 num_binds;
-
        /** @pad: MBZ */
        __u32 pad;
 
+       /** @num_binds: number of binds in this IOCTL */
+       __u32 num_binds;
+
        union {
                /** @bind: used if num_binds == 1 */
                struct drm_xe_vm_bind_op bind;
@@ -817,12 +820,12 @@ struct drm_xe_vm_bind {
                __u64 vector_of_binds;
        };
 
+       /** @pad: MBZ */
+       __u32 pad2;
+
        /** @num_syncs: amount of syncs to wait on */
        __u32 num_syncs;
 
-       /** @pad2: MBZ */
-       __u32 pad2;
-
        /** @syncs: pointer to struct drm_xe_sync array */
        __u64 syncs;