From: Greg Kroah-Hartman Date: Mon, 3 Apr 2023 13:45:21 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.312~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5ccd90c48f31f23071755f1f7bc74e1ab6ba5ff;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: hsr-ratelimit-only-when-errors-are-printed.patch x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch --- diff --git a/queue-5.15/hsr-ratelimit-only-when-errors-are-printed.patch b/queue-5.15/hsr-ratelimit-only-when-errors-are-printed.patch new file mode 100644 index 00000000000..41eca2883d9 --- /dev/null +++ b/queue-5.15/hsr-ratelimit-only-when-errors-are-printed.patch @@ -0,0 +1,49 @@ +From 1b0120e4db0bf2838d1ce741195ce4b7cc100b91 Mon Sep 17 00:00:00 2001 +From: Matthieu Baerts +Date: Wed, 15 Mar 2023 21:25:17 +0100 +Subject: hsr: ratelimit only when errors are printed + +From: Matthieu Baerts + +commit 1b0120e4db0bf2838d1ce741195ce4b7cc100b91 upstream. + +Recently, when automatically merging -net and net-next in MPTCP devel +tree, our CI reported [1] a conflict in hsr, the same as the one +reported by Stephen in netdev [2]. + +When looking at the conflict, I noticed it is in fact the v1 [3] that +has been applied in -net and the v2 [4] in net-next. Maybe the v1 was +applied by accident. + +As mentioned by Jakub Kicinski [5], the new condition makes more sense +before the net_ratelimit(), not to update net_ratelimit's state which is +unnecessary if we're not going to print either way. + +Here, this modification applies the v2 but in -net. + +Link: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/4423171069 [1] +Link: https://lore.kernel.org/netdev/20230315100914.53fc1760@canb.auug.org.au/ [2] +Link: https://lore.kernel.org/netdev/20230307133229.127442-1-koverskeid@gmail.com/ [3] +Link: https://lore.kernel.org/netdev/20230309092302.179586-1-koverskeid@gmail.com/ [4] +Link: https://lore.kernel.org/netdev/20230308232001.2fb62013@kernel.org/ [5] +Fixes: 28e8cabe80f3 ("net: hsr: Don't log netdev_err message on unknown prp dst node") +Signed-off-by: Matthieu Baerts +Reviewed-by: Steen Hegelund +Link: https://lore.kernel.org/r/20230315-net-20230315-hsr_framereg-ratelimit-v1-1-61d2ef176d11@tessares.net +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/hsr/hsr_framereg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/hsr/hsr_framereg.c ++++ b/net/hsr/hsr_framereg.c +@@ -385,7 +385,7 @@ void hsr_addr_subst_dest(struct hsr_node + node_dst = find_node_by_addr_A(&port->hsr->node_db, + eth_hdr(skb)->h_dest); + if (!node_dst) { +- if (net_ratelimit() && port->hsr->prot_version != PRP_V1) ++ if (port->hsr->prot_version != PRP_V1 && net_ratelimit()) + netdev_err(skb->dev, "%s: Unknown node\n", __func__); + return; + } diff --git a/queue-5.15/series b/queue-5.15/series index 391ba9c992c..ae3a77a3287 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -95,3 +95,5 @@ selftests-bpf-test-btf-dump-for-struct-with-padding-.patch libbpf-fix-btf-to-c-converter-s-padding-logic.patch selftests-bpf-add-few-corner-cases-to-test-padding-h.patch libbpf-fix-btf_dump-s-packed-struct-determination.patch +hsr-ratelimit-only-when-errors-are-printed.patch +x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch diff --git a/queue-5.15/x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch b/queue-5.15/x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch new file mode 100644 index 00000000000..9e7b93d1c3d --- /dev/null +++ b/queue-5.15/x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch @@ -0,0 +1,36 @@ +From aadbd07ff8a75ed342388846da78dfaddb8b106a Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Tue, 21 Mar 2023 09:03:26 +0100 +Subject: x86/PVH: avoid 32-bit build warning when obtaining VGA console info + +From: Jan Beulich + +commit aadbd07ff8a75ed342388846da78dfaddb8b106a upstream. + +In the commit referenced below I failed to pay attention to this code +also being buildable as 32-bit. Adjust the type of "ret" - there's no +real need for it to be wider than 32 bits. + +Fixes: 934ef33ee75c ("x86/PVH: obtain VGA console info in Dom0") +Reported-by: kernel test robot +Signed-off-by: Jan Beulich +Reviewed-by: Juergen Gross +Signed-off-by: Greg Kroah-Hartman + +Link: https://lore.kernel.org/r/2d2193ff-670b-0a27-e12d-2c5c4c121c79@suse.com +Signed-off-by: Juergen Gross +--- + arch/x86/xen/enlighten_pvh.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/xen/enlighten_pvh.c ++++ b/arch/x86/xen/enlighten_pvh.c +@@ -48,7 +48,7 @@ void __init xen_pvh_init(struct boot_par + struct xen_platform_op op = { + .cmd = XENPF_get_dom0_console, + }; +- long ret = HYPERVISOR_platform_op(&op); ++ int ret = HYPERVISOR_platform_op(&op); + + if (ret > 0) + xen_init_vga(&op.u.dom0_console,