Skip to contentSkip to conversation

FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree

PATCH [email protected] 2 participants 6 messages Mar 5, 2016 – Mar 7, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 25e71a99f10e444cd00bb2ebccb11e1c9fb672b1 Mon Sep 17 00:00:00 2001

From: Ming Lei <[email protected]>
Date: Fri, 26 Feb 2016 23:40:52 +0800
Subject: [PATCH] block: get the 1st and last bvec via helpers

This patch applies the two introduced helpers to figure out the 1st and last bvec, and fixes the original way after bio splitting.

include/linux/blkdev.h +9 -4
index cd06a41581b3..d7f6bca707ef 100644
@@ -1394,11 +1394,16 @@ static inline bool bvec_gap_to_prev(struct request_queue *q,
 static inline bool bio_will_gap(struct request_queue *q, struct bio *prev,
 			 struct bio *next)
 {
-	if (!bio_has_data(prev) || !queue_virt_boundary(q))
-		return false;
+	if (bio_has_data(prev) && queue_virt_boundary(q)) {
+		struct bio_vec pb, nb;
+
+		bio_get_last_bvec(prev, &pb);
+		bio_get_first_bvec(next, &nb);
 
-	return __bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],
-				  next->bi_io_vec[0].bv_offset);
+		return __bvec_gap_to_prev(q, &pb, nb.bv_offset);
+	}
+
+	return false;
 }
 
 static inline bool req_gap_back_merge(struct request *req, struct bio *bio)
#1 lore raw
Quoted 5 lines · On Sun, Mar 6, 2016 at 3:22 AM, <[email protected]> wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt boundary in bio_will_gap()) before this patch.

Thanks,
Ming

Quoted 49 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 25e71a99f10e444cd00bb2ebccb11e1c9fb672b1 Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Fri, 26 Feb 2016 23:40:52 +0800
Subject: [PATCH] block: get the 1st and last bvec via helpers

This patch applies the two introduced helpers to
figure out the 1st and last bvec, and fixes the
original way after bio splitting.

include/linux/blkdev.h +9 -4
index cd06a41581b3..d7f6bca707ef 100644
@@ -1394,11 +1394,16 @@ static inline bool bvec_gap_to_prev(struct request_queue *q,
 static inline bool bio_will_gap(struct request_queue *q, struct bio *prev,
                         struct bio *next)
 {
-       if (!bio_has_data(prev) || !queue_virt_boundary(q))
-               return false;
+       if (bio_has_data(prev) && queue_virt_boundary(q)) {
+               struct bio_vec pb, nb;
+
+               bio_get_last_bvec(prev, &pb);
+               bio_get_first_bvec(next, &nb);
 
-       return __bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],
-                                 next->bi_io_vec[0].bv_offset);
+               return __bvec_gap_to_prev(q, &pb, nb.bv_offset);
+       }
+
+       return false;
 }
 
 static inline bool req_gap_back_merge(struct request *req, struct bio *bio)
author maintainer
#2 lore raw
Quoted 9 lines · Ming Lei
Quoted 5 lines · On Sun, Mar 6, 2016 at 3:22 AM, <[email protected]> wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt boundary in bio_will_gap()) before this patch.

Will that fix the build errors here? It applies fine, but the build breaks. I'll try it out on Monday...

thanks,

greg k-h

#3 lore raw
Quoted 8 lines · Greg Kroah-Hartman
Quoted 7 lines · Ming Lei
Quoted 5 lines · On Sun, Mar 6, 2016 at 3:22 AM, <[email protected]> wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 5 lines
Quoted 2 lines

The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt boundary in bio_will_gap()) before this patch.

Will that fix the build errors here? It applies fine, but the build breaks. I'll try it out on Monday...

This patch depends on commit 0e8bd6fd, but it shouldn't have caused any build error.

If you may provide the error log, I'd like to take a look.

Thanks,
Ming

author maintainer
#4 lore raw
In reply to Ming Lei
Quoted 9 lines · Ming Lei
Quoted 5 lines · On Sun, Mar 6, 2016 at 3:22 AM, <[email protected]> wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt boundary in bio_will_gap()) before this patch.

You mean e0af29171aa8912e1ca95023b75ef336cd70d661, right? 0e8bd6fdfb2b96eb is a tree commit...

author maintainer
#5 lore raw
Quoted 8 lines · Greg Kroah-Hartman
Quoted 7 lines · Ming Lei
Quoted 5 lines · On Sun, Mar 6, 2016 at 3:22 AM, <[email protected]> wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 5 lines
Quoted 2 lines

The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt boundary in bio_will_gap()) before this patch.

You mean e0af29171aa8912e1ca95023b75ef336cd70d661, right? 0e8bd6fdfb2b96eb is a tree commit...

Ok, that all worked properly, thanks for the info.

greg k-h