From: Ulf Hansson <ulf.hansson@linaro.org>
To: Adrian Hunter <adrian.hunter@intel.com>
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 14:06:52 +0200 [thread overview]
Message-ID: <CAPDyKFp3QdVm3oxkMvozuf+hifJi64Fn8T27Gy7Mq8SVpAYTSQ@mail.gmail.com> (raw)
In-Reply-To: <f36b194b-f74b-20de-3122-0243774b74c2@intel.com>
[...]
>
> 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>
Thanks, applied for fixes!
Kind regards
Uffe
> ---
> 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 12:06 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
2017-09-07 10:47 ` Seraphime Kirkovski
2017-09-07 12:06 ` Ulf Hansson [this message]
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=CAPDyKFp3QdVm3oxkMvozuf+hifJi64Fn8T27Gy7Mq8SVpAYTSQ@mail.gmail.com \
--to=ulf.hansson@linaro.org \
--cc=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 \
/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).