From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Shawn Lin <shawn.lin@rock-chips.com>, Pavel Machek <pavel@ucw.cz>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
kernel list <linux-kernel@vger.kernel.org>,
Seraphime Kirkovski <kirkseraph@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: 4.13 on thinkpad x220: oops when writing to SD card
Date: Thu, 7 Sep 2017 10:53:55 +0300 [thread overview]
Message-ID: <f36b194b-f74b-20de-3122-0243774b74c2@intel.com> (raw)
In-Reply-To: <CAPDyKFqXaDFrJH1-YSSCx0xPXfMN99AM_Wu_sWQf5A6bw+zjdQ@mail.gmail.com>
On 07/09/17 10:18, Ulf Hansson wrote:
> + Linus
>
> On 6 September 2017 at 08:03, Adrian Hunter <adrian.hunter@intel.com> wrote:
>> On 06/09/17 05:44, Shawn Lin wrote:
>>> + Seraphime
>>>
>>> On 2017/9/6 3:47, Pavel Machek wrote:
>>>> Hi!
>>>>
>>>> I tried to write to the MMC card; process hung and I got this in the
>>>> dmesg.
>>>
>>>
>>> A similar report for 4.13 cycle was here:
>>>
>>> https://lkml.org/lkml/2017/8/10/824
>>>
>>> Seems 4.13-rc4 was already broken for that but unfortuantely I didn't
>>> reproduce that. So maybe Seraphime can do git-bisect as he said "I get
>>> it everytime" for which I assume it could be easy for him to find out
>>> the problematic commit?
>>>
>>
>> One obvious weakness in the new mmc_init_request() is the possibility
>> that it might be called before card->bouncesz is set up. That could
>> result in bouncing being done but mq_rq->bounce_sg is null.
>> This might help:
>>
>>
>> diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
>> index affa7370ba82..ad3e53e63abb 100644
>> --- a/drivers/mmc/core/queue.c
>> +++ b/drivers/mmc/core/queue.c
>> @@ -242,6 +242,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
>> if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
>> limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
>>
>> + card->bouncesz = mmc_queue_calc_bouncesz(host);
>> +
>> mq->card = card;
>> mq->queue = blk_alloc_queue(GFP_KERNEL);
>> if (!mq->queue)
>> @@ -265,7 +267,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
>> if (mmc_can_erase(card))
>> mmc_queue_setup_discard(mq->queue, card);
>>
>> - card->bouncesz = mmc_queue_calc_bouncesz(host);
>> if (card->bouncesz) {
>> blk_queue_max_hw_sectors(mq->queue, card->bouncesz / 512);
>> blk_queue_max_segments(mq->queue, card->bouncesz / 512);
>>
>
> Even if this fixes the problem it seems like we are papering over the
> real issue, which earlier fixes also did during the release cycle for
> v4.13.
blk_init_allocated_queue() allocates 1 request for flush and 4 requests
for a memory pool. The memory pool requests only get used under memory
pressure. That is why the error doesn't come up straight away.
>
> Anyway I am happy to apply this as fix for 4.14, if Seraphime/Pavel
> can report it solved the problem. Could you send a proper patch with
> some changlog please?
>
> I would also appreciate if can add you a small comment in the code,
> why moving this line is needed.
From: Adrian Hunter <adrian.hunter@intel.com>
Date: Thu, 7 Sep 2017 10:40:35 +0300
Subject: [PATCH] mmc: block: Fix incorrectly initialized requests
mmc_init_request() depends on card->bouncesz so it must be calculated
before blk_init_allocated_queue() starts allocating requests.
Reported-by: Seraphime Kirkovski <kirkseraph@gmail.com>
Fixes: 304419d8a7e92 ("mmc: core: Allocate per-request data using the block layer core")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/core/queue.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index affa7370ba82..74c663b1c0a7 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -242,6 +242,12 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
+ /*
+ * mmc_init_request() depends on card->bouncesz so it must be calculated
+ * before blk_init_allocated_queue() starts allocating requests.
+ */
+ card->bouncesz = mmc_queue_calc_bouncesz(host);
+
mq->card = card;
mq->queue = blk_alloc_queue(GFP_KERNEL);
if (!mq->queue)
@@ -265,7 +271,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
if (mmc_can_erase(card))
mmc_queue_setup_discard(mq->queue, card);
- card->bouncesz = mmc_queue_calc_bouncesz(host);
if (card->bouncesz) {
blk_queue_max_hw_sectors(mq->queue, card->bouncesz / 512);
blk_queue_max_segments(mq->queue, card->bouncesz / 512);
--
1.9.1
next prev parent reply other threads:[~2017-09-07 8:00 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 19:47 4.13 on thinkpad x220: oops when writing to SD card Pavel Machek
2017-09-06 2:44 ` Shawn Lin
2017-09-06 6:03 ` Adrian Hunter
2017-09-07 7:18 ` Ulf Hansson
2017-09-07 7:53 ` Adrian Hunter [this message]
2017-09-07 10:47 ` Seraphime Kirkovski
2017-09-07 12:06 ` Ulf Hansson
2017-09-07 12:55 ` Pavel Machek
2017-09-07 15:03 ` Ulf Hansson
2017-09-08 8:51 ` Pavel Machek
2017-09-07 19:58 ` Linus Walleij
2017-09-07 20:02 ` Linus Walleij
2017-09-08 2:51 ` Shawn Lin
2017-09-12 9:42 ` Linus Walleij
2017-09-13 4:04 ` Shawn Lin
2017-10-01 9:37 ` 4.14-rc2 on thinkpad x220: out of memory when inserting mmc card Pavel Machek
2017-10-01 10:26 ` Pavel Machek
2017-10-01 10:57 ` Tetsuo Handa
2017-10-02 7:52 ` Adrian Hunter
2017-10-02 8:41 ` Pavel Machek
2017-10-02 12:06 ` Linus Walleij
2017-10-02 13:03 ` Pavel Machek
2017-10-03 6:27 ` Adrian Hunter
2017-10-23 9:31 ` Pavel Machek
2017-10-23 12:13 ` Adrian Hunter
2017-10-23 12:16 ` Linus Walleij
2017-10-23 21:27 ` Pavel Machek
2017-10-24 6:59 ` Adrian Hunter
2017-10-26 13:44 ` Linus Walleij
2017-10-02 14:09 ` Linus Walleij
2017-10-03 6:30 ` Adrian Hunter
2017-10-04 7:53 ` Linus Walleij
2017-10-04 8:01 ` Ulf Hansson
2017-10-02 14:44 ` Michal Hocko
2017-10-02 14:55 ` Tetsuo Handa
2017-09-06 7:08 4.13 on thinkpad x220: oops when writing to SD card Seraphime Kirkovski
2017-09-06 8:20 Seraphime Kirkovski
2017-09-08 9:29 ` Pavel Machek
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=f36b194b-f74b-20de-3122-0243774b74c2@intel.com \
--to=adrian.hunter@intel.com \
--cc=kirkseraph@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=shawn.lin@rock-chips.com \
--cc=ulf.hansson@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).