1 files changed, 19 insertions, 12 deletions

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 9e59ebfded62..1ad5b19e83a9 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -6,6 +6,7 @@
  * Public action API for classifiers/qdiscs
 */
 
+#include <linux/refcount.h>
 #include <net/sch_generic.h>
 #include <net/pkt_sched.h>
 #include <net/net_namespace.h>
@@ -26,8 +27,8 @@ struct tc_action {
         struct tcf_idrinfo              *idrinfo;
 
         u32                             tcfa_index;
-        int                             tcfa_refcnt;
-        int                             tcfa_bindcnt;
+        refcount_t                      tcfa_refcnt;
+        atomic_t                        tcfa_bindcnt;
         u32                             tcfa_capab;
         int                             tcfa_action;
         struct tcf_t                    tcfa_tm;
@@ -37,7 +38,7 @@ struct tc_action {
         spinlock_t                      tcfa_lock;
         struct gnet_stats_basic_cpu __percpu *cpu_bstats;
         struct gnet_stats_queue __percpu *cpu_qstats;
-        struct tc_cookie        *act_cookie;
+        struct tc_cookie        __rcu *act_cookie;
         struct tcf_chain        *goto_chain;
 };
 #define tcf_index       common.tcfa_index
@@ -84,14 +85,15 @@ struct tc_action_ops {
         size_t  size;
         struct module           *owner;
         int     (*act)(struct sk_buff *, const struct tc_action *,
-                       struct tcf_result *);
+                       struct tcf_result *); /* called under RCU BH lock*/
         int     (*dump)(struct sk_buff *, struct tc_action *, int, int);
         void    (*cleanup)(struct tc_action *);
         int     (*lookup)(struct net *net, struct tc_action **a, u32 index,
                           struct netlink_ext_ack *extack);
         int     (*init)(struct net *net, struct nlattr *nla,
                         struct nlattr *est, struct tc_action **act, int ovr,
-                        int bind, struct netlink_ext_ack *extack);
+                        int bind, bool rtnl_held,
+                        struct netlink_ext_ack *extack);
         int     (*walk)(struct net *, struct sk_buff *,
                         struct netlink_callback *, int,
                         const struct tc_action_ops *,
@@ -99,6 +101,8 @@ struct tc_action_ops {
         void    (*stats_update)(struct tc_action *, u64, u32, u64);
         size_t  (*get_fill_size)(const struct tc_action *act);
         struct net_device *(*get_dev)(const struct tc_action *a);
+        void    (*put_dev)(struct net_device *dev);
+        int     (*delete)(struct net *net, u32 index);
 };
 
 struct tc_action_net {
@@ -151,6 +155,10 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
                    int bind, bool cpustats);
 void tcf_idr_insert(struct tc_action_net *tn, struct tc_action *a);
 
+void tcf_idr_cleanup(struct tc_action_net *tn, u32 index);
+int tcf_idr_check_alloc(struct tc_action_net *tn, u32 *index,
+                        struct tc_action **a, int bind);
+int tcf_idr_delete_index(struct tc_action_net *tn, u32 index);
 int __tcf_idr_release(struct tc_action *a, bool bind, bool strict);
 
 static inline int tcf_idr_release(struct tc_action *a, bool bind)
@@ -161,18 +169,20 @@ static inline int tcf_idr_release(struct tc_action *a, bool bind)
 int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops);
 int tcf_unregister_action(struct tc_action_ops *a,
                           struct pernet_operations *ops);
-int tcf_action_destroy(struct list_head *actions, int bind);
+int tcf_action_destroy(struct tc_action *actions[], int bind);
 int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
                     int nr_actions, struct tcf_result *res);
 int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
                     struct nlattr *est, char *name, int ovr, int bind,
-                    struct list_head *actions, size_t *attr_size,
-                    struct netlink_ext_ack *extack);
+                    struct tc_action *actions[], size_t *attr_size,
+                    bool rtnl_held, struct netlink_ext_ack *extack);
 struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
                                     struct nlattr *nla, struct nlattr *est,
                                     char *name, int ovr, int bind,
+                                    bool rtnl_held,
                                     struct netlink_ext_ack *extack);
-int tcf_action_dump(struct sk_buff *skb, struct list_head *, int, int);
+int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[], int bind,
+                    int ref);
 int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
 int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);
 int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);
@@ -190,9 +200,6 @@ static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,
 #endif
 }
 
-typedef int tc_setup_cb_t(enum tc_setup_type type,
-                          void *type_data, void *cb_priv);
-
 #ifdef CONFIG_NET_CLS_ACT
 int tc_setup_cb_egdev_register(const struct net_device *dev,
                                tc_setup_cb_t *cb, void *cb_priv);