From: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>,
sachinp <sachinp@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-block <linux-block@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [linux-next][bock] [bisected c20cfc27a] WARNING: CPU: 22 PID: 0 at block/blk-core.c:2655 .blk_update_request+0x4f8/0x500
Date: Thu, 11 May 2017 15:22:25 +0530 [thread overview]
Message-ID: <1494496345.6713.2.camel@abdul.in.ibm.com> (raw)
In-Reply-To: <20170510175506.GA5084@lst.de>
On Wed, 2017-05-10 at 19:55 +0200, Christoph Hellwig wrote:
> Hi Abdul,
>
> can you test the patch below? I'll try to create a way to inject
> short WRITE SAME commands using qemu next, but I thought I'd give
> you a chance to try it as well.
No warnings with the patch. Thanks for all your support !
Reported-and-tested-by : Abdul Haleem <abdhalee@linux.vnet.ibm.com>
>
> ---
> diff --git a/block/blk-core.c b/block/blk-core.c
> index c580b0138a7f..c7068520794b 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -2644,8 +2644,6 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
> return false;
> }
>
> - WARN_ON_ONCE(req->rq_flags & RQF_SPECIAL_PAYLOAD);
> -
> req->__data_len -= total_bytes;
>
> /* update sector only for requests with clear definition of sector */
> @@ -2658,17 +2656,19 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
> req->cmd_flags |= req->bio->bi_opf & REQ_FAILFAST_MASK;
> }
>
> - /*
> - * If total number of sectors is less than the first segment
> - * size, something has gone terribly wrong.
> - */
> - if (blk_rq_bytes(req) < blk_rq_cur_bytes(req)) {
> - blk_dump_rq_flags(req, "request botched");
> - req->__data_len = blk_rq_cur_bytes(req);
> - }
> + if (!(req->rq_flags & RQF_SPECIAL_PAYLOAD)) {
> + /*
> + * If total number of sectors is less than the first segment
> + * size, something has gone terribly wrong.
> + */
> + if (blk_rq_bytes(req) < blk_rq_cur_bytes(req)) {
> + blk_dump_rq_flags(req, "request botched");
> + req->__data_len = blk_rq_cur_bytes(req);
> + }
>
> - /* recalculate the number of segments */
> - blk_recalc_rq_segments(req);
> + /* recalculate the number of segments */
> + blk_recalc_rq_segments(req);
> + }
>
> return true;
> }
>
--
Regard's
Abdul Haleem
IBM Linux Technology Centre
prev parent reply other threads:[~2017-05-11 9:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-05 6:25 [linux-next][bock] WARNING: CPU: 22 PID: 0 at block/blk-core.c:2655 .blk_update_request+0x4f8/0x500 Abdul Haleem
2017-05-05 14:02 ` Jens Axboe
2017-05-08 7:13 ` Abdul Haleem
2017-05-08 14:00 ` Jens Axboe
2017-05-09 9:03 ` Christoph Hellwig
2017-05-09 15:18 ` [linux-next][bock] [bisected c20cfc27a] " Abdul Haleem
2017-05-10 7:56 ` Christoph Hellwig
2017-05-10 9:49 ` Abdul Haleem
2017-05-10 17:55 ` Christoph Hellwig
2017-05-11 9:52 ` Abdul Haleem [this message]
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=1494496345.6713.2.camel@abdul.in.ibm.com \
--to=abdhalee@linux.vnet.ibm.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=martin.petersen@oracle.com \
--cc=sachinp@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
/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).