From f76d226b27b2adcfcf9af7128fec2686f5a3330a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Apr 2022 13:07:25 +0200 Subject: [PATCH] 5.10-stable patches added patches: docs-sysctl-kernel-add-missing-bit-to-panic_print.patch openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch --- ...ernel-add-missing-bit-to-panic_print.patch | 55 +++++++++++++++++++ ...d-target-mask-field-in-the-flow-dump.patch | 49 +++++++++++++++++ queue-5.10/series | 2 + 3 files changed, 106 insertions(+) create mode 100644 queue-5.10/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch create mode 100644 queue-5.10/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch diff --git a/queue-5.10/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch b/queue-5.10/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch new file mode 100644 index 00000000000..16ae8daa2aa --- /dev/null +++ b/queue-5.10/docs-sysctl-kernel-add-missing-bit-to-panic_print.patch @@ -0,0 +1,55 @@ +From a1ff1de00db21ecb956213f046b79741b64c6b65 Mon Sep 17 00:00:00 2001 +From: "Guilherme G. Piccoli" +Date: Wed, 23 Mar 2022 16:07:03 -0700 +Subject: docs: sysctl/kernel: add missing bit to panic_print + +From: Guilherme G. Piccoli + +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 +Reviewed-by: Feng Tang +Cc: Luis Chamberlain +Cc: Kees Cook +Cc: Iurii Zaikin +Cc: Samuel Iglesias Gonsalvez +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -787,6 +787,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.10/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch b/queue-5.10/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch new file mode 100644 index 00000000000..dfb95221ddf --- /dev/null +++ b/queue-5.10/openvswitch-fixed-nd-target-mask-field-in-the-flow-dump.patch @@ -0,0 +1,49 @@ +From f19c44452b58a84d95e209b847f5495d91c9983a Mon Sep 17 00:00:00 2001 +From: Martin Varghese +Date: Mon, 28 Mar 2022 11:11:48 +0530 +Subject: openvswitch: Fixed nd target mask field in the flow dump. + +From: Martin Varghese + +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 +Link: https://lore.kernel.org/r/20220328054148.3057-1-martinvarghesenokia@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + 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)); diff --git a/queue-5.10/series b/queue-5.10/series index c872a30e8f0..0bea293eac4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -587,3 +587,5 @@ asoc-topology-allow-tlv-control-to-be-either-read-or-write.patch arm-dts-spear1340-update-serial-node-properties.patch arm-dts-spear13xx-update-spi-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 -- 2.47.3