net: flow_offload: add list handling functions

This patch adds the list handling functions for the flow block API:

* flow_block_cb_lookup() allows drivers to look up for existing flow blocks.
* flow_block_cb_add() adds a flow block to the per driver list to be registered
  by the core.
* flow_block_cb_remove() to remove a flow block from the list of existing
  flow blocks per driver and to request the core to unregister this.

The flow block API also annotates the netns this flow block belongs to.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index 45d74cb542cd20032c5d0444da8529615747cef8..563d7dc7afc1e8b0203961c557f32811cba552bb 100644 (file)
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -256,12 +256,16 @@ struct flow_block_offload {
        enum flow_block_command command;
        enum flow_block_binder_type binder_type;
        struct tcf_block *block;
+       struct net *net;
+       struct list_head cb_list;
        struct list_head *driver_block_list;
        struct netlink_ext_ack *extack;
 };
 
 struct flow_block_cb {
+       struct list_head        driver_list;
        struct list_head        list;
+       struct net              *net;
        tc_setup_cb_t           *cb;
        void                    *cb_ident;
        void                    *cb_priv;
@@ -274,6 +278,21 @@ struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb,
                                          void (*release)(void *cb_priv));
 void flow_block_cb_free(struct flow_block_cb *block_cb);
 
+struct flow_block_cb *flow_block_cb_lookup(struct flow_block_offload *offload,
+                                          tc_setup_cb_t *cb, void *cb_ident);
+
+static inline void flow_block_cb_add(struct flow_block_cb *block_cb,
+                                    struct flow_block_offload *offload)
+{
+       list_add_tail(&block_cb->list, &offload->cb_list);
+}
+
+static inline void flow_block_cb_remove(struct flow_block_cb *block_cb,
+                                       struct flow_block_offload *offload)
+{
+       list_move(&block_cb->list, &offload->cb_list);
+}
+
 int flow_block_cb_setup_simple(struct flow_block_offload *f,
                               struct list_head *driver_list, tc_setup_cb_t *cb,
                               void *cb_ident, void *cb_priv, bool ingress_only);

diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c
index d08148cb69533271b70d3396ca86d8f7fb8d5e9d..c81a7e0c5e044450e21234105e6e8354f75cbfa3 100644 (file)
--- a/net/core/flow_offload.c
+++ b/net/core/flow_offload.c
@@ -176,6 +176,7 @@ struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb,
        if (!block_cb)
                return ERR_PTR(-ENOMEM);
 
+       block_cb->net = net;
        block_cb->cb = cb;
        block_cb->cb_ident = cb_ident;
        block_cb->cb_priv = cb_priv;
@@ -194,6 +195,22 @@ void flow_block_cb_free(struct flow_block_cb *block_cb)
 }
 EXPORT_SYMBOL(flow_block_cb_free);
 
+struct flow_block_cb *flow_block_cb_lookup(struct flow_block_offload *f,
+                                          tc_setup_cb_t *cb, void *cb_ident)
+{
+       struct flow_block_cb *block_cb;
+
+       list_for_each_entry(block_cb, f->driver_block_list, driver_list) {
+               if (block_cb->net == f->net &&
+                   block_cb->cb == cb &&
+                   block_cb->cb_ident == cb_ident)
+                       return block_cb;
+       }
+
+       return NULL;
+}
+EXPORT_SYMBOL(flow_block_cb_lookup);
+
 int flow_block_cb_setup_simple(struct flow_block_offload *f,
                               struct list_head *driver_block_list,
                               tc_setup_cb_t *cb, void *cb_ident, void *cb_priv,

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 49b89c89a8b9adc0f4e526163799a86905937476..ccbd51bed88c93aecdb059c41ad171f824402663 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -680,6 +680,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,
        struct tc_block_offload bo = {
                .command        = command,
                .binder_type    = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
+               .net            = dev_net(indr_dev->dev),
                .block          = indr_dev->block,
        };
 
@@ -768,6 +769,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,
        struct tc_block_offload bo = {
                .command        = command,
                .binder_type    = ei->binder_type,
+               .net            = dev_net(dev),
                .block          = block,
                .extack         = extack,
        };
@@ -796,6 +798,7 @@ static int tcf_block_offload_cmd(struct tcf_block *block,
 {
        struct tc_block_offload bo = {};
 
+       bo.net = dev_net(dev);
        bo.command = command;
        bo.binder_type = ei->binder_type;
        bo.block = block;