slimbus: qcom-ngd-ctrl: Release the TX descriptor on error paths
PATCH 1/1 slimbus: qcom-ngd-ctrl: Release the TX descriptor on error paths
qcom_slim_ngd_xfer_msg() leaks the claimed TX descriptor on two error paths; QCOM_SLIM_NGD_DESC_NUM such failures fill the ring for good and every later transfer fails with -ENOMEM. Give the descriptor back.
--- drivers/slimbus/qcom-ngd-ctrl.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/slimbus/qcom-ngd-ctrl.c +21 -0
@@ -546,6 +546,25 @@ static u32 *qcom_slim_ngd_tx_msg_get(struct qcom_slim_ngd_ctrl *ctrl, int len,return desc->base; } +/* +* Give back a descriptor obtained from qcom_slim_ngd_tx_msg_get() that will +* not be submitted to the DMA engine. +* +* The ring is accounted by count rather than by index: tx_tail counts the +* descriptors handed out and tx_head the ones the controller is finished +* with, and qcom_slim_ngd_tx_msg_dma_cb() is the only other place that +* advances tx_head. A descriptor that is never posted therefore has to +* advance it here, or the ring loses that slot for good. +*/ +static void qcom_slim_ngd_tx_msg_put (struct qcom_slim_ngd_ctrl *ctrl) +{ +unsigned long flags; + +spin_lock_irqsave (&ctrl->tx_buf_lock, flags); + ctrl->tx_head = (ctrl->tx_head +1 ) %QCOM_SLIM_NGD_DESC_NUM ; +spin_unlock_irqrestore (&ctrl->tx_buf_lock, flags); +} +static void qcom_slim_ngd_tx_msg_dma_cb (void *args) {struct qcom_slim_ngd_dma_desc *desc = args;
@@ -848,6 +867,7 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl, ret =slim_alloc_txn_tid (sctrl, txn);if (ret) {dev_err (ctrl->dev,"Unable to allocate TID\n" ); +qcom_slim_ngd_tx_msg_put (ctrl);return ret; }
@@ -887,6 +907,7 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl,mutex_lock (&ctrl->tx_lock); ret =qcom_slim_ngd_tx_msg_post (ctrl, pbuf, txn->rl);if (ret) { +qcom_slim_ngd_tx_msg_put (ctrl);mutex_unlock (&ctrl->tx_lock);return ret; }
Signature · 1 line
2.43.0
Hi Srinivas,
Gentle ping on this one. It has been about three and a half weeks and I could not find it in char-misc-next or your for-next, so I wanted to check whether it fell through the cracks or whether you would like something changed.
Thanks,
Babanpreet
Srinivas Kandagatla
maintainerQuoted 5 lines · Babanpreet Singh
qcom_slim_ngd_xfer_msg()leaks the claimed TX descriptor on two error paths;QCOM_SLIM_NGD_DESC_NUMsuch failures fill the ring for good and every later transfer fails with-ENOMEM. Give the descriptor back.
Are you hitting this on a real target or is this something done from static analysis?
How was this test verified?
Quoted 55 lines
Fixes 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver")Fixes 52490169cddf ("slimbus: ngd: add stream support")Missing Stable tag.Assisted-by claude-opus-5Signed-off-by Babanpreet Singh <[email protected]>--- drivers/slimbus/qcom-ngd-ctrl.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/slimbus/qcom-ngd-ctrl.c +19
-0@@ -546,6 +546,25 @@ static u32 *qcom_slim_ngd_tx_msg_get(struct qcom_slim_ngd_ctrl *ctrl, int len,return desc->base; } +/* +* Give back a descriptor obtained from qcom_slim_ngd_tx_msg_get() that will +* not be submitted to the DMA engine. +* +* The ring is accounted by count rather than by index: tx_tail counts the +* descriptors handed out and tx_head the ones the controller is finished +* with, and qcom_slim_ngd_tx_msg_dma_cb() is the only other place that +* advances tx_head. A descriptor that is never posted therefore has to +* advance it here, or the ring loses that slot for good. +*/ +static void qcom_slim_ngd_tx_msg_put (struct qcom_slim_ngd_ctrl *ctrl) +{ +unsigned long flags; + +spin_lock_irqsave (&ctrl->tx_buf_lock, flags); + ctrl->tx_head = (ctrl->tx_head +1 ) %QCOM_SLIM_NGD_DESC_NUM ; +spin_unlock_irqrestore (&ctrl->tx_buf_lock, flags); +} +static void qcom_slim_ngd_tx_msg_dma_cb (void *args) {drivers/slimbus/qcom-ngd-ctrl.c +2
-0struct qcom_slim_ngd_dma_desc *desc = args;@@ -848,6 +867,7 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl, ret =slim_alloc_txn_tid (sctrl, txn);if (ret) {dev_err (ctrl->dev,"Unable to allocate TID\n" ); +qcom_slim_ngd_tx_msg_put (ctrl);return ret; }@@ -887,6 +907,7 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl,mutex_lock (&ctrl->tx_lock); ret =qcom_slim_ngd_tx_msg_post (ctrl, pbuf, txn->rl);if (ret) { +qcom_slim_ngd_tx_msg_put (ctrl);mutex_unlock (&ctrl->tx_lock);return ret; }
Hi Srinivas,
Static analysis, then reading. smatch flagged the txn->msg check in qcom_slim_ngd_xfer_msg() and while I was looking at that function I noticed the two returns between tx_msg_get() and tx_msg_post(). I do not have a SLIMbus target. The -ENOMEM consequence in the commit message is derived from the code rather than observed: tx_head only moves in qcom_slim_ngd_tx_msg_dma_cb() and in the re-init path, so a descriptor that is claimed and never posted has no way back into the ring.
Verification was build only.
On the stable tag: I can send a v2 with Cc: stable and the "found by static analysis, compile tested only" wording.
Thanks,
Babanpreet
Quoted 10 lines · Babanpreet Singh
Hi Srinivas,
Static analysis, then reading. smatch flagged the
txn->msgcheck inqcom_slim_ngd_xfer_msg()and while I was looking at that function I noticed the two returns betweentx_msg_get()andtx_msg_post(). I do not have a SLIMbus target. The-ENOMEMconsequence in the commit message is derived from the code rather than observed:tx_headonly moves inqcom_slim_ngd_tx_msg_dma_cb()and in the re-init path, so a descriptor that is claimed and never posted has no way back into the ring.
Quoted 4 lines
Verification was build only.
On the stable tag: I can send a v2 with Cc: stable and the "found by static analysis, compile tested only" wording.
We have no context here at all, please never top-post, as my bot says:
A: http://en.wikipedia.org/wiki/Top_post
Q: Were do I find info about this thing called top-posting?
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
A: No.
Q: Should I include quotations after my reply?