Commit cebac66b authored by Weili Qian's avatar Weili Qian Committed by JangShui Yang
Browse files

crypto: hisilicon/qm - check function qp num before alg register 

mainline inclusion
from mainline-v6.7-rc1
commit b42ab1c61a77832040ad42ebf9adf237360e49f7
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I925L9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b42ab1c61a77832040ad42ebf9adf237360e49f7



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

When the Kunpeng accelerator executes tasks such as encryption
and decryption have minimum requirements on the number of device
queues. If the number of queues does not meet the requirement,
the process initialization will fail. Therefore, the driver checks
the number of queues on the device before registering the algorithm.
If the number does not meet the requirements, the driver does not register
the algorithm to crypto subsystem, the device is still added to the
qm_list.

Signed-off-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJangShui Yang <yangjiangshui@h-partners.com>
parent 01fd2c13

drivers/crypto/hisilicon/hpre/hpre_crypto.c

+23 −2
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ struct hpre_ctx; 
#define HPRE_DRV_ECDH_MASK_CAP		BIT(2)

#define HPRE_DRV_X25519_MASK_CAP	BIT(5)



static DEFINE_MUTEX(hpre_algs_lock);

static unsigned int hpre_available_devs;



typedef void (*hpre_cb)(struct hpre_ctx *ctx, void *sqe);



struct hpre_rsa_ctx {
@@ -2202,11 +2205,17 @@ static void hpre_unregister_x25519(struct hisi_qm *qm) 


int hpre_algs_register(struct hisi_qm *qm)

{

	int ret;

	int ret = 0;



	mutex_lock(&hpre_algs_lock);

	if (hpre_available_devs) {

		hpre_available_devs++;

		goto unlock;

	}



	ret = hpre_register_rsa(qm);

	if (ret)

		return ret;

		goto unlock;



	ret = hpre_register_dh(qm);

	if (ret)
@@ -2220,6 +2229,9 @@ int hpre_algs_register(struct hisi_qm *qm) 
	if (ret)

		goto unreg_ecdh;



	hpre_available_devs++;

	mutex_unlock(&hpre_algs_lock);



	return ret;



unreg_ecdh:
@@ -2228,13 +2240,22 @@ int hpre_algs_register(struct hisi_qm *qm) 
	hpre_unregister_dh(qm);

unreg_rsa:

	hpre_unregister_rsa(qm);

unlock:

	mutex_unlock(&hpre_algs_lock);

	return ret;

}



void hpre_algs_unregister(struct hisi_qm *qm)

{

	mutex_lock(&hpre_algs_lock);

	if (--hpre_available_devs)

		goto unlock;



	hpre_unregister_x25519(qm);

	hpre_unregister_ecdh(qm);

	hpre_unregister_dh(qm);

	hpre_unregister_rsa(qm);



unlock:

	mutex_unlock(&hpre_algs_lock);

}

drivers/crypto/hisilicon/hpre/hpre_main.c

+9 −5
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define HPRE_VIA_MSI_DSM		1

#define HPRE_SQE_MASK_OFFSET		8

#define HPRE_SQE_MASK_LEN		24

#define HPRE_CTX_Q_NUM_DEF		1



#define HPRE_DFX_BASE		0x301000

#define HPRE_DFX_COMMON1		0x301400
@@ -1399,10 +1400,11 @@ static int hpre_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (ret)

		dev_warn(&pdev->dev, "init debugfs fail!\n");



	ret = hisi_qm_alg_register(qm, &hpre_devices);

	hisi_qm_add_list(qm, &hpre_devices);

	ret = hisi_qm_alg_register(qm, &hpre_devices, HPRE_CTX_Q_NUM_DEF);

	if (ret < 0) {

		pci_err(pdev, "fail to register algs to crypto!\n");

		goto err_with_qm_start;

		goto err_qm_del_list;

	}



