compat: Properly handle fragment lru.

In kernels <=3.16 there is an LRU for managing fragment queues for IPv4
and IPv6. Because the backport code comes from more recent upstream
versions of Linux, this LRU management was missing from ip_frag_queue()
and nf_ct_frag6_queue().

Fixes: 595e069a0634 ("compat: Backport IPv4 reassembly.")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>

diff --git a/acinclude.m4 b/acinclude.m4
index 7a714b2cb624e929f4b14ba1febccbd480d4d35e..49f0781bf184589bb3b6b1a8b1d2fd011270406e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -435,6 +435,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
                         [rwlock])
   OVS_FIND_FIELD_IFELSE([$KSRC/include/net/inet_frag.h], [inet_frag_queue],
                         [list_evictor])
+  OVS_GREP_IFELSE([$KSRC/include/net/inet_frag.h], [inet_frag_lru_move])
   OVS_GREP_IFELSE([$KSRC/include/net/inetpeer.h], [vif],
                   [OVS_DEFINE([HAVE_INETPEER_VIF_SUPPORT])])
 

diff --git a/datapath/linux/compat/include/net/inet_frag.h b/datapath/linux/compat/include/net/inet_frag.h
index 332b1a6db950a5fd37c6d4dadc3bdd5cd3325ba9..c37bc845896e925444fd19f5be5818473b5fe932 100644 (file)
--- a/datapath/linux/compat/include/net/inet_frag.h
+++ b/datapath/linux/compat/include/net/inet_frag.h
@@ -23,6 +23,12 @@ static inline bool inet_frag_evicting(struct inet_frag_queue *q)
 }
 #endif /* HAVE_INET_FRAG_EVICTING */
 
+/* Upstream commit 3fd588eb90bf ("inet: frag: remove lru list") dropped this
+ * function, but we call it from our compat code. Provide a noop version. */
+#ifndef HAVE_INET_FRAG_LRU_MOVE
+#define inet_frag_lru_move(q)
+#endif
+
 #ifndef HAVE_CORRECT_MRU_HANDLING
 static inline void rpl_sub_frag_mem_limit(struct netns_frags *nf, int i)
 {

diff --git a/datapath/linux/compat/ip_fragment.c b/datapath/linux/compat/ip_fragment.c
index e707c607fb306a7b94b15dd86960a7c4ac3867f7..b0f5d0e4c411555dfd100d91fdba15d167a72a46 100644 (file)
--- a/datapath/linux/compat/ip_fragment.c
+++ b/datapath/linux/compat/ip_fragment.c
@@ -552,6 +552,7 @@ found:
        }
 
        skb_dst_drop(skb);
+       inet_frag_lru_move(&qp->q);
        return -EINPROGRESS;
 
 err:

diff --git a/datapath/linux/compat/nf_conntrack_reasm.c b/datapath/linux/compat/nf_conntrack_reasm.c
index a66d00f8065e4fd30b3864b0d2732e105dcfba36..e633443d16e08e2aa69237e86430e522ca4ec2a1 100644 (file)
--- a/datapath/linux/compat/nf_conntrack_reasm.c
+++ b/datapath/linux/compat/nf_conntrack_reasm.c
@@ -285,6 +285,7 @@ found:
                qp_flags(fq) |= INET_FRAG_FIRST_IN;
        }
 
+       inet_frag_lru_move(&fq->q);
        return 0;
 
 discard_fq: