crypto: hisilicon/qm - obtain stop queue status

The debugfs files 'dev_state' and 'dev_timeout' are added.
Users can query the current queue stop status through these two
files. And set the waiting timeout when the queue is released.

dev_state: if dev_timeout is set, dev_state indicates the status
of stopping the queue. 0 indicates that the queue is stopped
successfully. Other values indicate that the queue stops fail.
If dev_timeout is not set, the value of dev_state is 0;

dev_timeout: if the queue fails to stop, the queue is released
after waiting dev_timeout * 20ms.

Signed-off-by: Weili Qian <qianweili@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/Documentation/ABI/testing/debugfs-hisi-hpre b/Documentation/ABI/testing/debugfs-hisi-hpre
index 6ed9258605c70976c7d5673dbbf775274431251b..d4e16ef9ac9a99ecae8ee442134daf1935e5056e 100644 (file)
--- a/Documentation/ABI/testing/debugfs-hisi-hpre
+++ b/Documentation/ABI/testing/debugfs-hisi-hpre
@@ -118,6 +118,21 @@ Description:       Dump the state of the device.
                0: busy, 1: idle.
                Only available for PF, and take no other effect on HPRE.
 
+What:          /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_timeout
+Date:          Feb 2024
+Contact:       linux-crypto@vger.kernel.org
+Description:   Set the wait time when stop queue fails. Available for both PF
+               and VF, and take no other effect on HPRE.
+               0: not wait(default), others value: wait dev_timeout * 20 microsecond.
+
+What:          /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_state
+Date:          Feb 2024
+Contact:       linux-crypto@vger.kernel.org
+Description:   Dump the stop queue status of the QM. The default value is 0,
+               if dev_timeout is set, when stop queue fails, the dev_state
+               will return non-zero value. Available for both PF and VF,
+               and take no other effect on HPRE.
+
 What:          /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/diff_regs
 Date:          Mar 2022
 Contact:       linux-crypto@vger.kernel.org

diff --git a/Documentation/ABI/testing/debugfs-hisi-sec b/Documentation/ABI/testing/debugfs-hisi-sec
index 403f5de96318026ccc793b134cc6be39a47c36df..6c6c9a6e150acb8dc0725d3ffb10e274e08cefb2 100644 (file)
--- a/Documentation/ABI/testing/debugfs-hisi-sec
+++ b/Documentation/ABI/testing/debugfs-hisi-sec
@@ -98,6 +98,21 @@ Description: Dump the state of the device.
                0: busy, 1: idle.
                Only available for PF, and take no other effect on SEC.
 
+What:          /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_timeout
+Date:          Feb 2024
+Contact:       linux-crypto@vger.kernel.org
+Description:   Set the wait time when stop queue fails. Available for both PF
+               and VF, and take no other effect on SEC.
+               0: not wait(default), others value: wait dev_timeout * 20 microsecond.
+
+What:          /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_state
+Date:          Feb 2024
+Contact:       linux-crypto@vger.kernel.org
+Description:   Dump the stop queue status of the QM. The default value is 0,
+               if dev_timeout is set, when stop queue fails, the dev_state
+               will return non-zero value. Available for both PF and VF,
+               and take no other effect on SEC.
+
 What:          /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/diff_regs
 Date:          Mar 2022
 Contact:       linux-crypto@vger.kernel.org

diff --git a/Documentation/ABI/testing/debugfs-hisi-zip b/Documentation/ABI/testing/debugfs-hisi-zip
index 2394e6a3cfe2f45a97b3f4f979865de4330b86ac..a22dd6942219354675ba93ab2eb64363f6056b10 100644 (file)
--- a/Documentation/ABI/testing/debugfs-hisi-zip
+++ b/Documentation/ABI/testing/debugfs-hisi-zip
@@ -111,6 +111,21 @@ Description:       Dump the state of the device.
                0: busy, 1: idle.
                Only available for PF, and take no other effect on ZIP.
 
+What:          /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_timeout
+Date:          Feb 2024
+Contact:       linux-crypto@vger.kernel.org
+Description:   Set the wait time when stop queue fails. Available for both PF
+               and VF, and take no other effect on ZIP.
+               0: not wait(default), others value: wait dev_timeout * 20 microsecond.
+
+What:          /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_state
+Date:          Feb 2024
+Contact:       linux-crypto@vger.kernel.org
+Description:   Dump the stop queue status of the QM. The default value is 0,
+               if dev_timeout is set, when stop queue fails, the dev_state
+               will return non-zero value. Available for both PF and VF,
+               and take no other effect on ZIP.
+
 What:          /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/diff_regs
 Date:          Mar 2022
 Contact:       linux-crypto@vger.kernel.org

