]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Apr 2022 11:07:33 +0000 (13:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Apr 2022 11:07:33 +0000 (13:07 +0200)
added patches:
docs-sysctl-kernel-add-missing-bit-to-panic_print.patch
n64cart-convert-bi_disk-to-bi_bdev-bd_disk-fix-build.patch
openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch
torture-make-torture.sh-help-message-match-reality.patch

queue-5.15/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch [new file with mode: 0644]
queue-5.15/n64cart-convert-bi_disk-to-bi_bdev-bd_disk-fix-build.patch [new file with mode: 0644]
queue-5.15/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch [new file with mode: 0644]
queue-5.15/series
queue-5.15/torture-make-torture.sh-help-message-match-reality.patch [new file with mode: 0644]

diff --git a/queue-5.15/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch b/queue-5.15/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch
new file mode 100644 (file)
index 0000000..b80035c
--- /dev/null
@@ -0,0 +1,55 @@
+From a1ff1de00db21ecb956213f046b79741b64c6b65 Mon Sep 17 00:00:00 2001
+From: "Guilherme G. Piccoli" <gpiccoli@igalia.com>
+Date: Wed, 23 Mar 2022 16:07:03 -0700
+Subject: docs: sysctl/kernel: add missing bit to panic_print
+
+From: Guilherme G. Piccoli <gpiccoli@igalia.com>
+
+commit a1ff1de00db21ecb956213f046b79741b64c6b65 upstream.
+
+Patch series "Some improvements on panic_print".
+
+This is a mix of a documentation fix with some additions to the
+"panic_print" syscall / parameter.  The goal here is being able to collect
+all CPUs backtraces during a panic event and also to enable "panic_print"
+in a kdump event - details of the reasoning and design choices in the
+patches.
+
+This patch (of 3):
+
+Commit de6da1e8bcf0 ("panic: add an option to replay all the printk
+message in buffer") added a new bit to the sysctl/kernel parameter
+"panic_print", but the documentation was added only in
+kernel-parameters.txt, not in the sysctl guide.
+
+Fix it here by adding bit 5 to sysctl admin-guide documentation.
+
+[rdunlap@infradead.org: fix table format warning]
+  Link: https://lkml.kernel.org/r/20220109055635.6999-1-rdunlap@infradead.org
+
+Link: https://lkml.kernel.org/r/20211109202848.610874-1-gpiccoli@igalia.com
+Link: https://lkml.kernel.org/r/20211109202848.610874-2-gpiccoli@igalia.com
+Fixes: de6da1e8bcf0 ("panic: add an option to replay all the printk message in buffer")
+Signed-off-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
+Reviewed-by: Feng Tang <feng.tang@intel.com>
+Cc: Luis Chamberlain <mcgrof@kernel.org>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Iurii Zaikin <yzaikin@google.com>
+Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/admin-guide/sysctl/kernel.rst |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Documentation/admin-guide/sysctl/kernel.rst
++++ b/Documentation/admin-guide/sysctl/kernel.rst
+@@ -795,6 +795,7 @@ bit 1  print system memory info
+ bit 2  print timer info
+ bit 3  print locks info if ``CONFIG_LOCKDEP`` is on
+ bit 4  print ftrace buffer
++bit 5  print all printk messages in buffer
+ =====  ============================================
+ So for example to print tasks and memory info on panic, user can::
diff --git a/queue-5.15/n64cart-convert-bi_disk-to-bi_bdev-bd_disk-fix-build.patch b/queue-5.15/n64cart-convert-bi_disk-to-bi_bdev-bd_disk-fix-build.patch
new file mode 100644 (file)
index 0000000..58c63c0
--- /dev/null
@@ -0,0 +1,47 @@
+From b2479de38d8fc7ef13d5c78ff5ded6e5a1a4eac0 Mon Sep 17 00:00:00 2001
+From: Jackie Liu <liuyun01@kylinos.cn>
+Date: Mon, 21 Mar 2022 15:12:16 +0800
+Subject: n64cart: convert bi_disk to bi_bdev->bd_disk fix build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jackie Liu <liuyun01@kylinos.cn>
+
+commit b2479de38d8fc7ef13d5c78ff5ded6e5a1a4eac0 upstream.
+
+My kernel robot report below:
+
+  drivers/block/n64cart.c: In function ‘n64cart_submit_bio’:
+  drivers/block/n64cart.c:91:26: error: ‘struct bio’ has no member named ‘bi_disk’
+     91 |  struct device *dev = bio->bi_disk->private_data;
+        |                          ^~
+    CC      drivers/slimbus/qcom-ctrl.o
+    CC      drivers/auxdisplay/hd44780.o
+    CC      drivers/watchdog/watchdog_core.o
+    CC      drivers/nvme/host/fault_inject.o
+    AR      drivers/accessibility/braille/built-in.a
+  make[2]: *** [scripts/Makefile.build:288: drivers/block/n64cart.o] Error 1
+
+Fixes: 309dca309fc3 ("block: store a block_device pointer in struct bio");
+Reported-by: k2ci <kernel-bot@kylinos.cn>
+Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
+Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
+Link: https://lore.kernel.org/r/20220321071216.1549596-1-liu.yun@linux.dev
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/block/n64cart.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/block/n64cart.c
++++ b/drivers/block/n64cart.c
+@@ -88,7 +88,7 @@ static blk_qc_t n64cart_submit_bio(struc
+ {
+       struct bio_vec bvec;
+       struct bvec_iter iter;
+-      struct device *dev = bio->bi_disk->private_data;
++      struct device *dev = bio->bi_bdev->bd_disk->private_data;
+       u32 pos = bio->bi_iter.bi_sector << SECTOR_SHIFT;
+       bio_for_each_segment(bvec, bio, iter) {
diff --git a/queue-5.15/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch b/queue-5.15/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch
new file mode 100644 (file)
index 0000000..dfb9522
--- /dev/null
@@ -0,0 +1,49 @@
+From f19c44452b58a84d95e209b847f5495d91c9983a Mon Sep 17 00:00:00 2001
+From: Martin Varghese <martin.varghese@nokia.com>
+Date: Mon, 28 Mar 2022 11:11:48 +0530
+Subject: openvswitch: Fixed nd target mask field in the flow dump.
+
+From: Martin Varghese <martin.varghese@nokia.com>
+
+commit f19c44452b58a84d95e209b847f5495d91c9983a upstream.
+
+IPv6 nd target mask was not getting populated in flow dump.
+
+In the function __ovs_nla_put_key the icmp code mask field was checked
+instead of icmp code key field to classify the flow as neighbour discovery.
+
+ufid:bdfbe3e5-60c2-43b0-a5ff-dfcac1c37328, recirc_id(0),dp_hash(0/0),
+skb_priority(0/0),in_port(ovs-nm1),skb_mark(0/0),ct_state(0/0),
+ct_zone(0/0),ct_mark(0/0),ct_label(0/0),
+eth(src=00:00:00:00:00:00/00:00:00:00:00:00,
+dst=00:00:00:00:00:00/00:00:00:00:00:00),
+eth_type(0x86dd),
+ipv6(src=::/::,dst=::/::,label=0/0,proto=58,tclass=0/0,hlimit=0/0,frag=no),
+icmpv6(type=135,code=0),
+nd(target=2001::2/::,
+sll=00:00:00:00:00:00/00:00:00:00:00:00,
+tll=00:00:00:00:00:00/00:00:00:00:00:00),
+packets:10, bytes:860, used:0.504s, dp:ovs, actions:ovs-nm2
+
+Fixes: e64457191a25 (openvswitch: Restructure datapath.c and flow.c)
+Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
+Link: https://lore.kernel.org/r/20220328054148.3057-1-martinvarghesenokia@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/openvswitch/flow_netlink.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/openvswitch/flow_netlink.c
++++ b/net/openvswitch/flow_netlink.c
+@@ -2201,8 +2201,8 @@ static int __ovs_nla_put_key(const struc
+                       icmpv6_key->icmpv6_type = ntohs(output->tp.src);
+                       icmpv6_key->icmpv6_code = ntohs(output->tp.dst);
+-                      if (icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_SOLICITATION ||
+-                          icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) {
++                      if (swkey->tp.src == htons(NDISC_NEIGHBOUR_SOLICITATION) ||
++                          swkey->tp.src == htons(NDISC_NEIGHBOUR_ADVERTISEMENT)) {
+                               struct ovs_key_nd *nd_key;
+                               nla = nla_reserve(skb, OVS_KEY_ATTR_ND, sizeof(*nd_key));
index 9ac1e732f31c2ac629f5032bd5b840841d730f21..9a63657a92b8eafab4e9063110d87ee12efefc73 100644 (file)
@@ -895,3 +895,7 @@ arm-dts-spear13xx-update-spi-dma-properties.patch
 arm64-dts-ls1043a-update-i2c-dma-properties.patch
 arm64-dts-ls1046a-update-i2c-node-dma-properties.patch
 um-fix-uml_mconsole-stop-go.patch
+docs-sysctl-kernel-add-missing-bit-to-panic_print.patch
+openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch
+torture-make-torture.sh-help-message-match-reality.patch
+n64cart-convert-bi_disk-to-bi_bdev-bd_disk-fix-build.patch
diff --git a/queue-5.15/torture-make-torture.sh-help-message-match-reality.patch b/queue-5.15/torture-make-torture.sh-help-message-match-reality.patch
new file mode 100644 (file)
index 0000000..fc60749
--- /dev/null
@@ -0,0 +1,35 @@
+From f233673cd32a048f2eed69e56b61174c33fb740b Mon Sep 17 00:00:00 2001
+From: "Paul E. McKenney" <paulmck@kernel.org>
+Date: Thu, 27 Jan 2022 09:39:15 -0800
+Subject: torture: Make torture.sh help message match reality
+
+From: Paul E. McKenney <paulmck@kernel.org>
+
+commit f233673cd32a048f2eed69e56b61174c33fb740b upstream.
+
+This commit fixes a couple of typos: s/--doall/--do-all/ and
+s/--doallmodconfig/--do-allmodconfig/.
+
+[ paulmck: Add Fixes: supplied by Paul Menzel. ]
+
+Fixes: a115a775a8d5 ("torture: Add "make allmodconfig" to torture.sh")
+Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
+Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/rcutorture/bin/torture.sh |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/tools/testing/selftests/rcutorture/bin/torture.sh
++++ b/tools/testing/selftests/rcutorture/bin/torture.sh
+@@ -71,8 +71,8 @@ usage () {
+       echo "       --configs-rcutorture \"config-file list w/ repeat factor (3*TINY01)\""
+       echo "       --configs-locktorture \"config-file list w/ repeat factor (10*LOCK01)\""
+       echo "       --configs-scftorture \"config-file list w/ repeat factor (2*CFLIST)\""
+-      echo "       --doall"
+-      echo "       --doallmodconfig / --do-no-allmodconfig"
++      echo "       --do-all"
++      echo "       --do-allmodconfig / --do-no-allmodconfig"
+       echo "       --do-clocksourcewd / --do-no-clocksourcewd"
+       echo "       --do-kasan / --do-no-kasan"
+       echo "       --do-kcsan / --do-no-kcsan"