Commit 0623951e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sched-action-events' 



Roman Mashak says:

====================
Fix event generation for actions batch Add/Delete mode

When adding or deleting a batch of entries, the kernel sends upto
TCA_ACT_MAX_PRIO entries in an event to user space. However it does not
consider that the action sizes may vary and require different skb sizes.

For example :

% cat tc-batch.sh
TC="sudo /mnt/iproute2.git/tc/tc"

$TC actions flush action gact
for i in `seq 1 $1`;
do
   cmd="action pass index $i "
   args=$args$cmd
done
$TC actions add $args
%
% ./tc-batch.sh 32
Error: Failed to fill netlink attributes while adding TC action.
We have an error talking to the kernel
%

This patchset introduces new callback in tc_action_ops, which calculates
the action size, and passes size to tcf_add_notify()/tcf_del_notify(). The
patch fixes act_gact, and the rest of actions will be updated in the
follow-up patches.

v3:
   Fixed tcf_action_fill_size() to return shared attrs length when
   action ->get_fill_size() isn't implemented.
v2:
   Restructured patches to make them bisectable.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 79134e6c 9c5c9c57

include/net/act_api.h

+3 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ struct tc_action_ops { 
			const struct tc_action_ops *,

			struct netlink_ext_ack *);

	void	(*stats_update)(struct tc_action *, u64, u32, u64);

	size_t  (*get_fill_size)(const struct tc_action *act);

	struct net_device *(*get_dev)(const struct tc_action *a);

};
@@ -166,7 +167,8 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions, 
		    int nr_actions, struct tcf_result *res);

int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,

		    struct nlattr *est, char *name, int ovr, int bind,

		    struct list_head *actions, struct netlink_ext_ack *extack);

		    struct list_head *actions, size_t *attr_size,

		    struct netlink_ext_ack *extack);

struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,

				    struct nlattr *nla, struct nlattr *est,

				    char *name, int ovr, int bind,

net/sched/act_api.c

+56 −8
Original line number Diff line number Diff line
@@ -109,6 +109,42 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict) 
}

EXPORT_SYMBOL(__tcf_idr_release);



static size_t tcf_action_shared_attrs_size(const struct tc_action *act)

{

	u32 cookie_len = 0;



	if (act->act_cookie)

		cookie_len = nla_total_size(act->act_cookie->len);



	return  nla_total_size(0) /* action number nested */

		+ nla_total_size(IFNAMSIZ) /* TCA_ACT_KIND */

		+ cookie_len /* TCA_ACT_COOKIE */

		+ nla_total_size(0) /* TCA_ACT_STATS nested */

		/* TCA_STATS_BASIC */

		+ nla_total_size_64bit(sizeof(struct gnet_stats_basic))

		/* TCA_STATS_QUEUE */

		+ nla_total_size_64bit(sizeof(struct gnet_stats_queue))

		+ nla_total_size(0) /* TCA_OPTIONS nested */

		+ nla_total_size(sizeof(struct tcf_t)); /* TCA_GACT_TM */

}



static size_t tcf_action_full_attrs_size(size_t sz)

{

	return NLMSG_HDRLEN                     /* struct nlmsghdr */

		+ sizeof(struct tcamsg)

		+ nla_total_size(0)             /* TCA_ACT_TAB nested */

		+ sz;

}



static size_t tcf_action_fill_size(const struct tc_action *act)

{

	size_t sz = tcf_action_shared_attrs_size(act);



	if (act->ops->get_fill_size)

		return act->ops->get_fill_size(act) + sz;

	return sz;

}



static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,

			   struct netlink_callback *cb)

{
@@ -741,10 +777,12 @@ static void cleanup_a(struct list_head *actions, int ovr) 


int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,

		    struct nlattr *est, char *name, int ovr, int bind,

		    struct list_head *actions, struct netlink_ext_ack *extack)

		    struct list_head *actions, size_t *attr_size,

		    struct netlink_ext_ack *extack)

{

	struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];

	struct tc_action *act;

	size_t sz = 0;

	int err;

	int i;
@@ -760,11 +798,14 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla, 
			goto err;

		}

		act->order = i;

		sz += tcf_action_fill_size(act);

		if (ovr)

			act->tcfa_refcnt++;

		list_add_tail(&act->list, actions);

	}



	*attr_size = tcf_action_full_attrs_size(sz);



	/* Remove the temp refcnt which was necessary to protect against

	 * destroying an existing action which was being replaced

	 */
@@ -994,12 +1035,13 @@ err_out: 


