Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-09-19 22:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2014-09-12 15:25:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-09-19 22:27:35.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 17 14:06:06 CEST 2014 - [email protected] + +- blk-merge: fix blk_recount_segments (bnc#888259). +- commit 5fca623 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -27,9 +27,9 @@ Group: Documentation/Man Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif BuildRequires: docbook-toys BuildRequires: docbook-utils ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -47,9 +47,9 @@ Group: SLES Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif %description kernel-obs-qa-xen.spec: same change kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif Url: http://www.kernel.org/ BuildRequires: bc ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -32,9 +32,9 @@ Group: Development/Sources Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif Url: http://www.kernel.org/ AutoReqProv: off ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -27,9 +27,9 @@ Version: 3.16.2 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:40.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:40.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.2 %if 0%{?is_kotd} -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %else -Release: <RELEASE>.gdcee397 +Release: <RELEASE>.g5fca623 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-xen.spec: same change ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/blk-merge-fix-blk_recount_segments new/patches.fixes/blk-merge-fix-blk_recount_segments --- old/patches.fixes/blk-merge-fix-blk_recount_segments 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/blk-merge-fix-blk_recount_segments 2014-09-17 14:06:06.000000000 +0200 @@ -0,0 +1,84 @@ +From 0738854939e6ec9b9111a8cfc0ca1dfa3cff6b2e Mon Sep 17 00:00:00 2001 +From: Ming Lei <[email protected]> +Date: Tue, 2 Sep 2014 23:02:59 +0800 +Subject: blk-merge: fix blk_recount_segments +Git-commit: 0738854939e6ec9b9111a8cfc0ca1dfa3cff6b2e +Patch-mainline: v3.17-rc5 +References: bnc#888259 + +QUEUE_FLAG_NO_SG_MERGE is set at default for blk-mq devices, +so bio->bi_phys_segment computed may be bigger than +queue_max_segments(q) for blk-mq devices, then drivers will +fail to handle the case, for example, BUG_ON() in +virtio_queue_rq() can be triggerd for virtio-blk: + + https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1359146 + +This patch fixes the issue by ignoring the QUEUE_FLAG_NO_SG_MERGE +flag if the computed bio->bi_phys_segment is bigger than +queue_max_segments(q), and the regression is caused by commit +05f1dd53152173(block: add queue flag for disabling SG merging). + +Reported-by: Kick In <[email protected]> +Tested-by: Chris J Arges <[email protected]> +Signed-off-by: Ming Lei <[email protected]> +Signed-off-by: Jens Axboe <[email protected]> +Acked-by: Jeff Mahoney <[email protected]> +--- + block/blk-merge.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/block/blk-merge.c b/block/blk-merge.c +index 5453583..7788179 100644 +--- a/block/blk-merge.c ++++ b/block/blk-merge.c +@@ -10,10 +10,11 @@ + #include "blk.h" + + static unsigned int __blk_recalc_rq_segments(struct request_queue *q, +- struct bio *bio) ++ struct bio *bio, ++ bool no_sg_merge) + { + struct bio_vec bv, bvprv = { NULL }; +- int cluster, high, highprv = 1, no_sg_merge; ++ int cluster, high, highprv = 1; + unsigned int seg_size, nr_phys_segs; + struct bio *fbio, *bbio; + struct bvec_iter iter; +@@ -35,7 +36,6 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, + cluster = blk_queue_cluster(q); + seg_size = 0; + nr_phys_segs = 0; +- no_sg_merge = test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags); + high = 0; + for_each_bio(bio) { + bio_for_each_segment(bv, bio, iter) { +@@ -88,18 +88,23 @@ new_segment: + + void blk_recalc_rq_segments(struct request *rq) + { +- rq->nr_phys_segments = __blk_recalc_rq_segments(rq->q, rq->bio); ++ bool no_sg_merge = !!test_bit(QUEUE_FLAG_NO_SG_MERGE, ++ &rq->q->queue_flags); ++ ++ rq->nr_phys_segments = __blk_recalc_rq_segments(rq->q, rq->bio, ++ no_sg_merge); + } + + void blk_recount_segments(struct request_queue *q, struct bio *bio) + { +- if (test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags)) ++ if (test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags) && ++ bio->bi_vcnt < queue_max_segments(q)) + bio->bi_phys_segments = bio->bi_vcnt; + else { + struct bio *nxt = bio->bi_next; + + bio->bi_next = NULL; +- bio->bi_phys_segments = __blk_recalc_rq_segments(q, bio); ++ bio->bi_phys_segments = __blk_recalc_rq_segments(q, bio, false); + bio->bi_next = nxt; + } + + ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:41.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:41.000000000 +0200 @@ -361,6 +361,8 @@ patches.fixes/scsi-ibmvscsi-module_alias.patch patches.suse/sd_init.mark_majors_busy.patch + patches.fixes/blk-merge-fix-blk_recount_segments + ######################################################## # DRM/Video ######################################################## ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.GRFB0L/_old 2014-09-19 22:27:41.000000000 +0200 +++ /var/tmp/diff_new_pack.GRFB0L/_new 2014-09-19 22:27:41.000000000 +0200 @@ -1,3 +1,3 @@ -2014-09-07 06:40:17 +0200 -GIT Revision: dcee3975936b33996dd656617da8e1879ef4dcbd +2014-09-17 14:06:06 +0200 +GIT Revision: 5fca623fef82770d0a6895d3fb6382ac069cb1a6 GIT Branch: stable -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
