| Message ID | 1275916983.2545.73.camel@edumazet-laptop |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Mon, 07 Jun 2010 15:23:03 +0200 > in_dev_get() -> __in_dev_get_rcu() in a rcu protected function. > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: Mon, 07 Jun 2010 21:26:22 -0700 (PDT) > From: Eric Dumazet <eric.dumazet@gmail.com> > Date: Mon, 07 Jun 2010 15:23:03 +0200 > >> in_dev_get() -> __in_dev_get_rcu() in a rcu protected function. >> >> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > > Applied. I needed to modify this patch to get it to build. You left a code label with no code afterwards at the end of ip_rt_redirect() when CONFIG_IP_ROUTE_VERBOSE is disabled, which breaks the build. I fixed it by adding a semicolon. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le lundi 07 juin 2010 à 21:51 -0700, David Miller a écrit : > From: David Miller <davem@davemloft.net> > Date: Mon, 07 Jun 2010 21:26:22 -0700 (PDT) > > > From: Eric Dumazet <eric.dumazet@gmail.com> > > Date: Mon, 07 Jun 2010 15:23:03 +0200 > > > >> in_dev_get() -> __in_dev_get_rcu() in a rcu protected function. > >> > >> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > > > > Applied. > > I needed to modify this patch to get it to build. > > You left a code label with no code afterwards at the end of > ip_rt_redirect() when CONFIG_IP_ROUTE_VERBOSE is disabled, > which breaks the build. > > I fixed it by adding a semicolon. OK, thanks David, I missed this. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 7b8eacd..0c30534 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1343,11 +1343,12 @@ static void rt_del(unsigned hash, struct rtable *rt) spin_unlock_bh(rt_hash_lock_addr(hash)); } +/* called in rcu_read_lock() section */ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, __be32 saddr, struct net_device *dev) { int i, k; - struct in_device *in_dev = in_dev_get(dev); + struct in_device *in_dev = __in_dev_get_rcu(dev); struct rtable *rth, **rthp; __be32 skeys[2] = { saddr, 0 }; int ikeys[2] = { dev->ifindex, 0 }; @@ -1383,7 +1384,6 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, rthp=&rt_hash_table[hash].chain; - rcu_read_lock(); while ((rth = rcu_dereference(*rthp)) != NULL) { struct rtable *rt; @@ -1405,12 +1405,10 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, break; dst_hold(&rth->u.dst); - rcu_read_unlock(); rt = dst_alloc(&ipv4_dst_ops); if (rt == NULL) { ip_rt_put(rth); - in_dev_put(in_dev); return; } @@ -1463,12 +1461,10 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, ip_rt_put(rt); goto do_next; } - rcu_read_unlock(); do_next: ; } } - in_dev_put(in_dev); return; reject_redirect: @@ -1479,7 +1475,6 @@ reject_redirect: &old_gw, dev->name, &new_gw, &saddr, &daddr); #endif - in_dev_put(in_dev); } static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)
in_dev_get() -> __in_dev_get_rcu() in a rcu protected function. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> --- net/ipv4/route.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html