From 20016049c126508c2a952e03575173e9e3fbdac7 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 12 2021 20:02:13 +0000
Subject: Import openvswitch2.15-2.15.0-43 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index ffe9dc5..c4d8c74 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -19252,7 +19252,7 @@ index 6f7b610a99..fd0127ed17 100644
      dst->allocated = dst->length;
      dst->string = xmalloc(dst->allocated + 1);
 diff --git a/lib/ipf.c b/lib/ipf.c
-index c20bcc0b33..24325a638d 100644
+index c20bcc0b33..009f5d1e9b 100644
 --- a/lib/ipf.c
 +++ b/lib/ipf.c
 @@ -93,7 +93,6 @@ struct ipf_frag {
@@ -19304,7 +19304,7 @@ index c20bcc0b33..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);
@@ -19312,9 +19312,12 @@ index c20bcc0b33..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);
-@@ -1154,52 +1149,56 @@ ipf_post_execute_reass_pkts(struct ipf *ipf,
+         } else {
+@@ -1154,52 +1151,56 @@ ipf_post_execute_reass_pkts(struct ipf *ipf,
           * NETDEV_MAX_BURST. */
          DP_PACKET_BATCH_REFILL_FOR_EACH (pb_idx, pb_cnt, pkt, pb) {
              if (rp && pkt == rp->list->reass_execute_ctx) {
@@ -19409,7 +19412,7 @@ index c20bcc0b33..24325a638d 100644
                  }
  
                  ipf_completed_list_add(&ipf->frag_complete_list, rp->list);
-@@ -1338,9 +1337,7 @@ ipf_destroy(struct ipf *ipf)
+@@ -1338,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.15.spec b/SPECS/openvswitch2.15.spec
index dd5ca77..a30b852 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 42%{?dist}
+Release: 43%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -699,6 +699,12 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 12 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-43
+- Merging upstream branch-2.15 [RH git: 09e3ab3630]
+    Commit list:
+    9efa2ea619 ipf: release unhandled packets from the batch
+
+
 * Thu Sep 30 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-42
 - Merging upstream branch-2.15 [RH git: 2a86017f3f]
     Commit list: