From 8af4a436e665201872348aa2ba6e7033d4c17823 Mon Sep 17 00:00:00 2001

From: Ahsan Atta <ahsan.atta@intel.com>

Date: Thu, 12 Aug 2021 21:21:27 +0100

Subject: [PATCH] crypto: qat - flush vf workqueue at driver removal

Git-commit: 8af4a436e665201872348aa2ba6e7033d4c17823

Patch-mainline: v5.15-rc1

References: jsc#PED-1073

There is a race condition during shutdown in adf_disable_sriov() where

both the PF and the VF drivers are loaded on the host system.

The PF notifies a VF with a "RESTARTING" message due to which the VF

starts an asynchronous worker to stop and shutdown itself.

At the same time the PF calls pci_disable_sriov() which invokes the

remove() routine on the VF device driver triggering the shutdown flow

again.

This change fixes the problem by ensuring that the VF flushes the worker

that performs stop()/shutdown() before these two functions are called in

the remove(). To make sure that no additional PV/VF messages are

processed by the VF, interrupts are disabled before flushing the

workqueue.

Signed-off-by: Ahsan Atta <ahsan.atta@intel.com>

Co-developed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Reviewed-by: Fiona Trahe <fiona.trahe@intel.com>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c      |  1 +

 drivers/crypto/qat/qat_c62xvf/adf_drv.c       |  1 +

 .../crypto/qat/qat_common/adf_common_drv.h    |  5 ++++

 drivers/crypto/qat/qat_common/adf_vf_isr.c    | 25 +++++++++++++++++++

 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c   |  1 +

 5 files changed, 33 insertions(+)

diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c

index 7ef5a5185d292..1df1b868978d9 100644

--- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c

+++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c

@@ -211,6 +211,7 @@ static void adf_remove(struct pci_dev *pdev)

 		pr_err("QAT: Driver removal failed\n");

 		return;

 	}

+	adf_flush_vf_wq(accel_dev);

 	adf_dev_stop(accel_dev);

 	adf_dev_shutdown(accel_dev);

 	adf_cleanup_accel(accel_dev);

diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c

index c91beedd267c5..8103bd81d617a 100644

--- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c

+++ b/drivers/crypto/qat/qat_c62xvf/adf_drv.c

@@ -211,6 +211,7 @@ static void adf_remove(struct pci_dev *pdev)

 		pr_err("QAT: Driver removal failed\n");

 		return;

 	}

+	adf_flush_vf_wq(accel_dev);

 	adf_dev_stop(accel_dev);

 	adf_dev_shutdown(accel_dev);

 	adf_cleanup_accel(accel_dev);

diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h

index 4b18843f9845f..4261749fae8d4 100644

--- a/drivers/crypto/qat/qat_common/adf_common_drv.h

+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h

@@ -207,6 +207,7 @@ int adf_init_pf_wq(void);

 void adf_exit_pf_wq(void);

 int adf_init_vf_wq(void);

 void adf_exit_vf_wq(void);

+void adf_flush_vf_wq(struct adf_accel_dev *accel_dev);

 #else

 #define adf_sriov_configure NULL

@@ -249,5 +250,9 @@ static inline void adf_exit_vf_wq(void)

 {

 }

+static inline void adf_flush_vf_wq(struct adf_accel_dev *accel_dev)

+{

+}

+

 #endif

 #endif

diff --git a/drivers/crypto/qat/qat_common/adf_vf_isr.c b/drivers/crypto/qat/qat_common/adf_vf_isr.c

index 078f33d583e8c..7828a6573f3e2 100644

--- a/drivers/crypto/qat/qat_common/adf_vf_isr.c

+++ b/drivers/crypto/qat/qat_common/adf_vf_isr.c

@@ -48,6 +48,7 @@ void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev)

 	ADF_CSR_WR(pmisc_bar_addr, ADF_VINTMSK_OFFSET, 0x2);

 }

+EXPORT_SYMBOL_GPL(adf_disable_pf2vf_interrupts);

 static int adf_enable_msi(struct adf_accel_dev *accel_dev)

 {

@@ -316,6 +317,30 @@ err_out:

 }

 EXPORT_SYMBOL_GPL(adf_vf_isr_resource_alloc);

+/**

+ * adf_flush_vf_wq() - Flush workqueue for VF

+ * @accel_dev:  Pointer to acceleration device.

+ *

+ * Function disables the PF/VF interrupts on the VF so that no new messages

+ * are received and flushes the workqueue 'adf_vf_stop_wq'.

+ *

+ * Return: void.

+ */

+void adf_flush_vf_wq(struct adf_accel_dev *accel_dev)

+{

+	adf_disable_pf2vf_interrupts(accel_dev);

+

+	flush_workqueue(adf_vf_stop_wq);

+}

+EXPORT_SYMBOL_GPL(adf_flush_vf_wq);

+

+/**

+ * adf_init_vf_wq() - Init workqueue for VF

+ *

+ * Function init workqueue 'adf_vf_stop_wq' for VF.

+ *

+ * Return: 0 on success, error code otherwise.

+ */

 int __init adf_init_vf_wq(void)

 {

 	adf_vf_stop_wq = alloc_workqueue("adf_vf_stop_wq", WQ_MEM_RECLAIM, 0);

diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c

index d332b68795f2c..99d90f3ea2b79 100644

--- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c

+++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c

@@ -211,6 +211,7 @@ static void adf_remove(struct pci_dev *pdev)

 		pr_err("QAT: Driver removal failed\n");

 		return;

 	}

+	adf_flush_vf_wq(accel_dev);

 	adf_dev_stop(accel_dev);

 	adf_dev_shutdown(accel_dev);

 	adf_cleanup_accel(accel_dev);

-- 

2.35.3