Commit 17a8186c authored by Damian Muszynski's avatar Damian Muszynski Committed by Aichun Shi
Browse files

crypto: qat - add sysfs_added flag for rate limiting 

mainline inclusion
from mainline-v6.8-rc1
commit d71fdd0f3c278c7f132c3a522645ebf9157edd6d
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9A5BW
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d71fdd0f3c278c7f132c3a522645ebf9157edd6d



-------------------------------------

The qat_rl sysfs attribute group is registered within the adf_dev_start()
function, alongside other driver components.
If any of the functions preceding the group registration fails,
the adf_dev_start() function returns, and the caller, to undo the
operation, invokes adf_dev_stop() followed by adf_dev_shutdown().
However, the current flow lacks information about whether the
registration of the qat_rl attribute group was successful or not.

In cases where this condition is encountered, an error similar to
the following might be reported:

    4xxx 0000:6b:00.0: Starting device qat_dev0
    4xxx 0000:6b:00.0: qat_dev0 started 9 acceleration engines
    4xxx 0000:6b:00.0: Failed to send init message
    4xxx 0000:6b:00.0: Failed to start device qat_dev0
    sysfs group 'qat_rl' not found for kobject '0000:6b:00.0'
    ...
    sysfs_remove_groups+0x2d/0x50
    adf_sysfs_rl_rm+0x44/0x70 [intel_qat]
    adf_rl_stop+0x2d/0xb0 [intel_qat]
    adf_dev_stop+0x33/0x1d0 [intel_qat]
    adf_dev_down+0xf1/0x150 [intel_qat]
    ...
    4xxx 0000:6b:00.0: qat_dev0 stopped 9 acceleration engines
    4xxx 0000:6b:00.0: Resetting device qat_dev0

To prevent attempting to remove attributes from a group that has not
been added yet, a flag named 'sysfs_added' is introduced. This flag
is set to true upon the successful registration of the attribute group.

Intel-SIG: commit d71fdd0f3c27 crypto: qat - add sysfs_added flag for rate limiting
Backport to support QAT in-tree driver

Fixes: d9fb8408376e ("crypto: qat - add rate limiting feature to qat_4xxx")
Signed-off-by: default avatarDamian Muszynski <damian.muszynski@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarAhsan Atta <ahsan.atta@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
[ Aichun Shi: amend commit log ]
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent 27b26543

drivers/crypto/intel/qat/qat_common/adf_rl.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct adf_rl_interface_data { 
	struct adf_rl_sla_input_data input;

	enum adf_base_services cap_rem_srv;

	struct rw_semaphore lock;

	bool sysfs_added;

};



struct adf_rl_hw_data {

drivers/crypto/intel/qat/qat_common/adf_sysfs_rl.c

+8 −0
Original line number Diff line number Diff line
@@ -441,11 +441,19 @@ int adf_sysfs_rl_add(struct adf_accel_dev *accel_dev) 


	data->cap_rem_srv = ADF_SVC_NONE;

	data->input.srv = ADF_SVC_NONE;

	data->sysfs_added = true;



	return ret;

}



void adf_sysfs_rl_rm(struct adf_accel_dev *accel_dev)

{

	struct adf_rl_interface_data *data;



	data = &GET_RL_STRUCT(accel_dev);

	if (!data->sysfs_added)

		return;



	device_remove_group(&GET_DEV(accel_dev), &qat_rl_group);

	data->sysfs_added = false;

}