From: Qiang Yu <quic_qianyu@quicinc.com>
To: Jeffrey Hugo <quic_jhugo@quicinc.com>, <mani@kernel.org>
Cc: <mhi@lists.linux.dev>, <linux-arm-msm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <quic_cang@quicinc.com>,
<quic_mrana@quicinc.com>
Subject: Re: [PATCH v2 1/2] bus: mhi: host: Add spinlock to protect WP access when queueing TREs
Date: Mon, 25 Sep 2023 11:10:06 +0800 [thread overview]
Message-ID: <dfeb6071-8ae4-38ba-5273-59478ea8e178@quicinc.com> (raw)
In-Reply-To: <af4fc816-d75b-997d-6d37-a774f5eb96ae@quicinc.com>
On 9/22/2023 10:44 PM, Jeffrey Hugo wrote:
> On 9/13/2023 2:47 AM, Qiang Yu wrote:
>> From: Bhaumik Bhatt <bbhatt@codeaurora.org>
>>
>> Protect WP accesses such that multiple threads queueing buffers for
>> incoming data do not race and access the same WP twice. Ensure read and
>> write locks for the channel are not taken in succession by dropping the
>> read lock from parse_xfer_event() such that a callback given to client
>> can potentially queue buffers and acquire the write lock in that
>> process.
>> Any queueing of buffers should be done without channel read lock
>> acquired
>> as it can result in multiple locks and a soft lockup.
>>
>> Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
>> Signed-off-by: Qiang Yu <quic_qianyu@quicinc.com>
>> ---
>> drivers/bus/mhi/host/main.c | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
>> index dcf627b..13c4b89 100644
>> --- a/drivers/bus/mhi/host/main.c
>> +++ b/drivers/bus/mhi/host/main.c
>> @@ -642,6 +642,7 @@ static int parse_xfer_event(struct mhi_controller
>> *mhi_cntrl,
>> mhi_del_ring_element(mhi_cntrl, tre_ring);
>> local_rp = tre_ring->rp;
>> + read_unlock_bh(&mhi_chan->lock);
>
> This doesn't work due to the write_lock_irqsave(&mhi_chan->lock,
> flags); on line 591.
Write_lock_irqsave(&mhi_chan->lock, flags) is used in case of ev_code >=
MHI_EV_CC_OOB. We only read_lock/read_unlock the mhi_chan while ev_code
< MHI_EV_CC_OOB.
>
> I really don't like that we are unlocking the mhi_chan while still
> using it. It opens up a window where the mhi_chan state can be
> updated between here and the client using the callback to queue a buf.
>
> Perhaps we need a new lock that just protects the wp, and needs to be
> only grabbed while mhi_chan->lock is held?
Since we have employed mhi_chan lock to protect the channel and what we
are concerned here is that client may queue buf to a disabled or stopped
channel, can we check channel state after getting mhi_chan->lock like
line 595.
We can add the check after getting write lock in mhi_gen_tre() and after
getting read lock again here.
>
>> /* notify client */
>> mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result);
>> @@ -667,6 +668,7 @@ static int parse_xfer_event(struct
>> mhi_controller *mhi_cntrl,
>> kfree(buf_info->cb_buf);
>> }
>> }
>> + read_lock_bh(&mhi_chan->lock);
>> }
>> break;
>> } /* CC_EOT */
>> @@ -1204,6 +1206,9 @@ int mhi_gen_tre(struct mhi_controller
>> *mhi_cntrl, struct mhi_chan *mhi_chan,
>> int eot, eob, chain, bei;
>> int ret;
>> + /* Protect accesses for reading and incrementing WP */
>> + write_lock_bh(&mhi_chan->lock);
>> +
>> buf_ring = &mhi_chan->buf_ring;
>> tre_ring = &mhi_chan->tre_ring;
>> @@ -1221,8 +1226,10 @@ int mhi_gen_tre(struct mhi_controller
>> *mhi_cntrl, struct mhi_chan *mhi_chan,
>> if (!info->pre_mapped) {
>> ret = mhi_cntrl->map_single(mhi_cntrl, buf_info);
>> - if (ret)
>> + if (ret) {
>> + write_unlock_bh(&mhi_chan->lock);
>> return ret;
>> + }
>> }
>> eob = !!(flags & MHI_EOB);
>> @@ -1239,6 +1246,8 @@ int mhi_gen_tre(struct mhi_controller
>> *mhi_cntrl, struct mhi_chan *mhi_chan,
>> mhi_add_ring_element(mhi_cntrl, tre_ring);
>> mhi_add_ring_element(mhi_cntrl, buf_ring);
>> + write_unlock_bh(&mhi_chan->lock);
>> +
>> return 0;
>> }
>
next prev parent reply other threads:[~2023-09-25 3:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-13 8:47 [PATCH v2 0/2] Add lock to avoid race when ringing channel DB Qiang Yu
2023-09-13 8:47 ` [PATCH v2 1/2] bus: mhi: host: Add spinlock to protect WP access when queueing TREs Qiang Yu
2023-09-22 14:44 ` Jeffrey Hugo
2023-09-25 3:10 ` Qiang Yu [this message]
2023-09-29 15:22 ` Jeffrey Hugo
2023-10-16 8:46 ` Qiang Yu
2023-10-20 15:07 ` Jeffrey Hugo
2023-11-06 4:51 ` Manivannan Sadhasivam
2023-11-07 7:59 ` Qiang Yu
2023-11-06 4:41 ` Manivannan Sadhasivam
2023-11-07 7:19 ` Qiang Yu
2023-09-13 8:47 ` [PATCH v2 2/2] bus: mhi: host: Take irqsave lock after TRE is generated Qiang Yu
2023-09-22 14:50 ` Jeffrey Hugo
2023-09-25 4:08 ` Qiang Yu
2023-09-29 15:25 ` Jeffrey Hugo
2023-10-16 8:49 ` Qiang Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dfeb6071-8ae4-38ba-5273-59478ea8e178@quicinc.com \
--to=quic_qianyu@quicinc.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mani@kernel.org \
--cc=mhi@lists.linux.dev \
--cc=quic_cang@quicinc.com \
--cc=quic_jhugo@quicinc.com \
--cc=quic_mrana@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®