diff --git a/drivers/crypto/hisilicon/debugfs.c b/drivers/crypto/hisilicon/debugfs.c
index 06e67eda409f8fdd4133913b14be0f8101c67143..cd67fa348ca72d6b4501b219b4f5ba8929608370 100644 (file)
--- a/drivers/crypto/hisilicon/debugfs.c
+++ b/drivers/crypto/hisilicon/debugfs.c
@@ -1112,6 +1112,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(qm_atomic64_ops, qm_debugfs_atomic64_get,
 void hisi_qm_debug_init(struct hisi_qm *qm)
 {
        struct dfx_diff_registers *qm_regs = qm->debug.qm_diff_regs;
+       struct qm_dev_dfx *dev_dfx = &qm->debug.dev_dfx;
        struct qm_dfx *dfx = &qm->debug.dfx;
        struct dentry *qm_d;
        void *data;
@@ -1140,6 +1141,10 @@ void hisi_qm_debug_init(struct hisi_qm *qm)
 
        debugfs_create_file("status", 0444, qm->debug.qm_d, qm,
                        &qm_status_fops);
+
+       debugfs_create_u32("dev_state", 0444, qm->debug.qm_d, &dev_dfx->dev_state);
+       debugfs_create_u32("dev_timeout", 0644, qm->debug.qm_d, &dev_dfx->dev_timeout);
+
        for (i = 0; i < ARRAY_SIZE(qm_dfx_files); i++) {
                data = (atomic64_t *)((uintptr_t)dfx + qm_dfx_files[i].offset);
                debugfs_create_file(qm_dfx_files[i].name,

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 3b015482b4e6a9e021ace0ea6cad0a84ad9015b0..41dff28326f13b18077964f1e635cedace285e88 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -236,6 +236,12 @@
 
 #define QM_DEV_ALG_MAX_LEN             256
 
+ /* abnormal status value for stopping queue */
+#define QM_STOP_QUEUE_FAIL             1
+#define        QM_DUMP_SQC_FAIL                3
+#define        QM_DUMP_CQC_FAIL                4
+#define        QM_FINISH_WAIT                  5
+
 #define QM_MK_CQC_DW3_V1(hop_num, pg_sz, buf_sz, cqe_sz) \
        (((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \
        ((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \
@@ -2037,43 +2043,25 @@ static void qp_stop_fail_cb(struct hisi_qp *qp)
        }
 }
 
-/**
- * qm_drain_qp() - Drain a qp.
- * @qp: The qp we want to drain.
- *
- * Determine whether the queue is cleared by judging the tail pointers of
- * sq and cq.
- */
-static int qm_drain_qp(struct hisi_qp *qp)
+static int qm_wait_qp_empty(struct hisi_qm *qm, u32 *state, u32 qp_id)
 {
-       struct hisi_qm *qm = qp->qm;
        struct device *dev = &qm->pdev->dev;
        struct qm_sqc sqc;
        struct qm_cqc cqc;
        int ret, i = 0;
 
-       /* No need to judge if master OOO is blocked. */
-       if (qm_check_dev_error(qm))
-               return 0;
-
-       /* Kunpeng930 supports drain qp by device */
-       if (test_bit(QM_SUPPORT_STOP_QP, &qm->caps)) {
-               ret = qm_stop_qp(qp);
-               if (ret)
-                       dev_err(dev, "Failed to stop qp(%u)!\n", qp->qp_id);
-               return ret;
-       }
-
        while (++i) {
-               ret = qm_set_and_get_xqc(qm, QM_MB_CMD_SQC, &sqc, qp->qp_id, 1);
+               ret = qm_set_and_get_xqc(qm, QM_MB_CMD_SQC, &sqc, qp_id, 1);
                if (ret) {
                        dev_err_ratelimited(dev, "Failed to dump sqc!\n");
+                       *state = QM_DUMP_SQC_FAIL;
                        return ret;
                }
 
-               ret = qm_set_and_get_xqc(qm, QM_MB_CMD_CQC, &cqc, qp->qp_id, 1);
+               ret = qm_set_and_get_xqc(qm, QM_MB_CMD_CQC, &cqc, qp_id, 1);
                if (ret) {
                        dev_err_ratelimited(dev, "Failed to dump cqc!\n");
+                       *state = QM_DUMP_CQC_FAIL;
                        return ret;
                }
 
@@ -2082,8 +2070,9 @@ static int qm_drain_qp(struct hisi_qp *qp)
                        break;
 
                if (i == MAX_WAIT_COUNTS) {
-                       dev_err(dev, "Fail to empty queue %u!\n", qp->qp_id);
-                       return -EBUSY;
+                       dev_err(dev, "Fail to empty queue %u!\n", qp_id);
+                       *state = QM_STOP_QUEUE_FAIL;
+                       return -ETIMEDOUT;
                }
 
                usleep_range(WAIT_PERIOD_US_MIN, WAIT_PERIOD_US_MAX);
@@ -2092,6 +2081,49 @@ static int qm_drain_qp(struct hisi_qp *qp)
        return 0;
 }
 
+/**
+ * qm_drain_qp() - Drain a qp.
+ * @qp: The qp we want to drain.
+ *
+ * If the device does not support stopping queue by sending mailbox,
+ * determine whether the queue is cleared by judging the tail pointers of
+ * sq and cq.
+ */
+static int qm_drain_qp(struct hisi_qp *qp)
+{
+       struct hisi_qm *qm = qp->qm;
+       struct hisi_qm *pf_qm = pci_get_drvdata(pci_physfn(qm->pdev));
+       u32 state = 0;
+       int ret;
+
+       /* No need to judge if master OOO is blocked. */
+       if (qm_check_dev_error(pf_qm))
+               return 0;
+
+       /* HW V3 supports drain qp by device */
+       if (test_bit(QM_SUPPORT_STOP_QP, &qm->caps)) {
+               ret = qm_stop_qp(qp);
+               if (ret) {
+                       dev_err(&qm->pdev->dev, "Failed to stop qp!\n");
+                       state = QM_STOP_QUEUE_FAIL;
+                       goto set_dev_state;
+               }
+               return ret;
+       }
+
+       ret = qm_wait_qp_empty(qm, &state, qp->qp_id);
+       if (ret)
+               goto set_dev_state;
+
+       return 0;
+
+set_dev_state:
+       if (qm->debug.dev_dfx.dev_timeout)
+               qm->debug.dev_dfx.dev_state = state;
+
+       return ret;
+}
+
 static int qm_stop_qp_nolock(struct hisi_qp *qp)
 {
        struct hisi_qm *qm = qp->qm;
@@ -2319,7 +2351,31 @@ static int hisi_qm_uacce_start_queue(struct uacce_queue *q)
 
 static void hisi_qm_uacce_stop_queue(struct uacce_queue *q)
 {
-       hisi_qm_stop_qp(q->priv);
+       struct hisi_qp *qp = q->priv;
+       struct hisi_qm *qm = qp->qm;
+       struct qm_dev_dfx *dev_dfx = &qm->debug.dev_dfx;
+       u32 i = 0;
+
+       hisi_qm_stop_qp(qp);
+
+       if (!dev_dfx->dev_timeout || !dev_dfx->dev_state)
+               return;
+
+       /*
+        * After the queue fails to be stopped,
+        * wait for a period of time before releasing the queue.
+        */
+       while (++i) {
+               msleep(WAIT_PERIOD);
+
+               /* Since dev_timeout maybe modified, check i >= dev_timeout */
+               if (i >= dev_dfx->dev_timeout) {
+                       dev_err(&qm->pdev->dev, "Stop q %u timeout, state %u\n",
+                              qp->qp_id, dev_dfx->dev_state);
+                       dev_dfx->dev_state = QM_FINISH_WAIT;
+                       break;
+               }
+       }
 }
 
 static int hisi_qm_is_q_updated(struct uacce_queue *q)

diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h
index 720f10874a66bac8535f441f48020f1fad76a6ca..2d14742ad729d80a4d33d98481aa8f7b6e6cf9aa 100644 (file)
--- a/include/linux/hisi_acc_qm.h
+++ b/include/linux/hisi_acc_qm.h
@@ -163,6 +163,11 @@ struct qm_dev_alg {
        const char *alg;
 };
 
+struct qm_dev_dfx {
+       u32 dev_state;
+       u32 dev_timeout;
+};
+
 struct dfx_diff_registers {
        u32 *regs;
        u32 reg_offset;
@@ -191,6 +196,7 @@ struct qm_debug {
        struct dentry *debug_root;
        struct dentry *qm_d;
        struct debugfs_file files[DEBUG_FILE_NUM];
+       struct qm_dev_dfx dev_dfx;
        unsigned int *qm_last_words;
        /* ACC engines recoreding last regs */
        unsigned int *last_words;