Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8113c095 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net_sched: use void pointer for filter handle 



Now we use 'unsigned long fh' as a pointer in every place,
it is safe to convert it to a void pointer now. This gets
rid of many casts to pointer.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54df2cf8

include/net/pkt_cls.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct tcf_walker { 
	int	stop;

	int	skip;

	int	count;

	int	(*fn)(struct tcf_proto *, unsigned long node, struct tcf_walker *);

	int	(*fn)(struct tcf_proto *, void *node, struct tcf_walker *);

};



int register_tcf_proto_ops(struct tcf_proto_ops *ops);

include/net/sch_generic.h

+4 −4
Original line number Diff line number Diff line
@@ -213,16 +213,16 @@ struct tcf_proto_ops { 
	int			(*init)(struct tcf_proto*);

	void			(*destroy)(struct tcf_proto*);



	unsigned long		(*get)(struct tcf_proto*, u32 handle);

	void*			(*get)(struct tcf_proto*, u32 handle);

	int			(*change)(struct net *net, struct sk_buff *,

					struct tcf_proto*, unsigned long,

					u32 handle, struct nlattr **,

					unsigned long *, bool);

	int			(*delete)(struct tcf_proto*, unsigned long, bool*);

					void **, bool);

	int			(*delete)(struct tcf_proto*, void *, bool*);

	void			(*walk)(struct tcf_proto*, struct tcf_walker *arg);



	/* rtnetlink specific */

	int			(*dump)(struct net*, struct tcf_proto*, unsigned long,

	int			(*dump)(struct net*, struct tcf_proto*, void *,

					struct sk_buff *skb, struct tcmsg*);



	struct module		*owner;

net/sched/cls_api.c

+8 −9
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ EXPORT_SYMBOL(unregister_tcf_proto_ops); 


static int tfilter_notify(struct net *net, struct sk_buff *oskb,

			  struct nlmsghdr *n, struct tcf_proto *tp,

			  unsigned long fh, int event, bool unicast);

			  void *fh, int event, bool unicast);



static int tfilter_del_notify(struct net *net, struct sk_buff *oskb,

			      struct nlmsghdr *n, struct tcf_proto *tp,

			      unsigned long fh, bool unicast, bool *last);

			      void *fh, bool unicast, bool *last);



