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

Commit c7eb7d72 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: introduce chain_head_change callback 



Add a callback that is to be called whenever head of the chain changes.
Also provide a callback for the default case when the caller gets a
block using non-extended getter.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa5fbf07

include/net/pkt_cls.h

+6 −8
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ enum tcf_block_binder_type { 


struct tcf_block_ext_info {

	enum tcf_block_binder_type binder_type;

	tcf_chain_head_change_t *chain_head_change;

	void *chain_head_change_priv;

};



struct tcf_block_cb;
@@ -37,12 +39,10 @@ struct tcf_chain *tcf_chain_get(struct tcf_block *block, u32 chain_index, 
void tcf_chain_put(struct tcf_chain *chain);

int tcf_block_get(struct tcf_block **p_block,

		  struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q);

int tcf_block_get_ext(struct tcf_block **p_block,

		      struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,

int tcf_block_get_ext(struct tcf_block **p_block, struct Qdisc *q,

		      struct tcf_block_ext_info *ei);

void tcf_block_put(struct tcf_block *block);

void tcf_block_put_ext(struct tcf_block *block,

		       struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,

void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q,

		       struct tcf_block_ext_info *ei);



static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
@@ -82,8 +82,7 @@ int tcf_block_get(struct tcf_block **p_block, 
}



static inline

int tcf_block_get_ext(struct tcf_block **p_block,

		      struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,

int tcf_block_get_ext(struct tcf_block **p_block, struct Qdisc *q,

		      struct tcf_block_ext_info *ei)

{

	return 0;
@@ -94,8 +93,7 @@ static inline void tcf_block_put(struct tcf_block *block) 
}



static inline

void tcf_block_put_ext(struct tcf_block *block,

		       struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,

void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q,

		       struct tcf_block_ext_info *ei)

{

}

include/net/sch_generic.h

+4 −1
Original line number Diff line number Diff line
@@ -260,9 +260,12 @@ struct qdisc_skb_cb { 
	unsigned char		data[QDISC_CB_PRIV_LEN];

};



typedef void tcf_chain_head_change_t(struct tcf_proto *tp_head, void *priv);



struct tcf_chain {

	struct tcf_proto __rcu *filter_chain;

	struct tcf_proto __rcu **p_filter_chain;

	tcf_chain_head_change_t *chain_head_change;

	void *chain_head_change_priv;

	struct list_head list;

	struct tcf_block *block;

	u32 index; /* chain index */

net/sched/cls_api.c

+32 −22
Original line number Diff line number Diff line
@@ -195,12 +195,19 @@ static struct tcf_chain *tcf_chain_create(struct tcf_block *block, 
	return chain;

}



static void tcf_chain_head_change(struct tcf_chain *chain,

				  struct tcf_proto *tp_head)

{

	if (chain->chain_head_change)

		chain->chain_head_change(tp_head,

					 chain->chain_head_change_priv);

}



static void tcf_chain_flush(struct tcf_chain *chain)

{

	struct tcf_proto *tp;



	if (chain->p_filter_chain)

		RCU_INIT_POINTER(*chain->p_filter_chain, NULL);

	tcf_chain_head_change(chain, NULL);

	while ((tp = rtnl_dereference(chain->filter_chain)) != NULL) {

		RCU_INIT_POINTER(chain->filter_chain, tp->next);

		tcf_chain_put(chain);
@@ -242,13 +249,6 @@ void tcf_chain_put(struct tcf_chain *chain) 
}

EXPORT_SYMBOL(tcf_chain_put);



static void

tcf_chain_filter_chain_ptr_set(struct tcf_chain *chain,

			       struct tcf_proto __rcu **p_filter_chain)

{

	chain->p_filter_chain = p_filter_chain;

}



static void tcf_block_offload_cmd(struct tcf_block *block, struct Qdisc *q,

				  struct tcf_block_ext_info *ei,

				  enum tc_block_command command)
@@ -276,8 +276,7 @@ static void tcf_block_offload_unbind(struct tcf_block *block, struct Qdisc *q, 
	tcf_block_offload_cmd(block, q, ei, TC_BLOCK_UNBIND);

}



int tcf_block_get_ext(struct tcf_block **p_block,

		      struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,

int tcf_block_get_ext(struct tcf_block **p_block, struct Qdisc *q,

		      struct tcf_block_ext_info *ei)

{

	struct tcf_block *block = kzalloc(sizeof(*block), GFP_KERNEL);
@@ -295,7 +294,9 @@ int tcf_block_get_ext(struct tcf_block **p_block, 
		err = -ENOMEM;

		goto err_chain_create;

	}

	tcf_chain_filter_chain_ptr_set(chain, p_filter_chain);

	WARN_ON(!ei->chain_head_change);

	chain->chain_head_change = ei->chain_head_change;

	chain->chain_head_change_priv = ei->chain_head_change_priv;

	block->net = qdisc_net(q);

	block->q = q;

	tcf_block_offload_bind(block, q, ei);
@@ -308,12 +309,23 @@ int tcf_block_get_ext(struct tcf_block **p_block, 
}

EXPORT_SYMBOL(tcf_block_get_ext);



static void tcf_chain_head_change_dflt(struct tcf_proto *tp_head, void *priv)

{

	struct tcf_proto __rcu **p_filter_chain = priv;



	rcu_assign_pointer(*p_filter_chain, tp_head);

}



int tcf_block_get(struct tcf_block **p_block,

		  struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q)

{

	struct tcf_block_ext_info ei = {0, };

	struct tcf_block_ext_info ei = {

		.chain_head_change = tcf_chain_head_change_dflt,

		.chain_head_change_priv = p_filter_chain,

	};



	return tcf_block_get_ext(p_block, p_filter_chain, q, &ei);

	WARN_ON(!p_filter_chain);

	return tcf_block_get_ext(p_block, q, &ei);

}

EXPORT_SYMBOL(tcf_block_get);
@@ -334,8 +346,7 @@ static void tcf_block_put_final(struct work_struct *work) 
 * actions should be all removed after flushing. However, filters are now

 * destroyed in tc filter workqueue with RTNL lock, they can not race here.

 */

void tcf_block_put_ext(struct tcf_block *block,

		       struct tcf_proto __rcu **p_filter_chain, struct Qdisc *q,

void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q,

		       struct tcf_block_ext_info *ei)

{

	struct tcf_chain *chain, *tmp;
@@ -361,7 +372,7 @@ void tcf_block_put(struct tcf_block *block) 


	if (!block)

		return;

	tcf_block_put_ext(block, NULL, block->q, &ei);

	tcf_block_put_ext(block, block->q, &ei);

}



EXPORT_SYMBOL(tcf_block_put);
@@ -537,9 +548,8 @@ static void tcf_chain_tp_insert(struct tcf_chain *chain, 
				struct tcf_chain_info *chain_info,

				struct tcf_proto *tp)

{

	if (chain->p_filter_chain &&

	    *chain_info->pprev == chain->filter_chain)

		rcu_assign_pointer(*chain->p_filter_chain, tp);

	if (*chain_info->pprev == chain->filter_chain)

		tcf_chain_head_change(chain, tp);

	RCU_INIT_POINTER(tp->next, tcf_chain_tp_prev(chain_info));

	rcu_assign_pointer(*chain_info->pprev, tp);

	tcf_chain_hold(chain);
@@ -551,8 +561,8 @@ static void tcf_chain_tp_remove(struct tcf_chain *chain, 
{

	struct tcf_proto *next = rtnl_dereference(chain_info->next);



	if (chain->p_filter_chain && tp == chain->filter_chain)

		RCU_INIT_POINTER(*chain->p_filter_chain, next);

	if (tp == chain->filter_chain)

		tcf_chain_head_change(chain, next);

	RCU_INIT_POINTER(*chain_info->pprev, next);

	tcf_chain_put(chain);

}

net/sched/sch_ingress.c

+20 −16
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ static struct tcf_block *ingress_tcf_block(struct Qdisc *sch, unsigned long cl) 
	return q->block;

}



static void clsact_chain_head_change(struct tcf_proto *tp_head, void *priv)

{

	struct tcf_proto __rcu **p_filter_chain = priv;



	rcu_assign_pointer(*p_filter_chain, tp_head);

}



static int ingress_init(struct Qdisc *sch, struct nlattr *opt)

{

	struct ingress_sched_data *q = qdisc_priv(sch);
@@ -61,9 +68,10 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt) 
	int err;



	q->block_info.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS;

	q->block_info.chain_head_change = clsact_chain_head_change;

	q->block_info.chain_head_change_priv = &dev->ingress_cl_list;



	err = tcf_block_get_ext(&q->block, &dev->ingress_cl_list,

				sch, &q->block_info);

	err = tcf_block_get_ext(&q->block, sch, &q->block_info);

	if (err)

		return err;
@@ -76,10 +84,8 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt) 
static void ingress_destroy(struct Qdisc *sch)

{

	struct ingress_sched_data *q = qdisc_priv(sch);

	struct net_device *dev = qdisc_dev(sch);



	tcf_block_put_ext(q->block, &dev->ingress_cl_list,

			  sch, &q->block_info);

	tcf_block_put_ext(q->block, sch, &q->block_info);

	net_dec_ingress_queue();

}
@@ -162,16 +168,18 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt) 
	int err;



	q->ingress_block_info.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS;

	q->ingress_block_info.chain_head_change = clsact_chain_head_change;

	q->ingress_block_info.chain_head_change_priv = &dev->ingress_cl_list;



	err = tcf_block_get_ext(&q->ingress_block, &dev->ingress_cl_list,

				sch, &q->ingress_block_info);

	err = tcf_block_get_ext(&q->ingress_block, sch, &q->ingress_block_info);

	if (err)

		return err;



	q->egress_block_info.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS;

	q->egress_block_info.chain_head_change = clsact_chain_head_change;

	q->egress_block_info.chain_head_change_priv = &dev->egress_cl_list;



	err = tcf_block_get_ext(&q->egress_block, &dev->egress_cl_list,

				sch, &q->egress_block_info);

	err = tcf_block_get_ext(&q->egress_block, sch, &q->egress_block_info);

	if (err)

		goto err_egress_block_get;
@@ -183,20 +191,16 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt) 
	return 0;



err_egress_block_get:

	tcf_block_put_ext(q->ingress_block, &dev->ingress_cl_list,

			  sch, &q->ingress_block_info);

	tcf_block_put_ext(q->ingress_block, sch, &q->ingress_block_info);

	return err;

}



static void clsact_destroy(struct Qdisc *sch)

{

	struct clsact_sched_data *q = qdisc_priv(sch);

	struct net_device *dev = qdisc_dev(sch);



	tcf_block_put_ext(q->egress_block, &dev->egress_cl_list,

			  sch, &q->egress_block_info);

	tcf_block_put_ext(q->ingress_block, &dev->ingress_cl_list,

			  sch, &q->ingress_block_info);

	tcf_block_put_ext(q->egress_block, sch, &q->egress_block_info);

	tcf_block_put_ext(q->ingress_block, sch, &q->ingress_block_info);



	net_dec_ingress_queue();

	net_dec_egress_queue();