Commit 5a80e4a2 authored by Abdiel Janulgue's avatar Abdiel Janulgue Committed by Chris Wilson
Browse files

drm/i915/query: Split out query item checks 



This simplifies adding new query item objects.

v2: Use query_hdr (Tvrtko, Chris).
    int instead of u32 in return (Tvrtko)
v3: More naming fixes (Tvrtko)

Signed-off-by: default avatarAbdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190211173251.7131-1-abdiel.janulgue@linux.intel.com
parent 36837510

drivers/gpu/drm/i915/i915_query.c

+26 −13
Original line number Diff line number Diff line
@@ -10,12 +10,34 @@ 
#include "i915_query.h"

#include <uapi/drm/i915_drm.h>



static int copy_query_item(void *query_hdr, size_t query_sz,

			   u32 total_length,

			   struct drm_i915_query_item *query_item)

{

	if (query_item->length == 0)

		return total_length;



	if (query_item->length < total_length)

		return -EINVAL;



	if (copy_from_user(query_hdr, u64_to_user_ptr(query_item->data_ptr),

			   query_sz))

		return -EFAULT;



	if (!access_ok(u64_to_user_ptr(query_item->data_ptr),

		       total_length))

		return -EFAULT;



	return 0;

}



static int query_topology_info(struct drm_i915_private *dev_priv,

			       struct drm_i915_query_item *query_item)

{

	const struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;

	struct drm_i915_query_topology_info topo;

	u32 slice_length, subslice_length, eu_length, total_length;

	int ret;



	if (query_item->flags != 0)

		return -EINVAL;
@@ -33,23 +55,14 @@ static int query_topology_info(struct drm_i915_private *dev_priv, 


	total_length = sizeof(topo) + slice_length + subslice_length + eu_length;



	if (query_item->length == 0)

		return total_length;



	if (query_item->length < total_length)

		return -EINVAL;



	if (copy_from_user(&topo, u64_to_user_ptr(query_item->data_ptr),

			   sizeof(topo)))

		return -EFAULT;

	ret = copy_query_item(&topo, sizeof(topo), total_length,

			      query_item);

	if (ret != 0)

		return ret;



	if (topo.flags != 0)

		return -EINVAL;



	if (!access_ok(u64_to_user_ptr(query_item->data_ptr),

		       total_length))

		return -EFAULT;



	memset(&topo, 0, sizeof(topo));

	topo.max_slices = sseu->max_slices;

	topo.max_subslices = sseu->max_subslices;

CRA Git | Maintained and supported by SUSTech CRA and CCSE