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

net: sched: cls_matchall: call block callbacks for offload 



Use the newly introduced callbacks infrastructure and call block
callbacks alongside with the existing per-netdev ndo_setup_tc.

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

net/sched/cls_matchall.c

+45 −27
Original line number Diff line number Diff line
@@ -50,50 +50,73 @@ static void mall_destroy_rcu(struct rcu_head *rcu) 
	kfree(head);

}



static int mall_replace_hw_filter(struct tcf_proto *tp,

static void mall_destroy_hw_filter(struct tcf_proto *tp,

				   struct cls_mall_head *head,

				   unsigned long cookie)

{

	struct net_device *dev = tp->q->dev_queue->dev;

	struct tc_cls_matchall_offload cls_mall = {};

	int err;

	struct tcf_block *block = tp->chain->block;



	tc_cls_common_offload_init(&cls_mall.common, tp);

	cls_mall.command = TC_CLSMATCHALL_REPLACE;

	cls_mall.exts = &head->exts;

	cls_mall.command = TC_CLSMATCHALL_DESTROY;

	cls_mall.cookie = cookie;



	err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSMATCHALL,

	if (tc_can_offload(dev))

		dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSMATCHALL,

					      &cls_mall);

	if (!err)

		head->flags |= TCA_CLS_FLAGS_IN_HW;



	return err;

	tc_setup_cb_call(block, NULL, TC_SETUP_CLSMATCHALL, &cls_mall, false);

}



static void mall_destroy_hw_filter(struct tcf_proto *tp,

static int mall_replace_hw_filter(struct tcf_proto *tp,

				  struct cls_mall_head *head,

				  unsigned long cookie)

{

	struct net_device *dev = tp->q->dev_queue->dev;

	struct tc_cls_matchall_offload cls_mall = {};

	struct tcf_block *block = tp->chain->block;

	bool skip_sw = tc_skip_sw(head->flags);

	int err;



	tc_cls_common_offload_init(&cls_mall.common, tp);

	cls_mall.command = TC_CLSMATCHALL_DESTROY;

	cls_mall.command = TC_CLSMATCHALL_REPLACE;

	cls_mall.exts = &head->exts;

	cls_mall.cookie = cookie;



	dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSMATCHALL, &cls_mall);

	if (tc_can_offload(dev)) {

		err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSMATCHALL,

						    &cls_mall);

		if (err) {

			if (skip_sw)

				return err;

		} else {

			head->flags |= TCA_CLS_FLAGS_IN_HW;

		}

	}



	err = tc_setup_cb_call(block, NULL, TC_SETUP_CLSMATCHALL,

			       &cls_mall, skip_sw);

	if (err < 0) {

		mall_destroy_hw_filter(tp, head, cookie);

		return err;

	} else if (err > 0) {

		head->flags |= TCA_CLS_FLAGS_IN_HW;

	}



	if (skip_sw && !(head->flags & TCA_CLS_FLAGS_IN_HW))

		return -EINVAL;



	return 0;

}



static void mall_destroy(struct tcf_proto *tp)

{

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

	struct net_device *dev = tp->q->dev_queue->dev;



	if (!head)

		return;



	if (tc_should_offload(dev, head->flags))

	if (!tc_skip_hw(head->flags))

		mall_destroy_hw_filter(tp, head, (unsigned long) head);



	call_rcu(&head->rcu, mall_destroy_rcu);
@@ -133,7 +156,6 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, 
		       void **arg, bool ovr)

{

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

	struct net_device *dev = tp->q->dev_queue->dev;

	struct nlattr *tb[TCA_MATCHALL_MAX + 1];

	struct cls_mall_head *new;

	u32 flags = 0;
@@ -173,14 +195,10 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, 
	if (err)

		goto err_set_parms;



	if (tc_should_offload(dev, flags)) {

	if (!tc_skip_hw(new->flags)) {

		err = mall_replace_hw_filter(tp, new, (unsigned long) new);

		if (err) {

			if (tc_skip_sw(flags))

		if (err)

			goto err_replace_hw_filter;

			else

				err = 0;

		}

	}



	if (!tc_in_hw(new->flags))