diff --git a/patches.kernel.org/6.2.12-070-selftests-openvswitch-adjust-datapath-NL-messa.patch b/patches.kernel.org/6.2.12-070-selftests-openvswitch-adjust-datapath-NL-messa.patch new file mode 100644 index 0000000..0940fd6 --- /dev/null +++ b/patches.kernel.org/6.2.12-070-selftests-openvswitch-adjust-datapath-NL-messa.patch @@ -0,0 +1,41 @@ +From: Aaron Conole +Date: Wed, 12 Apr 2023 07:58:28 -0400 +Subject: [PATCH] selftests: openvswitch: adjust datapath NL message + declaration +References: bsc#1012628 +Patch-mainline: 6.2.12 +Git-commit: 306dc21361993f4fe50a15d4db6b1a4de5d0adb0 + +[ Upstream commit 306dc21361993f4fe50a15d4db6b1a4de5d0adb0 ] + +The netlink message for creating a new datapath takes an array +of ports for the PID creation. This shouldn't cause much issue +but correct it for future cases where we need to do decode of +datapath information that could include the per-cpu PID map. + +Fixes: 25f16c873fb1 ("selftests: add openvswitch selftest suite") +Signed-off-by: Aaron Conole +Link: https://lore.kernel.org/r/20230412115828.3991806-1-aconole@redhat.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +Signed-off-by: Jiri Slaby +--- + tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +index 3243c90d..5d467d19 100644 +--- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py ++++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +@@ -62,7 +62,7 @@ class OvsDatapath(GenericNetlinkSocket): + nla_map = ( + ("OVS_DP_ATTR_UNSPEC", "none"), + ("OVS_DP_ATTR_NAME", "asciiz"), +- ("OVS_DP_ATTR_UPCALL_PID", "uint32"), ++ ("OVS_DP_ATTR_UPCALL_PID", "array(uint32)"), + ("OVS_DP_ATTR_STATS", "dpstats"), + ("OVS_DP_ATTR_MEGAFLOW_STATS", "megaflowstats"), + ("OVS_DP_ATTR_USER_FEATURES", "uint32"), +-- +2.35.3 + diff --git a/series.conf b/series.conf index 7871d1c..a0aba93 100644 --- a/series.conf +++ b/series.conf @@ -2297,6 +2297,7 @@ patches.kernel.org/6.2.12-067-net-qrtr-Fix-an-uninit-variable-access-bug-in-.patch patches.kernel.org/6.2.12-068-sctp-fix-a-potential-overflow-in-sctp_ifwdtsn_.patch patches.kernel.org/6.2.12-069-RDMA-core-Fix-GID-entry-ref-leak-when-create_a.patch + patches.kernel.org/6.2.12-070-selftests-openvswitch-adjust-datapath-NL-messa.patch ######################################################## # Build fixes that apply to the vanilla kernel too.