Commit 571acf21 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller

net: sched: cls: add extack support for delete callback

This patch adds extack support for classifier delete callback api. This
prepares to handle extack support inside each specific classifier
implementation.

Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50a56190
...@@ -242,7 +242,8 @@ struct tcf_proto_ops { ...@@ -242,7 +242,8 @@ struct tcf_proto_ops {
void **, bool, void **, bool,
struct netlink_ext_ack *); struct netlink_ext_ack *);
int (*delete)(struct tcf_proto *tp, void *arg, int (*delete)(struct tcf_proto *tp, void *arg,
bool *last); bool *last,
struct netlink_ext_ack *);
void (*walk)(struct tcf_proto*, struct tcf_walker *arg); void (*walk)(struct tcf_proto*, struct tcf_walker *arg);
void (*bind_class)(void *, u32, unsigned long); void (*bind_class)(void *, u32, unsigned long);
......
...@@ -955,7 +955,7 @@ static int tfilter_del_notify(struct net *net, struct sk_buff *oskb, ...@@ -955,7 +955,7 @@ static int tfilter_del_notify(struct net *net, struct sk_buff *oskb,
return -EINVAL; return -EINVAL;
} }
err = tp->ops->delete(tp, fh, last); err = tp->ops->delete(tp, fh, last, extack);
if (err) { if (err) {
kfree_skb(skb); kfree_skb(skb);
return err; return err;
......
...@@ -130,7 +130,8 @@ static void basic_destroy(struct tcf_proto *tp) ...@@ -130,7 +130,8 @@ static void basic_destroy(struct tcf_proto *tp)
kfree_rcu(head, rcu); kfree_rcu(head, rcu);
} }
static int basic_delete(struct tcf_proto *tp, void *arg, bool *last) static int basic_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct basic_head *head = rtnl_dereference(tp->root); struct basic_head *head = rtnl_dereference(tp->root);
struct basic_filter *f = arg; struct basic_filter *f = arg;
......
...@@ -295,7 +295,8 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog) ...@@ -295,7 +295,8 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog)
__cls_bpf_delete_prog(prog); __cls_bpf_delete_prog(prog);
} }
static int cls_bpf_delete(struct tcf_proto *tp, void *arg, bool *last) static int cls_bpf_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct cls_bpf_head *head = rtnl_dereference(tp->root); struct cls_bpf_head *head = rtnl_dereference(tp->root);
......
...@@ -156,7 +156,8 @@ static void cls_cgroup_destroy(struct tcf_proto *tp) ...@@ -156,7 +156,8 @@ static void cls_cgroup_destroy(struct tcf_proto *tp)
} }
} }
static int cls_cgroup_delete(struct tcf_proto *tp, void *arg, bool *last) static int cls_cgroup_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
...@@ -575,7 +575,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, ...@@ -575,7 +575,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
return err; return err;
} }
static int flow_delete(struct tcf_proto *tp, void *arg, bool *last) static int flow_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct flow_head *head = rtnl_dereference(tp->root); struct flow_head *head = rtnl_dereference(tp->root);
struct flow_filter *f = arg; struct flow_filter *f = arg;
......
...@@ -985,7 +985,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, ...@@ -985,7 +985,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
return err; return err;
} }
static int fl_delete(struct tcf_proto *tp, void *arg, bool *last) static int fl_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct cls_fl_head *head = rtnl_dereference(tp->root); struct cls_fl_head *head = rtnl_dereference(tp->root);
struct cls_fl_filter *f = arg; struct cls_fl_filter *f = arg;
......
...@@ -172,7 +172,8 @@ static void fw_destroy(struct tcf_proto *tp) ...@@ -172,7 +172,8 @@ static void fw_destroy(struct tcf_proto *tp)
kfree_rcu(head, rcu); kfree_rcu(head, rcu);
} }
static int fw_delete(struct tcf_proto *tp, void *arg, bool *last) static int fw_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct fw_head *head = rtnl_dereference(tp->root); struct fw_head *head = rtnl_dereference(tp->root);
struct fw_filter *f = arg; struct fw_filter *f = arg;
......
...@@ -225,7 +225,8 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, ...@@ -225,7 +225,8 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
return err; return err;
} }
static int mall_delete(struct tcf_proto *tp, void *arg, bool *last) static int mall_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
...@@ -316,7 +316,8 @@ static void route4_destroy(struct tcf_proto *tp) ...@@ -316,7 +316,8 @@ static void route4_destroy(struct tcf_proto *tp)
kfree_rcu(head, rcu); kfree_rcu(head, rcu);
} }
static int route4_delete(struct tcf_proto *tp, void *arg, bool *last) static int route4_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct route4_head *head = rtnl_dereference(tp->root); struct route4_head *head = rtnl_dereference(tp->root);
struct route4_filter *f = arg; struct route4_filter *f = arg;
......
...@@ -350,7 +350,8 @@ static void rsvp_destroy(struct tcf_proto *tp) ...@@ -350,7 +350,8 @@ static void rsvp_destroy(struct tcf_proto *tp)
kfree_rcu(data, rcu); kfree_rcu(data, rcu);
} }
static int rsvp_delete(struct tcf_proto *tp, void *arg, bool *last) static int rsvp_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct rsvp_head *head = rtnl_dereference(tp->root); struct rsvp_head *head = rtnl_dereference(tp->root);
struct rsvp_filter *nfp, *f = arg; struct rsvp_filter *nfp, *f = arg;
......
...@@ -193,7 +193,8 @@ static void tcindex_destroy_fexts(struct rcu_head *head) ...@@ -193,7 +193,8 @@ static void tcindex_destroy_fexts(struct rcu_head *head)
tcf_queue_work(&f->work); tcf_queue_work(&f->work);
} }
static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last) static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct tcindex_data *p = rtnl_dereference(tp->root); struct tcindex_data *p = rtnl_dereference(tp->root);
struct tcindex_filter_result *r = arg; struct tcindex_filter_result *r = arg;
...@@ -246,7 +247,7 @@ static int tcindex_destroy_element(struct tcf_proto *tp, ...@@ -246,7 +247,7 @@ static int tcindex_destroy_element(struct tcf_proto *tp,
{ {
bool last; bool last;
return tcindex_delete(tp, arg, &last); return tcindex_delete(tp, arg, &last, NULL);
} }
static void __tcindex_destroy(struct rcu_head *head) static void __tcindex_destroy(struct rcu_head *head)
......
...@@ -672,7 +672,8 @@ static void u32_destroy(struct tcf_proto *tp) ...@@ -672,7 +672,8 @@ static void u32_destroy(struct tcf_proto *tp)
tp->data = NULL; tp->data = NULL;
} }
static int u32_delete(struct tcf_proto *tp, void *arg, bool *last) static int u32_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack)
{ {
struct tc_u_hnode *ht = arg; struct tc_u_hnode *ht = arg;
struct tc_u_hnode *root_ht = rtnl_dereference(tp->root); struct tc_u_hnode *root_ht = rtnl_dereference(tp->root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment