From cc14f438db347256fa09848e6554b47eb3d58d21 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 17 2023 17:19:31 +0000 Subject: Import openvswitch3.1-3.1.0-59 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 71c2edb..44908c7 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -416,13 +416,17 @@ index e605187b8..eddb981ae 100644 @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/NEWS b/NEWS -index 37a01dea5..8fbf7219d 100644 +index 37a01dea5..13229cb3a 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,16 @@ -+v3.1.3 - xx xxx xxxx +@@ -1,3 +1,20 @@ ++v3.1.4 - xx xxx xxxx +-------------------- + ++v3.1.3 - 17 Oct 2023 ++-------------------- ++ - Bug fixes ++ +v3.1.2 - 27 Jun 2023 +-------------------- + - Bug fixes @@ -597,7 +601,7 @@ index ee5553f45..3e937910b 100755 sys.exit(1) for line in s.splitlines(): diff --git a/configure.ac b/configure.ac -index 9bf896c01..f4fb551ae 100644 +index 9bf896c01..cd50adcb2 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -605,7 +609,7 @@ index 9bf896c01..f4fb551ae 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 3.1.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 3.1.3, bugs@openvswitch.org) ++AC_INIT(openvswitch, 3.1.4, bugs@openvswitch.org) AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -623,15 +627,21 @@ index 9bf896c01..f4fb551ae 100644 AC_PROG_CXX AC_PROG_CPP diff --git a/debian/changelog b/debian/changelog -index a5ad222c4..b2f60255c 100644 +index a5ad222c4..a47e46242 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,21 @@ +@@ -1,3 +1,27 @@ ++openvswitch (3.1.4-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Tue, 17 Oct 2023 13:02:17 +0200 ++ +openvswitch (3.1.3-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Tue, 27 Jun 2023 14:09:46 +0200 ++ -- Open vSwitch team Tue, 17 Oct 2023 13:02:17 +0200 + +openvswitch (3.1.2-1) unstable; urgency=low + [ Open vSwitch team ] @@ -2675,7 +2685,7 @@ index b89dfdd52..6c9094638 100644 gnh->options, &crit_opt); diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c -index b3421c099..2d7858f51 100644 +index b3421c099..2180b5fb5 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -2345,13 +2345,13 @@ netdev_offload_dpdk_flow_destroy(struct ufid_to_rte_flow_data *rte_flow_data) @@ -2693,6 +2703,59 @@ index b3421c099..2d7858f51 100644 } else { VLOG_ERR("Failed flow: %s/%s: flow destroy %d ufid " UUID_FMT, netdev_get_name(netdev), netdev_get_name(physdev), +@@ -2537,15 +2537,15 @@ out: + return ret; + } + +-static int +-netdev_offload_dpdk_flow_flush(struct netdev *netdev) ++static void ++flush_netdev_flows_in_related(struct netdev *netdev, struct netdev *related) + { +- struct cmap *map = offload_data_map(netdev); +- struct ufid_to_rte_flow_data *data; + unsigned int tid = netdev_offload_thread_id(); ++ struct cmap *map = offload_data_map(related); ++ struct ufid_to_rte_flow_data *data; + + if (!map) { +- return -1; ++ return; + } + + CMAP_FOR_EACH (data, node, map) { +@@ -2556,6 +2556,31 @@ netdev_offload_dpdk_flow_flush(struct netdev *netdev) + netdev_offload_dpdk_flow_destroy(data); + } + } ++} ++ ++static bool ++flush_in_vport_cb(struct netdev *vport, ++ odp_port_t odp_port OVS_UNUSED, ++ void *aux) ++{ ++ struct netdev *netdev = aux; ++ ++ /* Only vports are related to physical devices. */ ++ if (netdev_vport_is_vport_class(vport->netdev_class)) { ++ flush_netdev_flows_in_related(netdev, vport); ++ } ++ ++ return false; ++} ++ ++static int ++netdev_offload_dpdk_flow_flush(struct netdev *netdev) ++{ ++ flush_netdev_flows_in_related(netdev, netdev); ++ ++ if (!netdev_vport_is_vport_class(netdev->netdev_class)) { ++ netdev_ports_traverse(netdev->dpif_type, flush_in_vport_cb, netdev); ++ } + + return 0; + } diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c index 4c78c4816..09f6393f8 100644 --- a/lib/netdev-offload-tc.c @@ -8400,7 +8463,7 @@ index 407bfc60e..2b2afb44c 100644 + } } diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml -index 2b57fc0e3..1204805b1 100644 +index 2b57fc0e3..ca7d18a6d 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -215,6 +215,19 @@ @@ -8423,7 +8486,28 @@ index 2b57fc0e3..1204805b1 100644

-@@ -6296,6 +6309,12 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ +@@ -3688,14 +3701,15 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ + Interface description string. + + +- +- Vendor ID of PCI device. ++ ++ Bus name and bus info such as Vendor ID and Device ID of PCI ++ device. + + +- +- Device ID of PCI device. ++ ++ Ethernet address set for this VF interface. Only reported for dpdk ++ VF representors. + +- + + + +@@ -6296,6 +6310,12 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ translated to an ephemeral port. If there is no collision, no SNAT is performed. diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index ab2873f..ff4a2e6 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 58%{?dist} +Release: 59%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -754,6 +754,16 @@ exit 0 %endif %changelog +* Tue Oct 17 2023 Open vSwitch CI - 3.1.0-59 +- Merging upstream branch-3.1 [RH git: 577f88c045] + Commit list: + 086b269551 Prepare for 3.1.4. + e8f9125c96 Set release date for 3.1.3. + 69a0c4010e netdev-dpdk: Update docs for interface info. + 4fded929a6 netdev-dpdk: Document status options for VF MAC address. + 3e6f7af3dc netdev-offload-dpdk: Fix flushing of a physdev. + + * Thu Oct 12 2023 Timothy Redaelli - 3.1.0-58 - redhat: use rhpkg push instead of git push [RH git: 60672fd20d]