6 files changed, 50 insertions, 7 deletions

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index be5c12a5c375..269fd78bb0ae 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -481,6 +481,11 @@ static inline bool tc_flags_valid(u32 flags)
         return true;
 }
 
+static inline bool tc_in_hw(u32 flags)
+{
+        return (flags & TCA_CLS_FLAGS_IN_HW) ? true : false;
+}
+
 enum tc_fl_command {
         TC_CLSFLOWER_REPLACE,
         TC_CLSFLOWER_DESTROY,
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 345551e71410..7a69f2a4ca0c 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -103,8 +103,10 @@ enum {
 #define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)
 
 /* tca flags definitions */
-#define TCA_CLS_FLAGS_SKIP_HW   (1 << 0)
-#define TCA_CLS_FLAGS_SKIP_SW   (1 << 1)
+#define TCA_CLS_FLAGS_SKIP_HW   (1 << 0) /* don't offload filter to HW */
+#define TCA_CLS_FLAGS_SKIP_SW   (1 << 1) /* don't use filter in SW */
+#define TCA_CLS_FLAGS_IN_HW     (1 << 2) /* filter is offloaded to HW */
+#define TCA_CLS_FLAGS_NOT_IN_HW (1 << 3) /* filter isn't offloaded to HW */
 
 /* U32 filters */
 
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index d9c97018317d..80f688436dd7 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -148,6 +148,7 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
         struct net_device *dev = tp->q->dev_queue->dev;
         struct tc_cls_bpf_offload bpf_offload = {};
         struct tc_to_netdev offload;
+        int err;
 
         offload.type = TC_SETUP_CLSBPF;
         offload.cls_bpf = &bpf_offload;
@@ -159,8 +160,13 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
         bpf_offload.exts_integrated = prog->exts_integrated;
         bpf_offload.gen_flags = prog->gen_flags;
 
-        return dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
-                                             tp->protocol, &offload);
+        err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
+                                            tp->protocol, &offload);
+
+        if (!err && (cmd == TC_CLSBPF_ADD || cmd == TC_CLSBPF_REPLACE))
+                prog->gen_flags |= TCA_CLS_FLAGS_IN_HW;
+
+        return err;
 }
 
 static int cls_bpf_offload(struct tcf_proto *tp, struct cls_bpf_prog *prog,
@@ -511,6 +517,9 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
                 return ret;
         }
 
+        if (!tc_in_hw(prog->gen_flags))
+                prog->gen_flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
         if (oldprog) {
                 list_replace_rcu(&oldprog->link, &prog->link);
                 tcf_unbind_filter(tp, &oldprog->res);
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 0826c8ec3a76..9d0c99d2e9fb 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -273,6 +273,8 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
 
         err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
                                             tc);
+        if (!err)
+                f->flags |= TCA_CLS_FLAGS_IN_HW;
 
         if (tc_skip_sw(f->flags))
                 return err;
@@ -912,6 +914,9 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
                         goto errout;
         }
 
+        if (!tc_in_hw(fnew->flags))
+                fnew->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
         if (fold) {
                 if (!tc_skip_sw(fold->flags))
                         rhashtable_remove_fast(&head->ht, &fold->ht_node,
@@ -1229,7 +1234,8 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
         if (fl_dump_key_flags(skb, key->control.flags, mask->control.flags))
                 goto nla_put_failure;
 
-        nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags);
+        if (f->flags && nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags))
+                goto nla_put_failure;
 
         if (tcf_exts_dump(skb, &f->exts))
                 goto nla_put_failure;
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index f2141cb55562..224eb2c14346 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -56,6 +56,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
         struct net_device *dev = tp->q->dev_queue->dev;
         struct tc_to_netdev offload;
         struct tc_cls_matchall_offload mall_offload = {0};
+        int err;
 
         offload.type = TC_SETUP_MATCHALL;
         offload.cls_mall = &mall_offload;
@@ -63,8 +64,12 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
         offload.cls_mall->exts = &head->exts;
         offload.cls_mall->cookie = cookie;
 
-        return dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
-                                             &offload);
+        err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
+                                            &offload);
+        if (!err)
+                head->flags |= TCA_CLS_FLAGS_IN_HW;
+
+        return err;
 }
 
 static void mall_destroy_hw_filter(struct tcf_proto *tp,
@@ -194,6 +199,9 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
                 }
         }
 
+        if (!tc_in_hw(new->flags))
+                new->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
         *arg = (unsigned long) head;
         rcu_assign_pointer(tp->root, new);
         if (head)
@@ -244,6 +252,9 @@ static int mall_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
             nla_put_u32(skb, TCA_MATCHALL_CLASSID, head->res.classid))
                 goto nla_put_failure;
 
+        if (head->flags && nla_put_u32(skb, TCA_MATCHALL_FLAGS, head->flags))
+                goto nla_put_failure;
+
         if (tcf_exts_dump(skb, &head->exts))
                 goto nla_put_failure;
 
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index a6ec3e4b57ab..4dbe0c680fe6 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -523,6 +523,10 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
 
         err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
                                             tp->protocol, &offload);
+
+        if (!err)
+                n->flags |= TCA_CLS_FLAGS_IN_HW;
+
         if (tc_skip_sw(flags))
                 return err;
 
@@ -895,6 +899,9 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                         return err;
                 }
 
+                if (!tc_in_hw(new->flags))
+                        new->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
                 u32_replace_knode(tp, tp_c, new);
                 tcf_unbind_filter(tp, &n->res);
                 call_rcu(&n->rcu, u32_delete_key_rcu);
@@ -1014,6 +1021,9 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                 if (err)
                         goto errhw;
 
+                if (!tc_in_hw(n->flags))
+                        n->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
                 ins = &ht->ht[TC_U32_HASH(handle)];
                 for (pins = rtnl_dereference(*ins); pins;
                      ins = &pins->next, pins = rtnl_dereference(*ins))