diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 9ac46df..323bfd3 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -81701,7 +81701,7 @@ index 45bb96b543..353d5cd3ed 100644 } diff --git a/lib/ipf.c b/lib/ipf.c -index 446e89d13c..24325a638d 100644 +index 446e89d13c..009f5d1e9b 100644 --- a/lib/ipf.c +++ b/lib/ipf.c @@ -93,7 +93,6 @@ struct ipf_frag { @@ -81753,7 +81753,7 @@ index 446e89d13c..24325a638d 100644 } /* Filters out fragments from a batch of fragments and adjust the batch. */ -@@ -942,8 +938,7 @@ ipf_extract_frags_from_batch(struct ipf *ipf, struct dp_packet_batch *pb, +@@ -942,9 +938,10 @@ ipf_extract_frags_from_batch(struct ipf *ipf, struct dp_packet_batch *pb, ipf_is_valid_v6_frag(ipf, pkt)))) { ovs_mutex_lock(&ipf->ipf_lock); @@ -81761,9 +81761,12 @@ index 446e89d13c..24325a638d 100644 - pb->do_not_steal)) { + if (!ipf_handle_frag(ipf, pkt, dl_type, zone, now, hash_basis)) { dp_packet_batch_refill(pb, pkt, pb_idx); ++ } else { ++ dp_packet_delete(pkt); } ovs_mutex_unlock(&ipf->ipf_lock); -@@ -1153,59 +1148,64 @@ ipf_post_execute_reass_pkts(struct ipf *ipf, + } else { +@@ -1153,59 +1150,64 @@ ipf_post_execute_reass_pkts(struct ipf *ipf, /* Inner batch loop is constant time since batch size is <= * NETDEV_MAX_BURST. */ DP_PACKET_BATCH_REFILL_FOR_EACH (pb_idx, pb_cnt, pkt, pb) { @@ -81867,7 +81870,7 @@ index 446e89d13c..24325a638d 100644 } else { dp_packet_batch_refill(pb, pkt, pb_idx); } -@@ -1337,9 +1337,7 @@ ipf_destroy(struct ipf *ipf) +@@ -1337,9 +1339,7 @@ ipf_destroy(struct ipf *ipf) while (ipf_list->last_sent_idx < ipf_list->last_inuse_idx) { struct dp_packet *pkt = ipf_list->frag_list[ipf_list->last_sent_idx + 1].pkt; diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 1132ec9..e1d1384 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 128%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 129%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -712,6 +712,12 @@ exit 0 %endif %changelog +* Tue Oct 12 2021 Open vSwitch CI - 2.13.0-129 +- Merging upstream branch-2.13 [RH git: fc819dabd3] + Commit list: + ec44c50cf0 ipf: release unhandled packets from the batch + + * Thu Sep 30 2021 Open vSwitch CI - 2.13.0-128 - Merging upstream branch-2.13 [RH git: 9d83aff7e3] Commit list: