Netdev List
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: socketcan@hartkopp.net, netdev@vger.kernel.org
Subject: [PATCH net-next] pkt_sched: namespace aware ifb
Date: Sat, 12 Jan 2013 19:06:14 -0800	[thread overview]
Message-ID: <1358046374.20249.1789.camel@edumazet-glaptop> (raw)
In-Reply-To: <20130112.133630.257139657732337147.davem@davemloft.net>

From: Eric Dumazet <edumazet@google.com>

act_mirred needs to find the current net_ns, and struct net
pointer is not provided in the call chain. We run in process
context and current->nsproxy->net_ns is the needed pointer.

For ifb, things are easier, as the current ifb device can provide
the net pointer immediately.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 drivers/net/ifb.c      |    2 +-
 net/sched/act_mirred.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 344dceb..8216438 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -90,7 +90,7 @@ static void ri_tasklet(unsigned long dev)
 		u64_stats_update_end(&dp->tsync);
 
 		rcu_read_lock();
-		skb->dev = dev_get_by_index_rcu(&init_net, skb->skb_iif);
+		skb->dev = dev_get_by_index_rcu(dev_net(_dev), skb->skb_iif);
 		if (!skb->dev) {
 			rcu_read_unlock();
 			dev_kfree_skb(skb);
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 9c0fd0c..f5a7e18 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -88,7 +88,7 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est,
 		return -EINVAL;
 	}
 	if (parm->ifindex) {
-		dev = __dev_get_by_index(&init_net, parm->ifindex);
+		dev = __dev_get_by_index(current->nsproxy->net_ns, parm->ifindex);
 		if (dev == NULL)
 			return -ENODEV;
 		switch (dev->type) {

  reply	other threads:[~2013-01-13  3:06 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-12 13:48 [RFC davem] revert: net: Make skb->skb_iif always track skb->dev Oliver Hartkopp
2013-01-12 18:13 ` Jiri Pirko
2013-01-12 18:40   ` Oliver Hartkopp
2013-01-12 19:37     ` Jiri Pirko
2013-01-12 20:14       ` Oliver Hartkopp
2013-01-12 21:23 ` David Miller
2013-01-12 21:36   ` David Miller
2013-01-13  3:06     ` Eric Dumazet [this message]
2013-01-13  3:50       ` [PATCH net-next] pkt_sched: namespace aware ifb Benjamin LaHaise
2013-01-13  5:49         ` Eric Dumazet
2013-01-13 14:44           ` Jamal Hadi Salim
2013-01-13 16:41             ` Benjamin LaHaise
2013-01-13 16:57               ` Eric Dumazet
2013-01-13 17:25                 ` Jamal Hadi Salim
2013-01-14  5:40                 ` Eric Dumazet
2013-01-13 17:46             ` [PATCH net-next] ifb: dont hard code inet_net use Eric Dumazet
2013-01-14 13:13               ` Jamal Hadi Salim
2013-01-14 15:15                 ` [PATCH net-next] pkt_sched: namespace aware act_mirred Benjamin LaHaise
2013-01-14 20:10                   ` David Miller
2013-01-14 20:13                 ` [PATCH net-next] ifb: dont hard code inet_net use David Miller
2013-01-13 14:59           ` [PATCH net-next] pkt_sched: namespace aware ifb Benjamin LaHaise
2013-01-13 16:35             ` Eric Dumazet
2013-01-13 11:01     ` [RFC davem] revert: net: Make skb->skb_iif always track skb->dev Oliver Hartkopp
2013-01-13 13:20       ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358046374.20249.1789.camel@edumazet-glaptop \
    --to=eric.dumazet@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=socketcan@hartkopp.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox