1 files changed, 21 insertions, 14 deletions

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 20b059574e60..ef727f71336e 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -7,12 +7,16 @@
 #include <net/sch_generic.h>
 #include <net/act_api.h>
 
+/* TC action not accessible from user space */
+#define TC_ACT_REINSERT         (TC_ACT_VALUE_MAX + 1)
+
 /* Basic packet classifier frontend definitions. */
 
 struct tcf_walker {
         int     stop;
         int     skip;
         int     count;
+        unsigned long cookie;
         int     (*fn)(struct tcf_proto *, void *node, struct tcf_walker *);
 };
 
@@ -36,9 +40,9 @@ struct tcf_block_cb;
 bool tcf_queue_work(struct rcu_work *rwork, work_func_t func);
 
 #ifdef CONFIG_NET_CLS
-struct tcf_chain *tcf_chain_get(struct tcf_block *block, u32 chain_index,
-                                bool create);
-void tcf_chain_put(struct tcf_chain *chain);
+struct tcf_chain *tcf_chain_get_by_act(struct tcf_block *block,
+                                       u32 chain_index);
+void tcf_chain_put_by_act(struct tcf_chain *chain);
 void tcf_block_netif_keep_dst(struct tcf_block *block);
 int tcf_block_get(struct tcf_block **p_block,
                   struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,
@@ -73,11 +77,13 @@ void tcf_block_cb_incref(struct tcf_block_cb *block_cb);
 unsigned int tcf_block_cb_decref(struct tcf_block_cb *block_cb);
 struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block,
                                              tc_setup_cb_t *cb, void *cb_ident,
-                                             void *cb_priv);
+                                             void *cb_priv,
+                                             struct netlink_ext_ack *extack);
 int tcf_block_cb_register(struct tcf_block *block,
                           tc_setup_cb_t *cb, void *cb_ident,
-                          void *cb_priv);
-void __tcf_block_cb_unregister(struct tcf_block_cb *block_cb);
+                          void *cb_priv, struct netlink_ext_ack *extack);
+void __tcf_block_cb_unregister(struct tcf_block *block,
+                               struct tcf_block_cb *block_cb);
 void tcf_block_cb_unregister(struct tcf_block *block,
                              tc_setup_cb_t *cb, void *cb_ident);
 
@@ -111,11 +117,6 @@ void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q,
 {
 }
 
-static inline bool tcf_block_shared(struct tcf_block *block)
-{
-        return false;
-}
-
 static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
 {
         return NULL;
@@ -166,7 +167,8 @@ unsigned int tcf_block_cb_decref(struct tcf_block_cb *block_cb)
 static inline
 struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block,
                                              tc_setup_cb_t *cb, void *cb_ident,
-                                             void *cb_priv)
+                                             void *cb_priv,
+                                             struct netlink_ext_ack *extack)
 {
         return NULL;
 }
@@ -174,13 +176,14 @@ struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block,
 static inline
 int tcf_block_cb_register(struct tcf_block *block,
                           tc_setup_cb_t *cb, void *cb_ident,
-                          void *cb_priv)
+                          void *cb_priv, struct netlink_ext_ack *extack)
 {
         return 0;
 }
 
 static inline
-void __tcf_block_cb_unregister(struct tcf_block_cb *block_cb)
+void __tcf_block_cb_unregister(struct tcf_block *block,
+                               struct tcf_block_cb *block_cb)
 {
 }
 
@@ -601,6 +604,7 @@ struct tc_block_offload {
         enum tc_block_command command;
         enum tcf_block_binder_type binder_type;
         struct tcf_block *block;
+        struct netlink_ext_ack *extack;
 };
 
 struct tc_cls_common_offload {
@@ -720,6 +724,8 @@ enum tc_fl_command {
         TC_CLSFLOWER_REPLACE,
         TC_CLSFLOWER_DESTROY,
         TC_CLSFLOWER_STATS,
+        TC_CLSFLOWER_TMPLT_CREATE,
+        TC_CLSFLOWER_TMPLT_DESTROY,
 };
 
 struct tc_cls_flower_offload {
@@ -776,6 +782,7 @@ struct tc_mqprio_qopt_offload {
 struct tc_cookie {
         u8  *data;
         u32 len;
+        struct rcu_head rcu;
 };
 
 struct tc_qopt_offload_stats {