Commit 85d3f9e8 authored by Ashutosh Dixit's avatar Ashutosh Dixit
Browse files

drm/xe/oa: Allow only certain property changes from config 



Whereas all properties can be specified during OA stream open, when the OA
stream is reconfigured only the config_id and syncs can be specified.

v2: Use separate function table for reconfig case (Jonathan)
    Change bool function args to enum (Matt B)
v3: s/xe_oa_set_property_funcs/xe_oa_set_property_funcs_open/ (Jonathan)

Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Suggested-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241022200352.1192560-8-ashutosh.dixit@intel.com
parent 9920c8b8

drivers/gpu/drm/xe/xe_oa.c

+46 −14
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ enum xe_oa_submit_deps { 
	XE_OA_SUBMIT_ADD_DEPS,

};



enum xe_oa_user_extn_from {

	XE_OA_USER_EXTN_FROM_OPEN,

	XE_OA_USER_EXTN_FROM_CONFIG,

};



struct xe_oa_reg {

	struct xe_reg addr;

	u32 value;
@@ -1255,9 +1260,15 @@ static int xe_oa_set_prop_syncs_user(struct xe_oa *oa, u64 value, 
	return 0;

}



static int xe_oa_set_prop_ret_inval(struct xe_oa *oa, u64 value,

				    struct xe_oa_open_param *param)

{

	return -EINVAL;

}



typedef int (*xe_oa_set_property_fn)(struct xe_oa *oa, u64 value,

				     struct xe_oa_open_param *param);

static const xe_oa_set_property_fn xe_oa_set_property_funcs[] = {

static const xe_oa_set_property_fn xe_oa_set_property_funcs_open[] = {

	[DRM_XE_OA_PROPERTY_OA_UNIT_ID] = xe_oa_set_prop_oa_unit_id,

	[DRM_XE_OA_PROPERTY_SAMPLE_OA] = xe_oa_set_prop_sample_oa,

	[DRM_XE_OA_PROPERTY_OA_METRIC_SET] = xe_oa_set_prop_metric_set,
@@ -1271,8 +1282,22 @@ static const xe_oa_set_property_fn xe_oa_set_property_funcs[] = { 
	[DRM_XE_OA_PROPERTY_SYNCS] = xe_oa_set_prop_syncs_user,

};



static int xe_oa_user_ext_set_property(struct xe_oa *oa, u64 extension,

				       struct xe_oa_open_param *param)

static const xe_oa_set_property_fn xe_oa_set_property_funcs_config[] = {

	[DRM_XE_OA_PROPERTY_OA_UNIT_ID] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_SAMPLE_OA] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_OA_METRIC_SET] = xe_oa_set_prop_metric_set,

	[DRM_XE_OA_PROPERTY_OA_FORMAT] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_OA_DISABLED] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_EXEC_QUEUE_ID] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_OA_ENGINE_INSTANCE] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_NO_PREEMPT] = xe_oa_set_prop_ret_inval,

	[DRM_XE_OA_PROPERTY_NUM_SYNCS] = xe_oa_set_prop_num_syncs,

	[DRM_XE_OA_PROPERTY_SYNCS] = xe_oa_set_prop_syncs_user,

};



static int xe_oa_user_ext_set_property(struct xe_oa *oa, enum xe_oa_user_extn_from from,

				       u64 extension, struct xe_oa_open_param *param)

{

	u64 __user *address = u64_to_user_ptr(extension);

	struct drm_xe_ext_set_property ext;
@@ -1283,23 +1308,30 @@ static int xe_oa_user_ext_set_property(struct xe_oa *oa, u64 extension, 
	if (XE_IOCTL_DBG(oa->xe, err))

		return -EFAULT;



	if (XE_IOCTL_DBG(oa->xe, ext.property >= ARRAY_SIZE(xe_oa_set_property_funcs)) ||

	BUILD_BUG_ON(ARRAY_SIZE(xe_oa_set_property_funcs_open) !=

		     ARRAY_SIZE(xe_oa_set_property_funcs_config));



	if (XE_IOCTL_DBG(oa->xe, ext.property >= ARRAY_SIZE(xe_oa_set_property_funcs_open)) ||

	    XE_IOCTL_DBG(oa->xe, ext.pad))

		return -EINVAL;



	idx = array_index_nospec(ext.property, ARRAY_SIZE(xe_oa_set_property_funcs));

	return xe_oa_set_property_funcs[idx](oa, ext.value, param);

	idx = array_index_nospec(ext.property, ARRAY_SIZE(xe_oa_set_property_funcs_open));



	if (from == XE_OA_USER_EXTN_FROM_CONFIG)

		return xe_oa_set_property_funcs_config[idx](oa, ext.value, param);

	else

		return xe_oa_set_property_funcs_open[idx](oa, ext.value, param);

}



typedef int (*xe_oa_user_extension_fn)(struct xe_oa *oa, u64 extension,

				       struct xe_oa_open_param *param);

typedef int (*xe_oa_user_extension_fn)(struct xe_oa *oa,  enum xe_oa_user_extn_from from,

				       u64 extension, struct xe_oa_open_param *param);

static const xe_oa_user_extension_fn xe_oa_user_extension_funcs[] = {

	[DRM_XE_OA_EXTENSION_SET_PROPERTY] = xe_oa_user_ext_set_property,

};



#define MAX_USER_EXTENSIONS	16

static int xe_oa_user_extensions(struct xe_oa *oa, u64 extension, int ext_number,

				 struct xe_oa_open_param *param)

static int xe_oa_user_extensions(struct xe_oa *oa, enum xe_oa_user_extn_from from, u64 extension,

				 int ext_number, struct xe_oa_open_param *param)

{

	u64 __user *address = u64_to_user_ptr(extension);

	struct drm_xe_user_extension ext;
@@ -1318,12 +1350,12 @@ static int xe_oa_user_extensions(struct xe_oa *oa, u64 extension, int ext_number 
		return -EINVAL;



	idx = array_index_nospec(ext.name, ARRAY_SIZE(xe_oa_user_extension_funcs));

	err = xe_oa_user_extension_funcs[idx](oa, extension, param);

	err = xe_oa_user_extension_funcs[idx](oa, from, extension, param);

	if (XE_IOCTL_DBG(oa->xe, err))

		return err;



	if (ext.next_extension)

		return xe_oa_user_extensions(oa, ext.next_extension, ++ext_number, param);

		return xe_oa_user_extensions(oa, from, ext.next_extension, ++ext_number, param);



	return 0;

}
@@ -1469,7 +1501,7 @@ static long xe_oa_config_locked(struct xe_oa_stream *stream, u64 arg) 
	struct xe_oa_config *config;

	int err;



	err = xe_oa_user_extensions(stream->oa, arg, 0, &param);

	err = xe_oa_user_extensions(stream->oa, XE_OA_USER_EXTN_FROM_CONFIG, arg, 0, &param);

	if (err)

		return err;
@@ -2023,7 +2055,7 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, u64 data, struct drm_file *f 
	}



	param.xef = xef;

	ret = xe_oa_user_extensions(oa, data, 0, &param);

	ret = xe_oa_user_extensions(oa, XE_OA_USER_EXTN_FROM_OPEN, data, 0, &param);

	if (ret)

		return ret;