Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e209fcf authored by Tadeusz Struk's avatar Tadeusz Struk Committed by Herbert Xu
Browse files

crypto: qat - fix invalid pf2vf_resp_wq logic 



The pf2vf_resp_wq is a global so it has to be created at init
and destroyed at exit, instead of per device.

Cc: <stable@vger.kernel.org>
Tested-by: default avatarSuresh Marikkannu <sureshx.marikkannu@intel.com>
Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 340ff60a

drivers/crypto/qat/qat_common/adf_common_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ void adf_disable_aer(struct adf_accel_dev *accel_dev); 
void adf_dev_restore(struct adf_accel_dev *accel_dev);

int adf_init_aer(void);

void adf_exit_aer(void);

int adf_init_pf_wq(void);

void adf_exit_pf_wq(void);

int adf_init_admin_comms(struct adf_accel_dev *accel_dev);

void adf_exit_admin_comms(struct adf_accel_dev *accel_dev);

int adf_send_admin_init(struct adf_accel_dev *accel_dev);

drivers/crypto/qat/qat_common/adf_ctl_drv.c

+6 −0
Original line number Diff line number Diff line
@@ -462,12 +462,17 @@ static int __init adf_register_ctl_device_driver(void) 
	if (adf_init_aer())

		goto err_aer;



	if (adf_init_pf_wq())

		goto err_pf_wq;



	if (qat_crypto_register())

		goto err_crypto_register;



	return 0;



err_crypto_register:

	adf_exit_pf_wq();

err_pf_wq:

	adf_exit_aer();

err_aer:

	adf_chr_drv_destroy();
@@ -480,6 +485,7 @@ static void __exit adf_unregister_ctl_device_driver(void) 
{

	adf_chr_drv_destroy();

	adf_exit_aer();

	adf_exit_pf_wq();

	qat_crypto_unregister();

	adf_clean_vf_map(false);

	mutex_destroy(&adf_ctl_lock);

drivers/crypto/qat/qat_common/adf_sriov.c

+16 −10
Original line number Diff line number Diff line
@@ -119,11 +119,6 @@ static int adf_enable_sriov(struct adf_accel_dev *accel_dev) 
	int i;

	u32 reg;



	/* Workqueue for PF2VF responses */

	pf2vf_resp_wq = create_workqueue("qat_pf2vf_resp_wq");

	if (!pf2vf_resp_wq)

		return -ENOMEM;



	for (i = 0, vf_info = accel_dev->pf.vf_info; i < totalvfs;

	     i++, vf_info++) {

		/* This ptr will be populated when VFs will be created */
@@ -216,11 +211,6 @@ void adf_disable_sriov(struct adf_accel_dev *accel_dev) 


	kfree(accel_dev->pf.vf_info);

	accel_dev->pf.vf_info = NULL;



	if (pf2vf_resp_wq) {

		destroy_workqueue(pf2vf_resp_wq);

		pf2vf_resp_wq = NULL;

	}

}

EXPORT_SYMBOL_GPL(adf_disable_sriov);
@@ -304,3 +294,19 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs) 
	return numvfs;

}

EXPORT_SYMBOL_GPL(adf_sriov_configure);



int __init adf_init_pf_wq(void)

{

	/* Workqueue for PF2VF responses */

	pf2vf_resp_wq = create_workqueue("qat_pf2vf_resp_wq");



	return !pf2vf_resp_wq ? -ENOMEM : 0;

}



void adf_exit_pf_wq(void)

{

	if (pf2vf_resp_wq) {

		destroy_workqueue(pf2vf_resp_wq);

		pf2vf_resp_wq = NULL;

	}

}