Commit 27b26543 authored by Damian Muszynski's avatar Damian Muszynski Committed by Aichun Shi
Browse files

crypto: qat - add sysfs_added flag for ras 

mainline inclusion
from mainline-v6.8-rc1
commit 65089000ba8c2ae713ccac6603319143f3e1c08b
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=65089000ba8c2ae713ccac6603319143f3e1c08b



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

The qat_ras 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_ras 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_ras' not found for kobject '0000:6b:00.0'
    ...
    sysfs_remove_groups+0x29/0x50
    adf_sysfs_stop_ras+0x4b/0x80 [intel_qat]
    adf_dev_stop+0x43/0x1d0 [intel_qat]
    adf_dev_down+0x4b/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 65089000ba8c crypto: qat - add sysfs_added flag for ras
Backport to support QAT in-tree driver

Fixes: 532d7f6bc458 ("crypto: qat - add error counters")
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 edcc6b26

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ enum ras_errors { 


struct adf_error_counters {

	atomic_t counter[ADF_RAS_ERRORS];

	bool sysfs_added;

	bool enabled;

};

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

+6 −1
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ void adf_sysfs_start_ras(struct adf_accel_dev *accel_dev) 
	if (device_add_group(&GET_DEV(accel_dev), &qat_ras_group))

		dev_err(&GET_DEV(accel_dev),

			"Failed to create qat_ras attribute group.\n");



	accel_dev->ras_errors.sysfs_added = true;

}



void adf_sysfs_stop_ras(struct adf_accel_dev *accel_dev)
@@ -106,7 +108,10 @@ void adf_sysfs_stop_ras(struct adf_accel_dev *accel_dev) 
	if (!accel_dev->ras_errors.enabled)

		return;



	if (accel_dev->ras_errors.sysfs_added) {

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

		accel_dev->ras_errors.sysfs_added = false;

	}



	ADF_RAS_ERR_CTR_CLEAR(accel_dev->ras_errors);

}