net: sched: extend TCA_ACT space with TCA_ACT_FLAGS (abbb0d33) · Commits · 戴 / test

include/net/act_api.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ struct tc_action_ops {
		int (init)(struct net net, struct nlattr *nla,
		struct nlattr est, struct tc_action *act, int ovr,
		int bind, bool rtnl_held, struct tcf_proto *tp,
		struct netlink_ext_ack *extack);
		u32 flags, struct netlink_ext_ack *extack);
		int (walk)(struct net , struct sk_buff *,
		struct netlink_callback *, int,
		const struct tc_action_ops *,

include/uapi/linux/pkt_cls.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,9 +16,14 @@ enum {
		TCA_ACT_STATS,
		TCA_ACT_PAD,
		TCA_ACT_COOKIE,
		TCA_ACT_FLAGS,
		__TCA_ACT_MAX
		};

		#define TCA_ACT_FLAGS_NO_PERCPU_STATS 1 /* Don't use percpu allocator for
		* actions stats.
		*/

		#define TCA_ACT_MAX __TCA_ACT_MAX
		#define TCA_OLD_COMPAT (TCA_ACT_MAX+1)
		#define TCA_ACT_MAX_PRIO 32

net/sched/act_api.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -831,12 +831,15 @@ static struct tc_cookie nla_memdup_cookie(struct nlattr *tb)
		return c;
		}

		static const u32 tca_act_flags_allowed = TCA_ACT_FLAGS_NO_PERCPU_STATS;
		static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = {
		[TCA_ACT_KIND] = { .type = NLA_STRING },
		[TCA_ACT_INDEX] = { .type = NLA_U32 },
		[TCA_ACT_COOKIE] = { .type = NLA_BINARY,
		.len = TC_COOKIE_MAX_SIZE },
		[TCA_ACT_OPTIONS] = { .type = NLA_NESTED },
		[TCA_ACT_FLAGS] = { .type = NLA_BITFIELD32,
		.validation_data = &tca_act_flags_allowed },
		};

		struct tc_action tcf_action_init_1(struct net net, struct tcf_proto *tp,
		@@ -845,6 +848,7 @@ struct tc_action tcf_action_init_1(struct net net, struct tcf_proto *tp,
		bool rtnl_held,
		struct netlink_ext_ack *extack)
		{
		struct nla_bitfield32 flags = { 0, 0 };
		struct tc_action *a;
		struct tc_action_ops *a_o;
		struct tc_cookie *cookie = NULL;
		@@ -876,6 +880,8 @@ struct tc_action tcf_action_init_1(struct net net, struct tcf_proto *tp,
		goto err_out;
		}
		}
		if (tb[TCA_ACT_FLAGS])
		flags = nla_get_bitfield32(tb[TCA_ACT_FLAGS]);
		} else {
		if (strlcpy(act_name, name, IFNAMSIZ) >= IFNAMSIZ) {
		NL_SET_ERR_MSG(extack, "TC action name too long");
		@@ -914,10 +920,10 @@ struct tc_action tcf_action_init_1(struct net net, struct tcf_proto *tp,
		/* backward compatibility for policer */
		if (name == NULL)
		err = a_o->init(net, tb[TCA_ACT_OPTIONS], est, &a, ovr, bind,
		rtnl_held, tp, extack);
		rtnl_held, tp, flags.value, extack);
		else
		err = a_o->init(net, nla, est, &a, ovr, bind, rtnl_held,
		tp, extack);
		tp, flags.value, extack);
		if (err < 0)
		goto err_mod;

net/sched/act_bpf.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,8 @@ static void tcf_bpf_prog_fill_cfg(const struct tcf_bpf *prog,
		static int tcf_bpf_init(struct net net, struct nlattr nla,
		struct nlattr est, struct tc_action *act,
		int replace, int bind, bool rtnl_held,
		struct tcf_proto tp, struct netlink_ext_ack extack)
		struct tcf_proto *tp, u32 flags,
		struct netlink_ext_ack *extack)
		{
		struct tc_action_net *tn = net_generic(net, bpf_net_id);
		struct nlattr *tb[TCA_ACT_BPF_MAX + 1];

net/sched/act_connmark.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ static const struct nla_policy connmark_policy[TCA_CONNMARK_MAX + 1] = {
		static int tcf_connmark_init(struct net net, struct nlattr nla,
		struct nlattr est, struct tc_action *a,
		int ovr, int bind, bool rtnl_held,
		struct tcf_proto *tp,
		struct tcf_proto *tp, u32 flags,
		struct netlink_ext_ack *extack)
		{
		struct tc_action_net *tn = net_generic(net, connmark_net_id);

Admin message