Commit c1b52739 authored by Benjamin LaHaise's avatar Benjamin LaHaise Committed by David S. Miller
Browse files

pkt_sched: namespace aware act_mirred 



Eric Dumazet pointed out that act_mirred needs to find the current net_ns,
and struct net pointer is not provided in the call chain.  His original
patch made use of current->nsproxy->net_ns to find the network namespace,
but this fails to work correctly for userspace code that makes use of
netlink sockets in different network namespaces.  Instead, pass the
"struct net *" down along the call chain to where it is needed.

This version removes the ifb changes as Eric has submitted that patch
separately, but is otherwise identical to the previous version.

Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
Tested-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60592833

include/net/act_api.h

+9 −3
Original line number Diff line number Diff line
@@ -91,7 +91,9 @@ struct tc_action_ops { 
	int     (*dump)(struct sk_buff *, struct tc_action *, int, int);

	int     (*cleanup)(struct tc_action *, int bind);

	int     (*lookup)(struct tc_action *, u32);

	int     (*init)(struct nlattr *, struct nlattr *, struct tc_action *, int , int);

	int     (*init)(struct net *net, struct nlattr *nla,

			struct nlattr *est, struct tc_action *act, int ovr,

			int bind);

	int     (*walk)(struct sk_buff *, struct netlink_callback *, int, struct tc_action *);

};
@@ -116,8 +118,12 @@ extern int tcf_register_action(struct tc_action_ops *a); 
extern int tcf_unregister_action(struct tc_action_ops *a);

extern void tcf_action_destroy(struct tc_action *a, int bind);

extern int tcf_action_exec(struct sk_buff *skb, const struct tc_action *a, struct tcf_result *res);

extern struct tc_action *tcf_action_init(struct nlattr *nla, struct nlattr *est, char *n, int ovr, int bind);

extern struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est, char *n, int ovr, int bind);

extern struct tc_action *tcf_action_init(struct net *net, struct nlattr *nla,

					 struct nlattr *est, char *n, int ovr,

					 int bind);

extern struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,

					   struct nlattr *est, char *n, int ovr,

					   int bind);

extern int tcf_action_dump(struct sk_buff *skb, struct tc_action *a, int, int);

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

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

include/net/pkt_cls.h

+4 −3
Original line number Diff line number Diff line
@@ -126,8 +126,9 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, 
	return 0;

}



extern int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb,

	                     struct nlattr *rate_tlv, struct tcf_exts *exts,

extern int tcf_exts_validate(struct net *net, struct tcf_proto *tp,

			     struct nlattr **tb, struct nlattr *rate_tlv,

			     struct tcf_exts *exts,

			     const struct tcf_ext_map *map);

extern void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts);

extern void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,

include/net/sch_generic.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct tcf_proto_ops { 


	unsigned long		(*get)(struct tcf_proto*, u32 handle);

	void			(*put)(struct tcf_proto*, unsigned long);

	int			(*change)(struct sk_buff *,

	int			(*change)(struct net *net, struct sk_buff *,

					struct tcf_proto*, unsigned long,

					u32 handle, struct nlattr **,

					unsigned long *);

net/sched/act_api.c

+10 −8
Original line number Diff line number Diff line
@@ -485,8 +485,9 @@ errout: 
	return err;

}



struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est,

				    char *name, int ovr, int bind)

struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,

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

				    int bind)

{

	struct tc_action *a;

	struct tc_action_ops *a_o;
@@ -542,9 +543,9 @@ struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est, 


	/* backward compatibility for policer */

	if (name == NULL)

		err = a_o->init(tb[TCA_ACT_OPTIONS], est, a, ovr, bind);

		err = a_o->init(net, tb[TCA_ACT_OPTIONS], est, a, ovr, bind);

	else

		err = a_o->init(nla, est, a, ovr, bind);

		err = a_o->init(net, nla, est, a, ovr, bind);

	if (err < 0)

		goto err_free;
@@ -566,8 +567,9 @@ err_out: 
	return ERR_PTR(err);

}



struct tc_action *tcf_action_init(struct nlattr *nla, struct nlattr *est,

				  char *name, int ovr, int bind)

struct tc_action *tcf_action_init(struct net *net, struct nlattr *nla,

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

				  int bind)

{

	struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];

	struct tc_action *head = NULL, *act, *act_prev = NULL;
@@ -579,7 +581,7 @@ struct tc_action *tcf_action_init(struct nlattr *nla, struct nlattr *est, 
		return ERR_PTR(err);



	for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {

		act = tcf_action_init_1(tb[i], est, name, ovr, bind);

		act = tcf_action_init_1(net, tb[i], est, name, ovr, bind);

		if (IS_ERR(act))

			goto err;

		act->order = i;
@@ -960,7 +962,7 @@ tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n, 
	struct tc_action *a;

	u32 seq = n->nlmsg_seq;



	act = tcf_action_init(nla, NULL, NULL, ovr, 0);

	act = tcf_action_init(net, nla, NULL, NULL, ovr, 0);

	if (act == NULL)

		goto done;

	if (IS_ERR(act)) {

net/sched/act_csum.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const struct nla_policy csum_policy[TCA_CSUM_MAX + 1] = { 
	[TCA_CSUM_PARMS] = { .len = sizeof(struct tc_csum), },

};



static int tcf_csum_init(struct nlattr *nla, struct nlattr *est,

static int tcf_csum_init(struct net *n, struct nlattr *nla, struct nlattr *est,

			 struct tc_action *a, int ovr, int bind)

{

	struct nlattr *tb[TCA_CSUM_MAX + 1];

CRA Git | Maintained and supported by SUSTech CRA and CCSE