static int

tcf_del_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,

	       u32 portid, struct netlink_ext_ack *extack)

	       u32 portid, size_t attr_size, struct netlink_ext_ack *extack)

{

	int ret;

	struct sk_buff *skb;



	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);

	skb = alloc_skb(attr_size <= NLMSG_GOODSIZE ? NLMSG_GOODSIZE : attr_size,

			GFP_KERNEL);

	if (!skb)

		return -ENOBUFS;
@@ -1032,6 +1074,7 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, 
	int i, ret;

	struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];

	struct tc_action *act;

	size_t attr_size = 0;

	LIST_HEAD(actions);



	ret = nla_parse_nested(tb, TCA_ACT_MAX_PRIO, nla, NULL, extack);
@@ -1053,13 +1096,16 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, 
			goto err;

		}

		act->order = i;

		attr_size += tcf_action_fill_size(act);

		list_add_tail(&act->list, &actions);

	}



	attr_size = tcf_action_full_attrs_size(attr_size);



	if (event == RTM_GETACTION)

		ret = tcf_get_notify(net, portid, n, &actions, event, extack);

	else { /* delete */

		ret = tcf_del_notify(net, n, &actions, portid, extack);

		ret = tcf_del_notify(net, n, &actions, portid, attr_size, extack);

		if (ret)

			goto err;

		return ret;
@@ -1072,12 +1118,13 @@ err: 


static int

tcf_add_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,

	       u32 portid, struct netlink_ext_ack *extack)

	       u32 portid, size_t attr_size, struct netlink_ext_ack *extack)

{

	struct sk_buff *skb;

	int err = 0;



	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);

	skb = alloc_skb(attr_size <= NLMSG_GOODSIZE ? NLMSG_GOODSIZE : attr_size,

			GFP_KERNEL);

	if (!skb)

		return -ENOBUFS;
@@ -1099,15 +1146,16 @@ static int tcf_action_add(struct net *net, struct nlattr *nla, 
			  struct nlmsghdr *n, u32 portid, int ovr,

			  struct netlink_ext_ack *extack)

{

	size_t attr_size = 0;

	int ret = 0;

	LIST_HEAD(actions);



	ret = tcf_action_init(net, NULL, nla, NULL, NULL, ovr, 0, &actions,

			      extack);

			      &attr_size, extack);

	if (ret)

		return ret;



	return tcf_add_notify(net, n, &actions, portid, extack);

	return tcf_add_notify(net, n, &actions, portid, attr_size, extack);

}



static u32 tcaa_root_flags_allowed = TCA_FLAG_LARGE_DUMP_ON;

net/sched/act_gact.c

+14 −0
Original line number Diff line number Diff line
@@ -217,6 +217,19 @@ static int tcf_gact_search(struct net *net, struct tc_action **a, u32 index, 
	return tcf_idr_search(tn, a, index);

}



static size_t tcf_gact_get_fill_size(const struct tc_action *act)

{

	size_t sz = nla_total_size(sizeof(struct tc_gact)); /* TCA_GACT_PARMS */



#ifdef CONFIG_GACT_PROB

	if (to_gact(act)->tcfg_ptype)

		/* TCA_GACT_PROB */

		sz += nla_total_size(sizeof(struct tc_gact_p));

#endif



	return sz;

}



static struct tc_action_ops act_gact_ops = {

	.kind		=	"gact",

	.type		=	TCA_ACT_GACT,
@@ -227,6 +240,7 @@ static struct tc_action_ops act_gact_ops = { 
	.init		=	tcf_gact_init,

	.walk		=	tcf_gact_walker,

	.lookup		=	tcf_gact_search,

	.get_fill_size	=	tcf_gact_get_fill_size,

	.size		=	sizeof(struct tcf_gact),

};

net/sched/cls_api.c

+2 −1
Original line number Diff line number Diff line
@@ -1433,6 +1433,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb, 
#ifdef CONFIG_NET_CLS_ACT

	{

		struct tc_action *act;

		size_t attr_size = 0;



		if (exts->police && tb[exts->police]) {

			act = tcf_action_init_1(net, tp, tb[exts->police],
@@ -1450,7 +1451,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb, 


			err = tcf_action_init(net, tp, tb[exts->action],

					      rate_tlv, NULL, ovr, TCA_ACT_BIND,

					      &actions, extack);

					      &actions, &attr_size, extack);

			if (err)

				return err;

			list_for_each_entry(act, &actions, list)

CRA Git | Maintained and supported by SUSTech CRA and CCSE