* [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device. @ 2007-09-26 23:53 Eric W. Biederman 2007-09-26 23:55 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy Eric W. Biederman 2007-09-27 5:09 ` [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device David Miller 0 siblings, 2 replies; 16+ messages in thread From: Eric W. Biederman @ 2007-09-26 23:53 UTC (permalink / raw) To: David Miller; +Cc: netdev, Linux Containers This patch add support for dynamically allocating the statistics counters for the loopback device and adds appropriate device methods for allocating and freeing the loopback device. This completes support for creating multiple instances of the loopback device, in preparation for creating per network namespace instances. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- drivers/net/loopback.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 4b6f7b2..f3018bb 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -62,7 +62,6 @@ struct pcpu_lstats { unsigned long packets; unsigned long bytes; }; -static DEFINE_PER_CPU(struct pcpu_lstats, pcpu_lstats); #define LOOPBACK_OVERHEAD (128 + MAX_HEADER + 16 + 16) @@ -134,7 +133,7 @@ static void emulate_large_send_offload(struct sk_buff *skb) */ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) { - struct pcpu_lstats *lb_stats; + struct pcpu_lstats *pcpu_lstats, *lb_stats; skb_orphan(skb); @@ -155,7 +154,8 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) dev->last_rx = jiffies; /* it's OK to use __get_cpu_var() because BHs are off */ - lb_stats = &__get_cpu_var(pcpu_lstats); + pcpu_lstats = netdev_priv(dev); + lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id()); lb_stats->bytes += skb->len; lb_stats->packets++; @@ -166,15 +166,17 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) static struct net_device_stats *get_stats(struct net_device *dev) { + const struct pcpu_lstats *pcpu_lstats; struct net_device_stats *stats = &dev->stats; unsigned long bytes = 0; unsigned long packets = 0; int i; + pcpu_lstats = netdev_priv(dev); for_each_possible_cpu(i) { const struct pcpu_lstats *lb_stats; - lb_stats = &per_cpu(pcpu_lstats, i); + lb_stats = per_cpu_ptr(pcpu_lstats, i); bytes += lb_stats->bytes; packets += lb_stats->packets; } @@ -198,6 +200,26 @@ static const struct ethtool_ops loopback_ethtool_ops = { .get_rx_csum = always_on, }; +static int loopback_dev_init(struct net_device *dev) +{ + struct pcpu_lstats *lstats; + + lstats = alloc_percpu(struct pcpu_lstats); + if (!lstats) + return -ENOMEM; + + dev->priv = lstats; + return 0; +} + +static void loopback_dev_free(struct net_device *dev) +{ + struct pcpu_lstats *lstats = netdev_priv(dev); + + free_percpu(lstats); + free_netdev(dev); +} + /* * The loopback device is special. There is only one instance and * it is statically allocated. Don't do this for other devices. @@ -225,6 +247,8 @@ static void loopback_setup(struct net_device *dev) | NETIF_F_LLTX | NETIF_F_NETNS_LOCAL, dev->ethtool_ops = &loopback_ethtool_ops; + dev->init = loopback_dev_init; + dev->destructor = loopback_dev_free; } /* Setup and register the loopback device. */ -- 1.5.3.rc6.17.g1911 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy 2007-09-26 23:53 [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device Eric W. Biederman @ 2007-09-26 23:55 ` Eric W. Biederman 2007-09-26 23:58 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev Eric W. Biederman 2007-09-27 5:09 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy David Miller 2007-09-27 5:09 ` [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device David Miller 1 sibling, 2 replies; 16+ messages in thread From: Eric W. Biederman @ 2007-09-26 23:55 UTC (permalink / raw) To: David Miller; +Cc: netdev, Linux Containers Currently we never call unregister_netdev for the loopback device so it is impossible for us to reach inetdev_destroy with the loopback device. So the test in inetdev_destroy is unnecessary. Further when testing with my network namespace patches removing unregistering the loopback device and calling inetdev_destroy works fine so there appears to be no reason for avoiding unregistering the loopback device. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- net/ipv4/devinet.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index affea9b..e7f2b02 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -203,8 +203,6 @@ static void inetdev_destroy(struct in_device *in_dev) ASSERT_RTNL(); dev = in_dev->dev; - if (dev == loopback_dev) - return; in_dev->dead = 1; -- 1.5.3.rc6.17.g1911 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev 2007-09-26 23:55 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy Eric W. Biederman @ 2007-09-26 23:58 ` Eric W. Biederman 2007-09-27 0:00 ` [PATCH 4/4] net: Make the loopback device per network namespace Eric W. Biederman ` (2 more replies) 2007-09-27 5:09 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy David Miller 1 sibling, 3 replies; 16+ messages in thread From: Eric W. Biederman @ 2007-09-26 23:58 UTC (permalink / raw) To: David Miller; +Cc: netdev, Linux Containers Now that multiple loopback devices are becoming possible it makes the code a little cleaner and more maintainable to test if a deivice is th a loopback device by testing dev->flags & IFF_LOOPBACK instead of dev == loopback_dev. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- net/ipv4/devinet.c | 4 ++-- net/ipv4/ipconfig.c | 10 +++++++--- net/ipv4/ipvs/ip_vs_core.c | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index e7f2b02..55d199e 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1059,7 +1059,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, in_dev = inetdev_init(dev); if (!in_dev) return notifier_from_errno(-ENOMEM); - if (dev == loopback_dev) { + if (dev->flags & IFF_LOOPBACK) { IN_DEV_CONF_SET(in_dev, NOXFRM, 1); IN_DEV_CONF_SET(in_dev, NOPOLICY, 1); } @@ -1075,7 +1075,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, case NETDEV_UP: if (dev->mtu < 68) break; - if (dev == loopback_dev) { + if (dev->flags & IFF_LOOPBACK) { struct in_ifaddr *ifa; if ((ifa = inet_alloc_ifa()) != NULL) { ifa->ifa_local = diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 2d2e0cd..af5d5b3 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -190,11 +190,15 @@ static int __init ic_open_devs(void) rtnl_lock(); /* bring loopback device up first */ - if (dev_change_flags(loopback_dev, loopback_dev->flags | IFF_UP) < 0) - printk(KERN_ERR "IP-Config: Failed to open %s\n", loopback_dev->name); + for_each_netdev(&init_net, dev) { + if (!(dev->flags & IFF_LOOPBACK)) + continue; + if (dev_change_flags(dev, dev->flags | IFF_UP) < 0) + printk(KERN_ERR "IP-Config: Failed to open %s\n", dev->name); + } for_each_netdev(&init_net, dev) { - if (dev == loopback_dev) + if (dev->flags & IFF_LOOPBACK) continue; if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : (!(dev->flags & IFF_LOOPBACK) && diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c index 7450326..fbca2a2 100644 --- a/net/ipv4/ipvs/ip_vs_core.c +++ b/net/ipv4/ipvs/ip_vs_core.c @@ -961,7 +961,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff **pskb, * ... don't know why 1st test DOES NOT include 2nd (?) */ if (unlikely(skb->pkt_type != PACKET_HOST - || skb->dev == loopback_dev || skb->sk)) { + || skb->dev->flags & IFF_LOOPBACK || skb->sk)) { IP_VS_DBG(12, "packet type=%d proto=%d daddr=%d.%d.%d.%d ignored\n", skb->pkt_type, ip_hdr(skb)->protocol, -- 1.5.3.rc6.17.g1911 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/4] net: Make the loopback device per network namespace 2007-09-26 23:58 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev Eric W. Biederman @ 2007-09-27 0:00 ` Eric W. Biederman 2007-09-27 5:11 ` David Miller 2007-09-27 12:14 ` [Devel] " Denis V. Lunev 2007-09-27 5:10 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev David Miller 2007-09-27 10:34 ` Daniel Lezcano 2 siblings, 2 replies; 16+ messages in thread From: Eric W. Biederman @ 2007-09-27 0:00 UTC (permalink / raw) To: David Miller; +Cc: netdev, Linux Containers This patch makes loopback_dev per network namespace. Adding code to create a different loopback device for each network namespace and adding the code to free a loopback device when a network namespace exits. This patch modifies all users the loopback_dev so they access it as init_net.loopback_dev, keeping all of the code compiling and working. A later pass will be needed to update the users to use something other than the initial network namespace. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- drivers/net/loopback.c | 26 +++++++++++++++++++++----- include/linux/netdevice.h | 1 - include/net/net_namespace.h | 3 +++ net/core/dst.c | 5 +++-- net/decnet/dn_dev.c | 4 ++-- net/decnet/dn_route.c | 14 +++++++------- net/ipv4/route.c | 18 +++++++++--------- net/ipv4/xfrm4_policy.c | 2 +- net/ipv6/addrconf.c | 18 +++++++++--------- net/ipv6/netfilter/ip6t_REJECT.c | 2 +- net/ipv6/route.c | 12 ++++++------ net/ipv6/xfrm6_policy.c | 2 +- net/xfrm/xfrm_policy.c | 2 +- 13 files changed, 64 insertions(+), 45 deletions(-) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index f3018bb..0f9d8c6 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -57,6 +57,7 @@ #include <linux/ip.h> #include <linux/tcp.h> #include <linux/percpu.h> +#include <net/net_namespace.h> struct pcpu_lstats { unsigned long packets; @@ -252,7 +253,7 @@ static void loopback_setup(struct net_device *dev) } /* Setup and register the loopback device. */ -static int __init loopback_init(void) +static int loopback_net_init(struct net *net) { struct net_device *dev; int err; @@ -262,12 +263,13 @@ static int __init loopback_init(void) if (!dev) goto out; + dev->nd_net = net; err = register_netdev(dev); if (err) goto out_free_netdev; err = 0; - loopback_dev = dev; + net->loopback_dev = dev; out: if (err) @@ -279,7 +281,21 @@ out_free_netdev: goto out; } -fs_initcall(loopback_init); +static void loopback_net_exit(struct net *net) +{ + struct net_device *dev = net->loopback_dev; + + unregister_netdev(dev); +} + +static struct pernet_operations loopback_net_ops = { + .init = loopback_net_init, + .exit = loopback_net_exit, +}; + +static int __init loopback_init(void) +{ + return register_pernet_device(&loopback_net_ops); +} -struct net_device *loopback_dev; -EXPORT_SYMBOL(loopback_dev); +fs_initcall(loopback_init); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 2088097..71cf409 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -742,7 +742,6 @@ struct packet_type { #include <linux/interrupt.h> #include <linux/notifier.h> -extern struct net_device *loopback_dev; /* The loopback */ extern rwlock_t dev_base_lock; /* Device list lock */ diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 3ea4194..13b0e3b 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -9,6 +9,7 @@ #include <linux/list.h> struct proc_dir_entry; +struct net_device; struct net { atomic_t count; /* To decided when the network * namespace should be freed. @@ -23,6 +24,8 @@ struct net { struct proc_dir_entry *proc_net_stat; struct proc_dir_entry *proc_net_root; + struct net_device *loopback_dev; /* The loopback */ + struct list_head dev_base_head; struct hlist_head *dev_name_head; struct hlist_head *dev_index_head; diff --git a/net/core/dst.c b/net/core/dst.c index ad5ffa1..16958e6 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -18,6 +18,7 @@ #include <linux/types.h> #include <net/net_namespace.h> +#include <net/net_namespace.h> #include <net/dst.h> /* @@ -278,11 +279,11 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev, if (!unregister) { dst->input = dst->output = dst_discard; } else { - dst->dev = loopback_dev; + dst->dev = init_net.loopback_dev; dev_hold(dst->dev); dev_put(dev); if (dst->neighbour && dst->neighbour->dev == dev) { - dst->neighbour->dev = loopback_dev; + dst->neighbour->dev = init_net.loopback_dev; dev_put(dev); dev_hold(dst->neighbour->dev); } diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index bcaf4c5..26130af 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c @@ -869,10 +869,10 @@ last_chance: rv = dn_dev_get_first(dev, addr); read_unlock(&dev_base_lock); dev_put(dev); - if (rv == 0 || dev == loopback_dev) + if (rv == 0 || dev == init_net.loopback_dev) return rv; } - dev = loopback_dev; + dev = init_net.loopback_dev; dev_hold(dev); goto last_chance; } diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 96fe0aa..b7ebf99 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -887,7 +887,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old .scope = RT_SCOPE_UNIVERSE, } }, .mark = oldflp->mark, - .iif = loopback_dev->ifindex, + .iif = init_net.loopback_dev->ifindex, .oif = oldflp->oif }; struct dn_route *rt = NULL; struct net_device *dev_out = NULL, *dev; @@ -904,7 +904,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old "dn_route_output_slow: dst=%04x src=%04x mark=%d" " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst), dn_ntohs(oldflp->fld_src), - oldflp->mark, loopback_dev->ifindex, oldflp->oif); + oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif); /* If we have an output interface, verify its a DECnet device */ if (oldflp->oif) { @@ -957,7 +957,7 @@ source_ok: err = -EADDRNOTAVAIL; if (dev_out) dev_put(dev_out); - dev_out = loopback_dev; + dev_out = init_net.loopback_dev; dev_hold(dev_out); if (!fl.fld_dst) { fl.fld_dst = @@ -966,7 +966,7 @@ source_ok: if (!fl.fld_dst) goto out; } - fl.oif = loopback_dev->ifindex; + fl.oif = init_net.loopback_dev->ifindex; res.type = RTN_LOCAL; goto make_route; } @@ -1012,7 +1012,7 @@ source_ok: if (dev_out) dev_put(dev_out); if (dn_dev_islocal(neigh->dev, fl.fld_dst)) { - dev_out = loopback_dev; + dev_out = init_net.loopback_dev; res.type = RTN_LOCAL; } else { dev_out = neigh->dev; @@ -1033,7 +1033,7 @@ source_ok: /* Possible improvement - check all devices for local addr */ if (dn_dev_islocal(dev_out, fl.fld_dst)) { dev_put(dev_out); - dev_out = loopback_dev; + dev_out = init_net.loopback_dev; dev_hold(dev_out); res.type = RTN_LOCAL; goto select_source; @@ -1069,7 +1069,7 @@ select_source: fl.fld_src = fl.fld_dst; if (dev_out) dev_put(dev_out); - dev_out = loopback_dev; + dev_out = init_net.loopback_dev; dev_hold(dev_out); fl.oif = dev_out->ifindex; if (res.fi) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index ca2878d..2a9b363 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1402,8 +1402,8 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev, { struct rtable *rt = (struct rtable *) dst; struct in_device *idev = rt->idev; - if (dev != loopback_dev && idev && idev->dev == dev) { - struct in_device *loopback_idev = in_dev_get(loopback_dev); + if (dev != init_net.loopback_dev && idev && idev->dev == dev) { + struct in_device *loopback_idev = in_dev_get(init_net.loopback_dev); if (loopback_idev) { rt->idev = loopback_idev; in_dev_put(idev); @@ -1555,7 +1555,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, #endif rth->rt_iif = rth->fl.iif = dev->ifindex; - rth->u.dst.dev = loopback_dev; + rth->u.dst.dev = init_net.loopback_dev; dev_hold(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev); rth->fl.oif = 0; @@ -1812,7 +1812,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, if (res.type == RTN_LOCAL) { int result; result = fib_validate_source(saddr, daddr, tos, - loopback_dev->ifindex, + init_net.loopback_dev->ifindex, dev, &spec_dst, &itag); if (result < 0) goto martian_source; @@ -1879,7 +1879,7 @@ local_input: #endif rth->rt_iif = rth->fl.iif = dev->ifindex; - rth->u.dst.dev = loopback_dev; + rth->u.dst.dev = init_net.loopback_dev; dev_hold(rth->u.dst.dev); rth->idev = in_dev_get(rth->u.dst.dev); rth->rt_gateway = daddr; @@ -2149,7 +2149,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp) RT_SCOPE_UNIVERSE), } }, .mark = oldflp->mark, - .iif = loopback_dev->ifindex, + .iif = init_net.loopback_dev->ifindex, .oif = oldflp->oif }; struct fib_result res; unsigned flags = 0; @@ -2243,9 +2243,9 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp) fl.fl4_dst = fl.fl4_src = htonl(INADDR_LOOPBACK); if (dev_out) dev_put(dev_out); - dev_out = loopback_dev; + dev_out = init_net.loopback_dev; dev_hold(dev_out); - fl.oif = loopback_dev->ifindex; + fl.oif = init_net.loopback_dev->ifindex; res.type = RTN_LOCAL; flags |= RTCF_LOCAL; goto make_route; @@ -2290,7 +2290,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp) fl.fl4_src = fl.fl4_dst; if (dev_out) dev_put(dev_out); - dev_out = loopback_dev; + dev_out = init_net.loopback_dev; dev_hold(dev_out); fl.oif = dev_out->ifindex; if (res.fi) diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 29ab3de..329825c 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -306,7 +306,7 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev, xdst = (struct xfrm_dst *)dst; if (xdst->u.rt.idev->dev == dev) { - struct in_device *loopback_idev = in_dev_get(loopback_dev); + struct in_device *loopback_idev = in_dev_get(init_net.loopback_dev); BUG_ON(!loopback_idev); do { diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b43574f..6d5c3c2 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2410,7 +2410,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) ASSERT_RTNL(); - if (dev == loopback_dev && how == 1) + if (dev == init_net.loopback_dev && how == 1) how = 0; rt6_ifdown(dev); @@ -4212,19 +4212,19 @@ int __init addrconf_init(void) * device and it being up should be removed. */ rtnl_lock(); - if (!ipv6_add_dev(loopback_dev)) + if (!ipv6_add_dev(init_net.loopback_dev)) err = -ENOMEM; rtnl_unlock(); if (err) return err; - ip6_null_entry.u.dst.dev = loopback_dev; - ip6_null_entry.rt6i_idev = in6_dev_get(loopback_dev); + ip6_null_entry.u.dst.dev = init_net.loopback_dev; + ip6_null_entry.rt6i_idev = in6_dev_get(init_net.loopback_dev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES - ip6_prohibit_entry.u.dst.dev = loopback_dev; - ip6_prohibit_entry.rt6i_idev = in6_dev_get(loopback_dev); - ip6_blk_hole_entry.u.dst.dev = loopback_dev; - ip6_blk_hole_entry.rt6i_idev = in6_dev_get(loopback_dev); + ip6_prohibit_entry.u.dst.dev = init_net.loopback_dev; + ip6_prohibit_entry.rt6i_idev = in6_dev_get(init_net.loopback_dev); + ip6_blk_hole_entry.u.dst.dev = init_net.loopback_dev; + ip6_blk_hole_entry.rt6i_idev = in6_dev_get(init_net.loopback_dev); #endif register_netdevice_notifier(&ipv6_dev_notf); @@ -4279,7 +4279,7 @@ void __exit addrconf_cleanup(void) continue; addrconf_ifdown(dev, 1); } - addrconf_ifdown(loopback_dev, 2); + addrconf_ifdown(init_net.loopback_dev, 2); /* * Check hash table. diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index 5086053..3fd08d5 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c @@ -167,7 +167,7 @@ static inline void send_unreach(struct sk_buff *skb_in, unsigned char code, unsigned int hooknum) { if (hooknum == NF_IP6_LOCAL_OUT && skb_in->dev == NULL) - skb_in->dev = loopback_dev; + skb_in->dev = init_net.loopback_dev; icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0, NULL); } diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a7a21a7..6ff19f9 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -221,8 +221,8 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, struct rt6_info *rt = (struct rt6_info *)dst; struct inet6_dev *idev = rt->rt6i_idev; - if (dev != loopback_dev && idev != NULL && idev->dev == dev) { - struct inet6_dev *loopback_idev = in6_dev_get(loopback_dev); + if (dev != init_net.loopback_dev && idev != NULL && idev->dev == dev) { + struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); if (loopback_idev != NULL) { rt->rt6i_idev = loopback_idev; in6_dev_put(idev); @@ -1185,12 +1185,12 @@ int ip6_route_add(struct fib6_config *cfg) if ((cfg->fc_flags & RTF_REJECT) || (dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK))) { /* hold loopback dev/idev if we haven't done so. */ - if (dev != loopback_dev) { + if (dev != init_net.loopback_dev) { if (dev) { dev_put(dev); in6_dev_put(idev); } - dev = loopback_dev; + dev = init_net.loopback_dev; dev_hold(dev); idev = in6_dev_get(dev); if (!idev) { @@ -1894,13 +1894,13 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, if (rt == NULL) return ERR_PTR(-ENOMEM); - dev_hold(loopback_dev); + dev_hold(init_net.loopback_dev); in6_dev_hold(idev); rt->u.dst.flags = DST_HOST; rt->u.dst.input = ip6_input; rt->u.dst.output = ip6_output; - rt->rt6i_dev = loopback_dev; + rt->rt6i_dev = init_net.loopback_dev; rt->rt6i_idev = idev; rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev); rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst)); diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index cc07216..15aa4c5 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -375,7 +375,7 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, xdst = (struct xfrm_dst *)dst; if (xdst->u.rt6.rt6i_idev->dev == dev) { - struct inet6_dev *loopback_idev = in6_dev_get(loopback_dev); + struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); BUG_ON(!loopback_idev); do { diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index d6dfd7d..76f172f 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1949,7 +1949,7 @@ static int stale_bundle(struct dst_entry *dst) void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev) { while ((dst = dst->child) && dst->xfrm && dst->dev == dev) { - dst->dev = loopback_dev; + dst->dev = init_net.loopback_dev; dev_hold(dst->dev); dev_put(dev); } -- 1.5.3.rc6.17.g1911 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 4/4] net: Make the loopback device per network namespace 2007-09-27 0:00 ` [PATCH 4/4] net: Make the loopback device per network namespace Eric W. Biederman @ 2007-09-27 5:11 ` David Miller 2007-09-27 12:14 ` [Devel] " Denis V. Lunev 1 sibling, 0 replies; 16+ messages in thread From: David Miller @ 2007-09-27 5:11 UTC (permalink / raw) To: ebiederm; +Cc: netdev, containers From: ebiederm@xmission.com (Eric W. Biederman) Date: Wed, 26 Sep 2007 18:00:20 -0600 > > This patch makes loopback_dev per network namespace. Adding > code to create a different loopback device for each network > namespace and adding the code to free a loopback device > when a network namespace exits. > > This patch modifies all users the loopback_dev so they > access it as init_net.loopback_dev, keeping all of the > code compiling and working. A later pass will be needed to > update the users to use something other than the initial network > namespace. > > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Applied to net-2.6.24, thanks Eric. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Devel] [PATCH 4/4] net: Make the loopback device per network namespace 2007-09-27 0:00 ` [PATCH 4/4] net: Make the loopback device per network namespace Eric W. Biederman 2007-09-27 5:11 ` David Miller @ 2007-09-27 12:14 ` Denis V. Lunev 2007-09-27 16:48 ` Eric W. Biederman 1 sibling, 1 reply; 16+ messages in thread From: Denis V. Lunev @ 2007-09-27 12:14 UTC (permalink / raw) To: Eric W. Biederman; +Cc: David Miller, Linux Containers, netdev Eric W. Biederman wrote: > This patch makes loopback_dev per network namespace. Adding > code to create a different loopback device for each network > namespace and adding the code to free a loopback device > when a network namespace exits. > > This patch modifies all users the loopback_dev so they > access it as init_net.loopback_dev, keeping all of the > code compiling and working. A later pass will be needed to > update the users to use something other than the initial network > namespace. A pity that an important bit of explanation is missed. The initialization of loopback_dev is moved from a chain of devices (init_module) to a subsystem initialization to keep proper order, i.e. we must be sure that the initialization order is correct. Regards, Den ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Devel] [PATCH 4/4] net: Make the loopback device per network namespace 2007-09-27 12:14 ` [Devel] " Denis V. Lunev @ 2007-09-27 16:48 ` Eric W. Biederman 0 siblings, 0 replies; 16+ messages in thread From: Eric W. Biederman @ 2007-09-27 16:48 UTC (permalink / raw) To: Denis V. Lunev; +Cc: David Miller, Linux Containers, netdev "Denis V. Lunev" <den@sw.ru> writes: > Eric W. Biederman wrote: >> This patch makes loopback_dev per network namespace. Adding >> code to create a different loopback device for each network >> namespace and adding the code to free a loopback device >> when a network namespace exits. >> >> This patch modifies all users the loopback_dev so they >> access it as init_net.loopback_dev, keeping all of the >> code compiling and working. A later pass will be needed to >> update the users to use something other than the initial network >> namespace. > > A pity that an important bit of explanation is missed. The > initialization of loopback_dev is moved from a chain of devices > (init_module) to a subsystem initialization to keep proper order, i.e. > we must be sure that the initialization order is correct. That didn't happen in the patch you mentioned. That happened when we started dynamically allocating the loopback device. That was the patch Daniel sent out a bit ago. There are certainly some ordering issues and it may have helped to talk about them. But they are because things assume the loopback device is present. We have various bits of code that is around such as the dst_ifdown case that assumes if another network device is present the loopback device is present. To fulfill that assumption I guess that means we have both an initialization order dependency and a destruction order dependency. The fact we were using module_init before actually appears to me to have been racy, but we got away with it because the actual data structure was statically allocated. Since it appears that for a dynamically allocated loopback registering it first and unregistering it last is necessary for routing. It is likely worth looking at this a little more closely and making a guarantee. So we can make it easier for networking layers like ipv6, that want to memorize which device is the loopback device. Eric ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev 2007-09-26 23:58 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev Eric W. Biederman 2007-09-27 0:00 ` [PATCH 4/4] net: Make the loopback device per network namespace Eric W. Biederman @ 2007-09-27 5:10 ` David Miller 2007-09-27 10:34 ` Daniel Lezcano 2 siblings, 0 replies; 16+ messages in thread From: David Miller @ 2007-09-27 5:10 UTC (permalink / raw) To: ebiederm; +Cc: netdev, containers From: ebiederm@xmission.com (Eric W. Biederman) Date: Wed, 26 Sep 2007 17:58:21 -0600 > > Now that multiple loopback devices are becoming possible it makes > the code a little cleaner and more maintainable to test if a deivice > is th a loopback device by testing dev->flags & IFF_LOOPBACK instead > of dev == loopback_dev. > > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Applied. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev 2007-09-26 23:58 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev Eric W. Biederman 2007-09-27 0:00 ` [PATCH 4/4] net: Make the loopback device per network namespace Eric W. Biederman 2007-09-27 5:10 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev David Miller @ 2007-09-27 10:34 ` Daniel Lezcano 2007-09-27 16:10 ` Eric W. Biederman 2 siblings, 1 reply; 16+ messages in thread From: Daniel Lezcano @ 2007-09-27 10:34 UTC (permalink / raw) To: Eric W. Biederman; +Cc: David Miller, Linux Containers, netdev, urs Eric W. Biederman wrote: > Now that multiple loopback devices are becoming possible it makes > the code a little cleaner and more maintainable to test if a deivice > is th a loopback device by testing dev->flags & IFF_LOOPBACK instead > of dev == loopback_dev. > > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Urs Thuermann posted the patch: [PATCH 5/7] CAN: Add virtual CAN netdevice driver This network driver set its flag to IFF_LOOPBACK for testing. Is it possible this can be a collision with your patch ? ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev 2007-09-27 10:34 ` Daniel Lezcano @ 2007-09-27 16:10 ` Eric W. Biederman 0 siblings, 0 replies; 16+ messages in thread From: Eric W. Biederman @ 2007-09-27 16:10 UTC (permalink / raw) To: Daniel Lezcano; +Cc: David Miller, Linux Containers, netdev, urs Daniel Lezcano <dlezcano@fr.ibm.com> writes: > Eric W. Biederman wrote: >> Now that multiple loopback devices are becoming possible it makes >> the code a little cleaner and more maintainable to test if a deivice >> is th a loopback device by testing dev->flags & IFF_LOOPBACK instead >> of dev == loopback_dev. >> >> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> > > > Urs Thuermann posted the patch: > > [PATCH 5/7] CAN: Add virtual CAN netdevice driver > > This network driver set its flag to IFF_LOOPBACK for testing. > Is it possible this can be a collision with your patch ? I have brought it up on that thread. As best as I tell the CAN usage of IFF_LOOPBACK will be a problem even without my patch. Assuming something other then the CAN layer will see the CAN devices. The CAN documentations IFF_LOOPBACK should be set on all CAN devices. It seems that the people who want high performance predictable CAN don't want this and the people who want something they can trace easily want this. It sounds to me like CAN routers don't exist. Anyway hopefully that usage can be resolved as that code is reviewed, and made ready to merge. Eric ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy 2007-09-26 23:55 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy Eric W. Biederman 2007-09-26 23:58 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev Eric W. Biederman @ 2007-09-27 5:09 ` David Miller 1 sibling, 0 replies; 16+ messages in thread From: David Miller @ 2007-09-27 5:09 UTC (permalink / raw) To: ebiederm; +Cc: netdev, containers From: ebiederm@xmission.com (Eric W. Biederman) Date: Wed, 26 Sep 2007 17:55:29 -0600 > > Currently we never call unregister_netdev for the loopback device so > it is impossible for us to reach inetdev_destroy with the loopback > device. So the test in inetdev_destroy is unnecessary. > > Further when testing with my network namespace patches removing > unregistering the loopback device and calling inetdev_destroy works > fine so there appears to be no reason for avoiding unregistering the > loopback device. > > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Fair enough, applied to net-2.6.24 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device. 2007-09-26 23:53 [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device Eric W. Biederman 2007-09-26 23:55 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy Eric W. Biederman @ 2007-09-27 5:09 ` David Miller 2007-09-27 7:48 ` Eric W. Biederman 1 sibling, 1 reply; 16+ messages in thread From: David Miller @ 2007-09-27 5:09 UTC (permalink / raw) To: ebiederm; +Cc: netdev, containers From: ebiederm@xmission.com (Eric W. Biederman) Date: Wed, 26 Sep 2007 17:53:40 -0600 > > This patch add support for dynamically allocating the statistics counters > for the loopback device and adds appropriate device methods for allocating > and freeing the loopback device. > > This completes support for creating multiple instances of the loopback > device, in preparation for creating per network namespace instances. > > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Applied to net-2.6.24, thanks. > @@ -155,7 +154,8 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) > dev->last_rx = jiffies; > > /* it's OK to use __get_cpu_var() because BHs are off */ > - lb_stats = &__get_cpu_var(pcpu_lstats); > + pcpu_lstats = netdev_priv(dev); > + lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id()); > lb_stats->bytes += skb->len; > lb_stats->packets++; > I'm going to add a followon change that gets rid of that comment about __get_cpu_var() since it is no longer relevant. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device. 2007-09-27 5:09 ` [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device David Miller @ 2007-09-27 7:48 ` Eric W. Biederman 2007-09-27 18:52 ` David Miller 0 siblings, 1 reply; 16+ messages in thread From: Eric W. Biederman @ 2007-09-27 7:48 UTC (permalink / raw) To: David Miller; +Cc: netdev, containers David Miller <davem@davemloft.net> writes: > From: ebiederm@xmission.com (Eric W. Biederman) > Date: Wed, 26 Sep 2007 17:53:40 -0600 > >> >> This patch add support for dynamically allocating the statistics counters >> for the loopback device and adds appropriate device methods for allocating >> and freeing the loopback device. >> >> This completes support for creating multiple instances of the loopback >> device, in preparation for creating per network namespace instances. >> >> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> > > Applied to net-2.6.24, thanks. > >> @@ -155,7 +154,8 @@ static int loopback_xmit(struct sk_buff *skb, struct > net_device *dev) >> dev->last_rx = jiffies; >> >> /* it's OK to use __get_cpu_var() because BHs are off */ >> - lb_stats = &__get_cpu_var(pcpu_lstats); >> + pcpu_lstats = netdev_priv(dev); >> + lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id()); >> lb_stats->bytes += skb->len; >> lb_stats->packets++; >> > > I'm going to add a followon change that gets rid of that > comment about __get_cpu_var() since it is no longer > relevant. Good point. I'm not doing get_cpu/put_cpu so does the comment make sense in relationship to per_cpu_ptr? Eric ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device. 2007-09-27 7:48 ` Eric W. Biederman @ 2007-09-27 18:52 ` David Miller 2007-09-27 20:44 ` Eric W. Biederman 0 siblings, 1 reply; 16+ messages in thread From: David Miller @ 2007-09-27 18:52 UTC (permalink / raw) To: ebiederm; +Cc: netdev, containers From: ebiederm@xmission.com (Eric W. Biederman) Date: Thu, 27 Sep 2007 01:48:00 -0600 > I'm not doing get_cpu/put_cpu so does the comment make sense > in relationship to per_cpu_ptr? It is possible. But someone would need to go check for sure. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device. 2007-09-27 18:52 ` David Miller @ 2007-09-27 20:44 ` Eric W. Biederman 2007-09-27 20:56 ` David Miller 0 siblings, 1 reply; 16+ messages in thread From: Eric W. Biederman @ 2007-09-27 20:44 UTC (permalink / raw) To: David Miller; +Cc: netdev, containers David Miller <davem@davemloft.net> writes: > From: ebiederm@xmission.com (Eric W. Biederman) > Date: Thu, 27 Sep 2007 01:48:00 -0600 > >> I'm not doing get_cpu/put_cpu so does the comment make sense >> in relationship to per_cpu_ptr? > > It is possible. But someone would need to go check for > sure. Verified. hard_start_xmit is called inside of a rcu_read_lock_bh(),rcu_read_unlock_bh() pair. Which means the code will only run on one cpu. Therefore we do not need get_cpu/put_cpu. In addition per_cpu_ptr is valid. As it is just a lookup into a NR_CPUS sized array by smp_processor_id() to return the address of the specific cpu. The only difference between per_cpu_ptr and __get_cpu_var() are the implementation details between statically allocated and dynamically allocated per cpu state. So the comment is still valid, and still interesting it just should say per_cpu_ptr instead of __get_cpu_var. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 0f9d8c6..756e267 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -154,7 +154,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) #endif dev->last_rx = jiffies; - /* it's OK to use __get_cpu_var() because BHs are off */ + /* it's OK to use per_cpu_ptr() because BHs are off */ pcpu_lstats = netdev_priv(dev); lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id()); lb_stats->bytes += skb->len; ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device. 2007-09-27 20:44 ` Eric W. Biederman @ 2007-09-27 20:56 ` David Miller 0 siblings, 0 replies; 16+ messages in thread From: David Miller @ 2007-09-27 20:56 UTC (permalink / raw) To: ebiederm; +Cc: netdev, containers From: ebiederm@xmission.com (Eric W. Biederman) Date: Thu, 27 Sep 2007 14:44:37 -0600 > David Miller <davem@davemloft.net> writes: > > > From: ebiederm@xmission.com (Eric W. Biederman) > > Date: Thu, 27 Sep 2007 01:48:00 -0600 > > > >> I'm not doing get_cpu/put_cpu so does the comment make sense > >> in relationship to per_cpu_ptr? > > > > It is possible. But someone would need to go check for > > sure. > > Verified. > > hard_start_xmit is called inside of a > rcu_read_lock_bh(),rcu_read_unlock_bh() pair. Which means > the code will only run on one cpu. > > Therefore we do not need get_cpu/put_cpu. > > In addition per_cpu_ptr is valid. As it is just a lookup > into a NR_CPUS sized array by smp_processor_id() to return > the address of the specific cpu. > > The only difference between per_cpu_ptr and __get_cpu_var() > are the implementation details between statically allocated > and dynamically allocated per cpu state. > > So the comment is still valid, and still interesting it just > should say per_cpu_ptr instead of __get_cpu_var. > > Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> I've already removed the comment, so you'll have to give me a patch that adds it back with the new content :-) ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2007-09-27 20:56 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-09-26 23:53 [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device Eric W. Biederman 2007-09-26 23:55 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy Eric W. Biederman 2007-09-26 23:58 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev Eric W. Biederman 2007-09-27 0:00 ` [PATCH 4/4] net: Make the loopback device per network namespace Eric W. Biederman 2007-09-27 5:11 ` David Miller 2007-09-27 12:14 ` [Devel] " Denis V. Lunev 2007-09-27 16:48 ` Eric W. Biederman 2007-09-27 5:10 ` [PATCH 3/4] net ipv4: When possible test for IFF_LOOPBACK and not dev == loopback_dev David Miller 2007-09-27 10:34 ` Daniel Lezcano 2007-09-27 16:10 ` Eric W. Biederman 2007-09-27 5:09 ` [PATCH 2/4] net ipv4: Remove unnecessary test for the loopback device from inetdev_destroy David Miller 2007-09-27 5:09 ` [PATCH 1/4] net: Dynamically allocate the per cpu counters for the loopback device David Miller 2007-09-27 7:48 ` Eric W. Biederman 2007-09-27 18:52 ` David Miller 2007-09-27 20:44 ` Eric W. Biederman 2007-09-27 20:56 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).