static void tfilter_notify_chain(struct net *net, struct sk_buff *oskb,

				 struct nlmsghdr *n,
@@ -432,7 +432,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	struct tcf_proto *tp;

	const struct Qdisc_class_ops *cops;

	unsigned long cl;

	unsigned long fh;

	void *fh;

	int err;

	int tp_created;
@@ -571,7 +571,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 


	fh = tp->ops->get(tp, t->tcm_handle);



	if (fh == 0) {

	if (!fh) {

		if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) {

			tcf_chain_tp_remove(chain, &chain_info, tp);

			tfilter_notify(net, skb, n, tp, fh,
@@ -641,7 +641,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
}



static int tcf_fill_node(struct net *net, struct sk_buff *skb,

			 struct tcf_proto *tp, unsigned long fh, u32 portid,

			 struct tcf_proto *tp, void *fh, u32 portid,

			 u32 seq, u16 flags, int event)

{

	struct tcmsg *tcm;
@@ -679,7 +679,7 @@ static int tcf_fill_node(struct net *net, struct sk_buff *skb, 


static int tfilter_notify(struct net *net, struct sk_buff *oskb,

			  struct nlmsghdr *n, struct tcf_proto *tp,

			  unsigned long fh, int event, bool unicast)

			  void *fh, int event, bool unicast)

{

	struct sk_buff *skb;

	u32 portid = oskb ? NETLINK_CB(oskb).portid : 0;
@@ -703,7 +703,7 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb, 


static int tfilter_del_notify(struct net *net, struct sk_buff *oskb,

			      struct nlmsghdr *n, struct tcf_proto *tp,

			      unsigned long fh, bool unicast, bool *last)

			      void *fh, bool unicast, bool *last)

{

	struct sk_buff *skb;

	u32 portid = oskb ? NETLINK_CB(oskb).portid : 0;
@@ -738,8 +738,7 @@ struct tcf_dump_args { 
	struct netlink_callback *cb;

};



static int tcf_node_dump(struct tcf_proto *tp, unsigned long n,

			 struct tcf_walker *arg)

static int tcf_node_dump(struct tcf_proto *tp, void *n, struct tcf_walker *arg)

{

	struct tcf_dump_args *a = (void *)arg;

	struct net *net = sock_net(a->skb->sk);

net/sched/cls_basic.c

+10 −12
Original line number Diff line number Diff line
@@ -56,20 +56,18 @@ static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
	return -1;

}



static unsigned long basic_get(struct tcf_proto *tp, u32 handle)

static void *basic_get(struct tcf_proto *tp, u32 handle)

{

	unsigned long l = 0UL;

	struct basic_head *head = rtnl_dereference(tp->root);

	struct basic_filter *f;



	list_for_each_entry(f, &head->flist, link) {

		if (f->handle == handle) {

			l = (unsigned long) f;

			break;

			return f;

		}

	}



	return l;

	return NULL;

}



static int basic_init(struct tcf_proto *tp)
@@ -106,10 +104,10 @@ static void basic_destroy(struct tcf_proto *tp) 
	kfree_rcu(head, rcu);

}



static int basic_delete(struct tcf_proto *tp, unsigned long arg, bool *last)

static int basic_delete(struct tcf_proto *tp, void *arg, bool *last)

{

	struct basic_head *head = rtnl_dereference(tp->root);

	struct basic_filter *f = (struct basic_filter *) arg;

	struct basic_filter *f = arg;



	list_del_rcu(&f->link);

	tcf_unbind_filter(tp, &f->res);
@@ -149,7 +147,7 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp, 


static int basic_change(struct net *net, struct sk_buff *in_skb,

			struct tcf_proto *tp, unsigned long base, u32 handle,

			struct nlattr **tca, unsigned long *arg, bool ovr)

			struct nlattr **tca, void **arg, bool ovr)

{

	int err;

	struct basic_head *head = rtnl_dereference(tp->root);
@@ -202,7 +200,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb, 
	if (err < 0)

		goto errout;



	*arg = (unsigned long)fnew;

	*arg = fnew;



	if (fold) {

		list_replace_rcu(&fold->link, &fnew->link);
@@ -228,7 +226,7 @@ static void basic_walk(struct tcf_proto *tp, struct tcf_walker *arg) 
		if (arg->count < arg->skip)

			goto skip;



		if (arg->fn(tp, (unsigned long) f, arg) < 0) {

		if (arg->fn(tp, f, arg) < 0) {

			arg->stop = 1;

			break;

		}
@@ -237,10 +235,10 @@ static void basic_walk(struct tcf_proto *tp, struct tcf_walker *arg) 
	}

}



static int basic_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,

static int basic_dump(struct net *net, struct tcf_proto *tp, void *fh,

		      struct sk_buff *skb, struct tcmsg *t)

{

	struct basic_filter *f = (struct basic_filter *) fh;

	struct basic_filter *f = fh;

	struct nlattr *nest;



	if (f == NULL)

net/sched/cls_bpf.c

+12 −15
Original line number Diff line number Diff line
@@ -270,11 +270,11 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog) 
	call_rcu(&prog->rcu, cls_bpf_delete_prog_rcu);

}



static int cls_bpf_delete(struct tcf_proto *tp, unsigned long arg, bool *last)

static int cls_bpf_delete(struct tcf_proto *tp, void *arg, bool *last)

{

	struct cls_bpf_head *head = rtnl_dereference(tp->root);



	__cls_bpf_delete(tp, (struct cls_bpf_prog *) arg);

	__cls_bpf_delete(tp, arg);

	*last = list_empty(&head->plist);

	return 0;

}
@@ -290,20 +290,17 @@ static void cls_bpf_destroy(struct tcf_proto *tp) 
	kfree_rcu(head, rcu);

}



static unsigned long cls_bpf_get(struct tcf_proto *tp, u32 handle)

static void *cls_bpf_get(struct tcf_proto *tp, u32 handle)

{

	struct cls_bpf_head *head = rtnl_dereference(tp->root);

	struct cls_bpf_prog *prog;

	unsigned long ret = 0UL;



	list_for_each_entry(prog, &head->plist, link) {

		if (prog->handle == handle) {

			ret = (unsigned long) prog;

			break;

		}

		if (prog->handle == handle)

			return prog;

	}



	return ret;

	return NULL;

}



static int cls_bpf_prog_from_ops(struct nlattr **tb, struct cls_bpf_prog *prog)
@@ -448,10 +445,10 @@ static u32 cls_bpf_grab_new_handle(struct tcf_proto *tp, 
static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,

			  struct tcf_proto *tp, unsigned long base,

			  u32 handle, struct nlattr **tca,

			  unsigned long *arg, bool ovr)

			  void **arg, bool ovr)

{

	struct cls_bpf_head *head = rtnl_dereference(tp->root);

	struct cls_bpf_prog *oldprog = (struct cls_bpf_prog *) *arg;

	struct cls_bpf_prog *oldprog = *arg;

	struct nlattr *tb[TCA_BPF_MAX + 1];

	struct cls_bpf_prog *prog;

	int ret;
@@ -509,7 +506,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb, 
		list_add_rcu(&prog->link, &head->plist);

	}



	*arg = (unsigned long) prog;

	*arg = prog;

	return 0;



errout:
@@ -557,10 +554,10 @@ static int cls_bpf_dump_ebpf_info(const struct cls_bpf_prog *prog, 
	return 0;

}



static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,

static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, void *fh,

			struct sk_buff *skb, struct tcmsg *tm)

{

	struct cls_bpf_prog *prog = (struct cls_bpf_prog *) fh;

	struct cls_bpf_prog *prog = fh;

	struct nlattr *nest;

	u32 bpf_flags = 0;

	int ret;
@@ -618,7 +615,7 @@ static void cls_bpf_walk(struct tcf_proto *tp, struct tcf_walker *arg) 
	list_for_each_entry(prog, &head->plist, link) {

		if (arg->count < arg->skip)

			goto skip;

		if (arg->fn(tp, (unsigned long) prog, arg) < 0) {

		if (arg->fn(tp, prog, arg) < 0) {

			arg->stop = 1;

			break;

		}