* [PATCH net-next-2.6] ipv6: no more dev_put() in datagram_send_ctl()
@ 2009-11-02 11:21 Eric Dumazet
2009-11-02 11:43 ` David Miller
2009-11-02 22:35 ` Paul E. McKenney
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2009-11-02 11:21 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Netdev List
Avoids touching device refcount in datagram_send_ctl(), thanks to RCU
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
net/ipv6/datagram.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 9f70452..e6f9cdf 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -537,12 +537,17 @@ int datagram_send_ctl(struct net *net,
addr_type = __ipv6_addr_type(&src_info->ipi6_addr);
+ rcu_read_lock();
if (fl->oif) {
- dev = dev_get_by_index(net, fl->oif);
- if (!dev)
+ dev = dev_get_by_index_rcu(net, fl->oif);
+ if (!dev) {
+ rcu_read_unlock();
return -ENODEV;
- } else if (addr_type & IPV6_ADDR_LINKLOCAL)
+ }
+ } else if (addr_type & IPV6_ADDR_LINKLOCAL) {
+ rcu_read_unlock();
return -EINVAL;
+ }
if (addr_type != IPV6_ADDR_ANY) {
int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL;
@@ -553,8 +558,7 @@ int datagram_send_ctl(struct net *net,
ipv6_addr_copy(&fl->fl6_src, &src_info->ipi6_addr);
}
- if (dev)
- dev_put(dev);
+ rcu_read_unlock();
if (err)
goto exit_f;
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next-2.6] ipv6: no more dev_put() in datagram_send_ctl()
2009-11-02 11:21 [PATCH net-next-2.6] ipv6: no more dev_put() in datagram_send_ctl() Eric Dumazet
@ 2009-11-02 11:43 ` David Miller
2009-11-02 22:35 ` Paul E. McKenney
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2009-11-02 11:43 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 02 Nov 2009 12:21:06 +0100
> Avoids touching device refcount in datagram_send_ctl(), thanks to RCU
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next-2.6] ipv6: no more dev_put() in datagram_send_ctl()
2009-11-02 11:21 [PATCH net-next-2.6] ipv6: no more dev_put() in datagram_send_ctl() Eric Dumazet
2009-11-02 11:43 ` David Miller
@ 2009-11-02 22:35 ` Paul E. McKenney
1 sibling, 0 replies; 3+ messages in thread
From: Paul E. McKenney @ 2009-11-02 22:35 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S. Miller, Linux Netdev List
On Mon, Nov 02, 2009 at 12:21:06PM +0100, Eric Dumazet wrote:
> Avoids touching device refcount in datagram_send_ctl(), thanks to RCU
Quite a series of patches!!! I am impressed!!!
Thanx, Paul
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> net/ipv6/datagram.c | 14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
> index 9f70452..e6f9cdf 100644
> --- a/net/ipv6/datagram.c
> +++ b/net/ipv6/datagram.c
> @@ -537,12 +537,17 @@ int datagram_send_ctl(struct net *net,
>
> addr_type = __ipv6_addr_type(&src_info->ipi6_addr);
>
> + rcu_read_lock();
> if (fl->oif) {
> - dev = dev_get_by_index(net, fl->oif);
> - if (!dev)
> + dev = dev_get_by_index_rcu(net, fl->oif);
> + if (!dev) {
> + rcu_read_unlock();
> return -ENODEV;
> - } else if (addr_type & IPV6_ADDR_LINKLOCAL)
> + }
> + } else if (addr_type & IPV6_ADDR_LINKLOCAL) {
> + rcu_read_unlock();
> return -EINVAL;
> + }
>
> if (addr_type != IPV6_ADDR_ANY) {
> int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL;
> @@ -553,8 +558,7 @@ int datagram_send_ctl(struct net *net,
> ipv6_addr_copy(&fl->fl6_src, &src_info->ipi6_addr);
> }
>
> - if (dev)
> - dev_put(dev);
> + rcu_read_unlock();
>
> if (err)
> goto exit_f;
> --
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-02 22:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-02 11:21 [PATCH net-next-2.6] ipv6: no more dev_put() in datagram_send_ctl() Eric Dumazet
2009-11-02 11:43 ` David Miller
2009-11-02 22:35 ` Paul E. McKenney
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).