Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1622803

[PATCH] block: bios with an offset are always gappy

Show all headers | View raw

Doing a mkfs.btrfs on a (qemu emulated) PCIe NVMe causes a kernel panic
in nvme_setup_prps() because the dma_len will drop below zero but the
length not.

A git bisect tracked the behaviour down to commit 729204ef49ec ("block:
relax check on sg gap"). Since commit 729204ef49ec a bio's offsets are not
taken into account in the decision if the bio will gap any more. Restore
the old behavior of checking bio offsets as well for the decision if a
bio will gap.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: 729204ef49ec ("block: relax check on sg gap")
Cc: Ming Lei <ming.lei@redhat.com>
---
 include/linux/blkdev.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 7548f332121a..a03b7196209e 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1677,11 +1677,14 @@ static inline bool bio_will_gap(struct request_queue *q, struct bio *prev,
 {
 	if (bio_has_data(prev) && queue_virt_boundary(q)) {
 		struct bio_vec pb, nb;
+		bool offset;
 
 		bio_get_last_bvec(prev, &pb);
 		bio_get_first_bvec(next, &nb);
 
-		if (!bios_segs_mergeable(q, prev, &pb, &nb))
+		offset = pb.bv_offset || nb.bv_offset;
+
+		if (offset || !bios_segs_mergeable(q, prev, &pb, &nb))
 			return __bvec_gap_to_prev(q, &pb, nb.bv_offset);
 	}
 
-- 
2.12.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] block: bios with an offset are always gappy Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-13 10:10 +0200
  Re: [PATCH] block: bios with an offset are always gappy Christoph Hellwig <hch@lst.de> - 2017-04-13 11:50 +0200
    Re: [PATCH] block: bios with an offset are always gappy Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-13 12:00 +0200
    Re: [PATCH] block: bios with an offset are always gappy Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-13 12:10 +0200
  Re: [PATCH] block: bios with an offset are always gappy Ming Lei <ming.lei@redhat.com> - 2017-04-13 12:10 +0200
    Re: [PATCH] block: bios with an offset are always gappy Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-13 12:20 +0200
    Re: [PATCH] block: bios with an offset are always gappy Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-13 14:00 +0200
      Re: [PATCH] block: bios with an offset are always gappy Ming Lei <ming.lei@redhat.com> - 2017-04-13 14:20 +0200
        Re: [PATCH] block: bios with an offset are always gappy Ming Lei <ming.lei@redhat.com> - 2017-04-13 15:50 +0200
      Re: [PATCH] block: bios with an offset are always gappy Ming Lei <ming.lei@redhat.com> - 2017-04-13 16:50 +0200
        Re: [PATCH] block: bios with an offset are always gappy Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-13 17:00 +0200
        Re: [PATCH] block: bios with an offset are always gappy Andreas Mohr <andi@lisas.de> - 2017-04-13 22:40 +0200
          Re: [PATCH] block: bios with an offset are always gappy Ming Lei <ming.lei@redhat.com> - 2017-04-14 03:20 +0200

csiph-web