netfilter: flowtable: IPIP tunnel hardware offload is not yet support

No driver supports for IPIP tunnels yet, give up early on setting up the
hardware offload for this scenario.

This patch adds a stub that can be enhanced to add more configuration
that are currently not supported. As of now, the offload work is
enqueued to the worker, then ignored if the hardware offload
configuration is not supported.

Check the NF_FLOW_HW flag to know if this entry was already tried once
to be offloaded so this is not retried on refresh when unsupported. Move
NF_FLOW_HW flag check to nf_flow_offload_add(). If this NF_FLOW_HW flag
is unset the _del and _stats variants are never called.

This can be updated later on to skip hardware offload work to be queued
in case hardware offload does not support it.

Fixes: d98103575dcd ("netfilter: flowtable: Add IP6IP6 rx sw acceleration")
Fixes: ab427db17885 ("netfilter: flowtable: Add IPIP rx sw acceleration")
Cc: stable@vger.kernel.org
Reported-by: Yuan Tan <yuantan098@gmail.com>
Reported-by: Xin Liu <bird@lzu.edu.cn>
Reported-by: Zhengyang Chen <chzhengyang2023@lzu.edu.cn>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index 7b23b245a5a86ae4a9fe874b1c65c0d5b7846cf5..dc5c9b48e65a9ba2b6ab3fcd5823ec2e6fc03804 100644 (file)
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -357,6 +357,8 @@ static inline int nf_flow_register_bpf(void)
 
 void nf_flow_offload_add(struct nf_flowtable *flowtable,
                         struct flow_offload *flow);
+void nf_flow_offload_refresh(struct nf_flowtable *flowtable,
+                            struct flow_offload *flow);
 void nf_flow_offload_del(struct nf_flowtable *flowtable,
                         struct flow_offload *flow);
 void nf_flow_offload_stats(struct nf_flowtable *flowtable,

diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 99c5b9d671a0cad88e4f002a2673f9f2bc79bc39..d06ce0848b68e79357c07baa4c0796b0e65e0610 100644 (file)
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -345,10 +345,8 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
 
        nf_ct_refresh(flow->ct, NF_CT_DAY);
 
-       if (nf_flowtable_hw_offload(flow_table)) {
-               __set_bit(NF_FLOW_HW, &flow->flags);
+       if (nf_flowtable_hw_offload(flow_table))
                nf_flow_offload_add(flow_table, flow);
-       }
 
        return 0;
 }
@@ -369,7 +367,8 @@ void flow_offload_refresh(struct nf_flowtable *flow_table,
            test_bit(NF_FLOW_CLOSING, &flow->flags))
                return;
 
-       nf_flow_offload_add(flow_table, flow);
+       if (test_bit(NF_FLOW_HW, &flow->flags))
+               nf_flow_offload_refresh(flow_table, flow);
 }
 EXPORT_SYMBOL_GPL(flow_offload_refresh);
 

diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index 002ec15d988bdbf44f0439fcf21d0b5e1cd06161..801a3dd9ceea3d87907c256b8bac4f2c4128fbb6 100644 (file)
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -1101,9 +1101,17 @@ nf_flow_offload_work_alloc(struct nf_flowtable *flowtable,
        return offload;
 }
 
+static bool nf_flow_offload_unsupported(struct flow_offload *flow)
+{
+       if (flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.tun_num ||
+           flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.tun_num)
+               return true;
 
-void nf_flow_offload_add(struct nf_flowtable *flowtable,
-                        struct flow_offload *flow)
+       return false;
+}
+
+void nf_flow_offload_refresh(struct nf_flowtable *flowtable,
+                            struct flow_offload *flow)
 {
        struct flow_offload_work *offload;
 
@@ -1114,6 +1122,16 @@ void nf_flow_offload_add(struct nf_flowtable *flowtable,
        flow_offload_queue_work(offload);
 }
 
+void nf_flow_offload_add(struct nf_flowtable *flowtable,
+                        struct flow_offload *flow)
+{
+       if (nf_flow_offload_unsupported(flow))
+               return;
+
+       set_bit(NF_FLOW_HW, &flow->flags);
+       nf_flow_offload_refresh(flowtable, flow);
+}
+
 void nf_flow_offload_del(struct nf_flowtable *flowtable,
                         struct flow_offload *flow)
 {