Commit ff558e67 authored by Weili Qian's avatar Weili Qian Committed by Zheng Zengkai
Browse files

crypto: hisilicon/qm - return failure if vfs_num exceeds total VFs 

mainline inclusion
from mainline-v6.1-rc1
commit fa2bf6e3
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5T7AD
CVE: NA

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



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

The accelerator drivers supports users to enable VFs through the
module parameter 'vfs_num'. If the number of VFs to be enabled
exceeds the total VFs, all VFs are enabled. Change it to the same
as enabling VF through the 'sriov_numvfs' file. Returns -ERANGE
if the number of VFs to be enabled exceeds total VFs.

Signed-off-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJiangshui Yang <yangjiangshui@h-partners.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent dc81d1d4

drivers/crypto/hisilicon/qm.c

+7 −1
Original line number Diff line number Diff line
@@ -4770,7 +4770,13 @@ int hisi_qm_sriov_enable(struct pci_dev *pdev, int max_vfs) 
		goto err_put_sync;

	}



	num_vfs = min_t(int, max_vfs, total_vfs);

	if (max_vfs > total_vfs) {

		pci_err(pdev, "%d VFs is more than total VFs %d!\n", max_vfs, total_vfs);

		ret = -ERANGE;

		goto err_put_sync;

	}



	num_vfs = max_vfs;

	ret = qm_vf_q_assign(qm, num_vfs);

	if (ret) {

		pci_err(pdev, "Can't assign queues for VF!\n");