diff mbox series

[net-next,07/13] net: sched: act_gact: support fast init flag to skip pcpu allocation

Message ID 20191022141804.27639-8-vladbu@mellanox.com
State Changes Requested
Delegated to: David Miller
Headers show
Series Control action percpu counters allocation by netlink flag | expand

Commit Message

Vlad Buslov Oct. 22, 2019, 2:17 p.m. UTC 
Extend gact action with u32 netlink TCA_GACT_FLAGS field. Use it to pass
fast initialization flag defined by previous patch in this series and don't
allocate percpu counters in init code when flag is set. Extend action dump
callback to also dump flags, if field is set.

Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
 include/uapi/linux/tc_act/tc_gact.h |  1 +
 net/sched/act_gact.c                | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/include/uapi/linux/tc_act/tc_gact.h b/include/uapi/linux/tc_act/tc_gact.h
index 37e5392e02c7..b621b7df9919 100644
--- a/include/uapi/linux/tc_act/tc_gact.h
+++ b/include/uapi/linux/tc_act/tc_gact.h
@@ -26,6 +26,7 @@  enum {
 	TCA_GACT_PARMS,
 	TCA_GACT_PROB,
 	TCA_GACT_PAD,
+	TCA_GACT_FLAGS,
 	__TCA_GACT_MAX
 };
 #define TCA_GACT_MAX (__TCA_GACT_MAX - 1)
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index 67654aaa37a3..9d052ade336a 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -48,6 +48,8 @@  static g_rand gact_rand[MAX_RAND] = { NULL, gact_net_rand, gact_determ };
 static const struct nla_policy gact_policy[TCA_GACT_MAX + 1] = {
 	[TCA_GACT_PARMS]	= { .len = sizeof(struct tc_gact) },
 	[TCA_GACT_PROB]		= { .len = sizeof(struct tc_gact_p) },
+	[TCA_GACT_FLAGS]	= { .type = NLA_BITFIELD32,
+				    .validation_data = &tca_flags_allowed },
 };
 
 static int tcf_gact_init(struct net *net, struct nlattr *nla,
@@ -60,8 +62,8 @@  static int tcf_gact_init(struct net *net, struct nlattr *nla,
 	struct tcf_chain *goto_ch = NULL;
 	struct tc_gact *parm;
 	struct tcf_gact *gact;
+	u32 index, flags = 0;
 	int ret = 0;
-	u32 index;
 	int err;
 #ifdef CONFIG_GACT_PROB
 	struct tc_gact_p *p_parm = NULL;
@@ -96,10 +98,13 @@  static int tcf_gact_init(struct net *net, struct nlattr *nla,
 	}
 #endif
 
+	if (tb[TCA_GACT_FLAGS])
+		flags = nla_get_bitfield32(tb[TCA_GACT_FLAGS]).value;
+
 	err = tcf_idr_check_alloc(tn, &index, a, bind);
 	if (!err) {
 		ret = tcf_idr_create(tn, index, est, a,
-				     &act_gact_ops, bind, 0);
+				     &act_gact_ops, bind, flags);
 		if (ret) {
 			tcf_idr_cleanup(tn, index);
 			return ret;
@@ -209,6 +214,15 @@  static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a,
 			goto nla_put_failure;
 	}
 #endif
+	if (gact->tcf_flags) {
+		struct nla_bitfield32 flags = { gact->tcf_flags,
+						gact->tcf_flags };
+
+		if (nla_put(skb, TCA_GACT_FLAGS, sizeof(struct nla_bitfield32),
+			    &flags))
+			goto nla_put_failure;
+	}
+
 	tcf_tm_dump(&t, &gact->tcf_tm);
 	if (nla_put_64bit(skb, TCA_GACT_TM, sizeof(t), &t, TCA_GACT_PAD))
 		goto nla_put_failure;