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

Commit 8d1a77f9 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: sch: api: add extack support in tcf_block_get 



This patch adds extack support for the function tcf_block_get which is
a common used function in the tc subsystem. Callers which are interested
in the receiving error can assign extack to get a more detailed
information why tcf_block_get failed.

Cc: David Ahern <dsahern@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9bc3fa2

include/net/pkt_cls.h

+4 −2
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ struct tcf_chain *tcf_chain_get(struct tcf_block *block, u32 chain_index, 
				bool create);

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);

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

		  struct netlink_ext_ack *extack);

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

		      struct tcf_block_ext_info *ei);

		      struct tcf_block_ext_info *ei,

		      struct netlink_ext_ack *extack);

void tcf_block_put(struct tcf_block *block);

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

		       struct tcf_block_ext_info *ei);

net/sched/cls_api.c

+9 −4
Original line number Diff line number Diff line
@@ -281,20 +281,24 @@ static void tcf_block_offload_unbind(struct tcf_block *block, 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_ext_info *ei,

		      struct netlink_ext_ack *extack)

{

	struct tcf_block *block = kzalloc(sizeof(*block), GFP_KERNEL);

	struct tcf_chain *chain;

	int err;



	if (!block)

	if (!block) {

		NL_SET_ERR_MSG(extack, "Memory allocation for block failed");

		return -ENOMEM;

	}

	INIT_LIST_HEAD(&block->chain_list);

	INIT_LIST_HEAD(&block->cb_list);



	/* Create chain 0 by default, it has to be always present. */

	chain = tcf_chain_create(block, 0);

	if (!chain) {

		NL_SET_ERR_MSG(extack, "Failed to create new tcf chain");

		err = -ENOMEM;

		goto err_chain_create;

	}
@@ -321,7 +325,8 @@ static void tcf_chain_head_change_dflt(struct tcf_proto *tp_head, void *priv) 
}



int tcf_block_get(struct tcf_block **p_block,

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

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

		  struct netlink_ext_ack *extack)

{

	struct tcf_block_ext_info ei = {

		.chain_head_change = tcf_chain_head_change_dflt,
@@ -329,7 +334,7 @@ int tcf_block_get(struct tcf_block **p_block, 
	};



	WARN_ON(!p_filter_chain);

	return tcf_block_get_ext(p_block, q, &ei);

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

}

EXPORT_SYMBOL(tcf_block_get);

net/sched/sch_atm.c

+4 −2
Original line number Diff line number Diff line
@@ -283,7 +283,8 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent, 
		goto err_out;

	}



	error = tcf_block_get(&flow->block, &flow->filter_list, sch);

	error = tcf_block_get(&flow->block, &flow->filter_list, sch,

			      extack);

	if (error) {

		kfree(flow);

		goto err_out;
@@ -550,7 +551,8 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt, 
		p->link.q = &noop_qdisc;

	pr_debug("atm_tc_init: link (%p) qdisc %p\n", &p->link, p->link.q);



	err = tcf_block_get(&p->link.block, &p->link.filter_list, sch);

	err = tcf_block_get(&p->link.block, &p->link.filter_list, sch,

			    extack);

	if (err)

		return err;

net/sched/sch_cbq.c

+2 −2
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt, 
	if (!q->link.R_tab)

		return -EINVAL;



	err = tcf_block_get(&q->link.block, &q->link.filter_list, sch);

	err = tcf_block_get(&q->link.block, &q->link.filter_list, sch, extack);

	if (err)

		goto put_rtab;
@@ -1576,7 +1576,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t 
	if (cl == NULL)

		goto failure;



	err = tcf_block_get(&cl->block, &cl->filter_list, sch);

	err = tcf_block_get(&cl->block, &cl->filter_list, sch, extack);

	if (err) {

		kfree(cl);

		return err;

net/sched/sch_drr.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int drr_init_qdisc(struct Qdisc *sch, struct nlattr *opt, 
	struct drr_sched *q = qdisc_priv(sch);

	int err;



	err = tcf_block_get(&q->block, &q->filter_list, sch);

	err = tcf_block_get(&q->block, &q->filter_list, sch, extack);

	if (err)

		return err;

	err = qdisc_class_hash_init(&q->clhash);