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

Merge branch 'Implement-classifier-action-terse-dump-mode' 



Vlad Buslov says:

====================
Implement classifier-action terse dump mode

Output rate of current upstream kernel TC filter dump implementation if
relatively low (~100k rules/sec depending on configuration). This
constraint impacts performance of software switch implementation that
rely on TC for their datapath implementation and periodically call TC
filter dump to update rules stats. Moreover, TC filter dump output a lot
of static data that don't change during the filter lifecycle (filter
key, specific action details, etc.) which constitutes significant
portion of payload on resulting netlink packets and increases amount of
syscalls necessary to dump all filters on particular Qdisc. In order to
significantly improve filter dump rate this patch sets implement new
mode of TC filter dump operation named "terse dump" mode. In this mode
only parameters necessary to identify the filter (handle, action cookie,
etc.) and data that can change during filter lifecycle (filter flags,
action stats, etc.) are preserved in dump output while everything else
is omitted.

Userspace API is implemented using new TCA_DUMP_FLAGS tlv with only
available flag value TCA_DUMP_FLAGS_TERSE. Internally, new API requires
individual classifier support (new tcf_proto_ops->terse_dump()
callback). Support for action terse dump is implemented in act API and
don't require changing individual action implementations.

The following table provides performance comparison between regular
filter dump and new terse dump mode for two classifier-action profiles:
one minimal config with L2 flower classifier and single gact action and
another heavier config with L2+5tuple flower classifier with
tunnel_key+mirred actions.

 Classifier-action type      |        dump |  terse dump | X improvement
                             | (rules/sec) | (rules/sec) |
-----------------------------+-------------+-------------+---------------
 L2 with gact                |       141.8 |       293.2 |          2.07
 L2+5tuple tunnel_key+mirred |        76.4 |       198.8 |          2.60

Benchmark details: to measure the rate tc filter dump and terse dump
commands are invoked on ingress Qdisc that have one million filters
configured using following commands.

> time sudo tc -s filter show dev ens1f0 ingress >/dev/null

> time sudo tc -s filter show terse dev ens1f0 ingress >/dev/null

Value in results table is calculated by dividing 1000000 total rules by
"real" time reported by time command.

Setup details: 2x Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz, 32GB memory
====================

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2e186a2c e7534fd4

include/net/act_api.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, 
				    bool rtnl_held,

				    struct netlink_ext_ack *extack);

int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[], int bind,

		    int ref);

		    int ref, bool terse);

int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);

int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);

include/net/pkt_cls.h

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, 
void tcf_exts_destroy(struct tcf_exts *exts);

void tcf_exts_change(struct tcf_exts *dst, struct tcf_exts *src);

int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts);

int tcf_exts_terse_dump(struct sk_buff *skb, struct tcf_exts *exts);

int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts);



/**

include/net/sch_generic.h

+4 −0
Original line number Diff line number Diff line
@@ -330,6 +330,10 @@ struct tcf_proto_ops { 
	int			(*dump)(struct net*, struct tcf_proto*, void *,

					struct sk_buff *skb, struct tcmsg*,

					bool);

	int			(*terse_dump)(struct net *net,

					      struct tcf_proto *tp, void *fh,

					      struct sk_buff *skb,

					      struct tcmsg *t, bool rtnl_held);

	int			(*tmplt_dump)(struct sk_buff *skb,

					      struct net *net,

					      void *tmplt_priv);

include/uapi/linux/rtnetlink.h

+6 −0
Original line number Diff line number Diff line
@@ -609,11 +609,17 @@ enum { 
	TCA_HW_OFFLOAD,

	TCA_INGRESS_BLOCK,

	TCA_EGRESS_BLOCK,

	TCA_DUMP_FLAGS,

	__TCA_MAX

};



#define TCA_MAX (__TCA_MAX - 1)



#define TCA_DUMP_FLAGS_TERSE (1 << 0) /* Means that in dump user gets only basic

				       * data necessary to identify the objects

				       * (handle, cookie, etc.) and stats.

				       */



#define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))

#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))

net/sched/act_api.c

+23 −7
Original line number Diff line number Diff line
@@ -766,12 +766,10 @@ tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int bind, int ref) 
	return a->ops->dump(skb, a, bind, ref);

}



int

tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)

static int

tcf_action_dump_terse(struct sk_buff *skb, struct tc_action *a)

{

	int err = -EINVAL;

	unsigned char *b = skb_tail_pointer(skb);

	struct nlattr *nest;

	struct tc_cookie *cookie;



	if (nla_put_string(skb, TCA_KIND, a->ops->kind))
@@ -789,6 +787,23 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) 
	}

	rcu_read_unlock();



	return 0;



nla_put_failure:

	nlmsg_trim(skb, b);

	return -1;

}



int

tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)

{

	int err = -EINVAL;

	unsigned char *b = skb_tail_pointer(skb);

	struct nlattr *nest;



	if (tcf_action_dump_terse(skb, a))

		goto nla_put_failure;



	if (a->hw_stats != TCA_ACT_HW_STATS_ANY &&

	    nla_put_bitfield32(skb, TCA_ACT_HW_STATS,

			       a->hw_stats, TCA_ACT_HW_STATS_ANY))
@@ -820,7 +835,7 @@ nla_put_failure: 
EXPORT_SYMBOL(tcf_action_dump_1);



int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[],

		    int bind, int ref)

		    int bind, int ref, bool terse)

{

	struct tc_action *a;

	int err = -EINVAL, i;
@@ -831,7 +846,8 @@ int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[], 
		nest = nla_nest_start_noflag(skb, i + 1);

		if (nest == NULL)

			goto nla_put_failure;

		err = tcf_action_dump_1(skb, a, bind, ref);

		err = terse ? tcf_action_dump_terse(skb, a) :

			tcf_action_dump_1(skb, a, bind, ref);

		if (err < 0)

			goto errout;

		nla_nest_end(skb, nest);
@@ -1133,7 +1149,7 @@ static int tca_get_fill(struct sk_buff *skb, struct tc_action *actions[], 
	if (!nest)

		goto out_nlmsg_trim;



	if (tcf_action_dump(skb, actions, bind, ref) < 0)

	if (tcf_action_dump(skb, actions, bind, ref, false) < 0)

		goto out_nlmsg_trim;



	nla_nest_end(skb, nest);

CRA Git | Maintained and supported by SUSTech CRA and CCSE