From: Aaron Conole <aconole@redhat.com>

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 <aconole@redhat.com>

Link: https://lore.kernel.org/r/20230412115828.3991806-1-aconole@redhat.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 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