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

crypto: hisilicon/qm - obtain stop queue status 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I925L9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev.git/commit/?id=ce133a22123055f5f988499cd9ac7953d2bf0677



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

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: 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 7f97b714

Documentation/ABI/testing/debugfs-hisi-hpre

+15 −0
Original line number Diff line number Diff line
@@ -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

Documentation/ABI/testing/debugfs-hisi-sec

+15 −0
Original line number Diff line number Diff line
@@ -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

Documentation/ABI/testing/debugfs-hisi-zip

+15 −0
Original line number Diff line number Diff line
@@ -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

drivers/crypto/hisilicon/debugfs.c

+5 −0
Original line number Diff line number Diff line
@@ -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,

drivers/crypto/hisilicon/qm.c

+82 −26
Original line number Diff line number Diff line
@@ -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)