	if (qm->uacce) {
@@ -1424,9 +1426,10 @@ static int hpre_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	return 0;



err_with_alg_register:

	hisi_qm_alg_unregister(qm, &hpre_devices);

	hisi_qm_alg_unregister(qm, &hpre_devices, HPRE_CTX_Q_NUM_DEF);



err_with_qm_start:

err_qm_del_list:

	hisi_qm_del_list(qm, &hpre_devices);

	hpre_debugfs_exit(qm);

	hisi_qm_stop(qm, QM_NORMAL);
@@ -1446,7 +1449,8 @@ static void hpre_remove(struct pci_dev *pdev) 


	hisi_qm_pm_uninit(qm);

	hisi_qm_wait_task_finish(qm, &hpre_devices);

	hisi_qm_alg_unregister(qm, &hpre_devices);

	hisi_qm_alg_unregister(qm, &hpre_devices, HPRE_CTX_Q_NUM_DEF);

	hisi_qm_del_list(qm, &hpre_devices);

	if (qm->fun_type == QM_HW_PF && qm->vfs_num)

		hisi_qm_sriov_disable(pdev, true);

drivers/crypto/hisilicon/qm.c

+16 −31
Original line number Diff line number Diff line
@@ -4862,62 +4862,47 @@ static void qm_cmd_process(struct work_struct *cmd_process) 
}



/**

 * hisi_qm_alg_register() - Register alg to crypto and add qm to qm_list.

 * hisi_qm_alg_register() - Register alg to crypto.

 * @qm: The qm needs add.

 * @qm_list: The qm list.

 * @guard: Guard of qp_num.

 *

 * This function adds qm to qm list, and will register algorithm to

 * crypto when the qm list is empty.

 * Register algorithm to crypto when the function is satisfy guard.

 */

int hisi_qm_alg_register(struct hisi_qm *qm, struct hisi_qm_list *qm_list)

int hisi_qm_alg_register(struct hisi_qm *qm, struct hisi_qm_list *qm_list, int guard)

{

	struct device *dev = &qm->pdev->dev;

	int flag = 0;

	int ret = 0;



	mutex_lock(&qm_list->lock);

	if (list_empty(&qm_list->list))

		flag = 1;

	list_add_tail(&qm->list, &qm_list->list);

	mutex_unlock(&qm_list->lock);



	if (qm->ver <= QM_HW_V2 && qm->use_sva) {

		dev_info(dev, "HW V2 not both use uacce sva mode and hardware crypto algs.\n");

		return 0;

	}



	if (flag) {

		ret = qm_list->register_to_crypto(qm);

		if (ret) {

			mutex_lock(&qm_list->lock);

			list_del(&qm->list);

			mutex_unlock(&qm_list->lock);

		}

	if (qm->qp_num < guard) {

		dev_info(dev, "qp_num is less than task need.\n");

		return 0;

	}



	return ret;

	return qm_list->register_to_crypto(qm);

}

EXPORT_SYMBOL_GPL(hisi_qm_alg_register);



/**

 * hisi_qm_alg_unregister() - Unregister alg from crypto and delete qm from

 * qm list.

 * hisi_qm_alg_unregister() - Unregister alg from crypto.

 * @qm: The qm needs delete.

 * @qm_list: The qm list.

 * @guard: Guard of qp_num.

 *

 * This function deletes qm from qm list, and will unregister algorithm

 * from crypto when the qm list is empty.

 * Unregister algorithm from crypto when the last function is satisfy guard.

 */

void hisi_qm_alg_unregister(struct hisi_qm *qm, struct hisi_qm_list *qm_list)

void hisi_qm_alg_unregister(struct hisi_qm *qm, struct hisi_qm_list *qm_list, int guard)

{

	mutex_lock(&qm_list->lock);

	list_del(&qm->list);

	mutex_unlock(&qm_list->lock);



	if (qm->ver <= QM_HW_V2 && qm->use_sva)

		return;



	if (list_empty(&qm_list->list))

	if (qm->qp_num < guard)

		return;



	qm_list->unregister_from_crypto(qm);

}

EXPORT_SYMBOL_GPL(hisi_qm_alg_unregister);

drivers/crypto/hisilicon/sec2/sec_crypto.c

+28 −3
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ 
#define IV_CTR_INIT		0x1

#define IV_BYTE_OFFSET		0x8



static DEFINE_MUTEX(sec_algs_lock);

static unsigned int sec_available_devs;



struct sec_skcipher {

	u64 alg_msk;

	struct skcipher_alg alg;
@@ -2545,16 +2548,31 @@ static int sec_register_aead(u64 alg_mask) 
int sec_register_to_crypto(struct hisi_qm *qm)

{

	u64 alg_mask = sec_get_alg_bitmap(qm, SEC_DRV_ALG_BITMAP_HIGH, SEC_DRV_ALG_BITMAP_LOW);

	int ret;

	int ret = 0;



	mutex_lock(&sec_algs_lock);

	if (sec_available_devs) {

		sec_available_devs++;

		goto unlock;

	}



	ret = sec_register_skcipher(alg_mask);

	if (ret)

		return ret;

		goto unlock;



	ret = sec_register_aead(alg_mask);

	if (ret)

		sec_unregister_skcipher(alg_mask, ARRAY_SIZE(sec_skciphers));

		goto unreg_skcipher;



	sec_available_devs++;

	mutex_unlock(&sec_algs_lock);



	return 0;



unreg_skcipher:

	sec_unregister_skcipher(alg_mask, ARRAY_SIZE(sec_skciphers));

unlock:

	mutex_unlock(&sec_algs_lock);

	return ret;

}
@@ -2562,6 +2580,13 @@ void sec_unregister_from_crypto(struct hisi_qm *qm) 
{

	u64 alg_mask = sec_get_alg_bitmap(qm, SEC_DRV_ALG_BITMAP_HIGH, SEC_DRV_ALG_BITMAP_LOW);



	mutex_lock(&sec_algs_lock);

	if (--sec_available_devs)

		goto unlock;



	sec_unregister_aead(alg_mask, ARRAY_SIZE(sec_aeads));

	sec_unregister_skcipher(alg_mask, ARRAY_SIZE(sec_skciphers));



unlock:

	mutex_unlock(&sec_algs_lock);

}

drivers/crypto/hisilicon/sec2/sec_main.c

+10 −14
Original line number Diff line number Diff line
@@ -1234,15 +1234,11 @@ static int sec_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (ret)

		pci_warn(pdev, "Failed to init debugfs!\n");



	if (qm->qp_num >= ctx_q_num) {

		ret = hisi_qm_alg_register(qm, &sec_devices);

	hisi_qm_add_list(qm, &sec_devices);

	ret = hisi_qm_alg_register(qm, &sec_devices, ctx_q_num);

	if (ret < 0) {

		pr_err("Failed to register driver to crypto.\n");

			goto err_qm_stop;

		}

	} else {

		pci_warn(qm->pdev,

			"Failed to use kernel mode, qp not enough!\n");

		goto err_qm_del_list;

	}



	if (qm->uacce) {
@@ -1264,9 +1260,9 @@ static int sec_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	return 0;



err_alg_unregister:

	if (qm->qp_num >= ctx_q_num)

		hisi_qm_alg_unregister(qm, &sec_devices);

err_qm_stop:

	hisi_qm_alg_unregister(qm, &sec_devices, ctx_q_num);

err_qm_del_list:

	hisi_qm_del_list(qm, &sec_devices);

	sec_debugfs_exit(qm);

	hisi_qm_stop(qm, QM_NORMAL);

err_probe_uninit:
@@ -1283,8 +1279,8 @@ static void sec_remove(struct pci_dev *pdev) 


	hisi_qm_pm_uninit(qm);

	hisi_qm_wait_task_finish(qm, &sec_devices);

	if (qm->qp_num >= ctx_q_num)

		hisi_qm_alg_unregister(qm, &sec_devices);

	hisi_qm_alg_unregister(qm, &sec_devices, ctx_q_num);

	hisi_qm_del_list(qm, &sec_devices);



	if (qm->fun_type == QM_HW_PF && qm->vfs_num)

		hisi_qm_sriov_disable(pdev, true);