* [PATCH v2] inet: fix possible seqlock deadlocks
2013-11-28 17:23 ` [PATCH] udp: fix possible seqlock deadlock Eric Dumazet
@ 2013-11-28 17:51 ` Eric Dumazet
2013-11-28 18:09 ` Hannes Frederic Sowa
0 siblings, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2013-11-28 17:51 UTC (permalink / raw)
To: jongman.heo
Cc: David Miller, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Hannes Frederic Sowa
From: Eric Dumazet <edumazet@google.com>
In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left
another places where IP_INC_STATS_BH() were improperly used.
udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from
process context, not from softirq context.
This was detected by lockdep seqlock support.
Reported-by: jongman heo <jongman.heo@samsung.com>
Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
---
net/ipv4/ping.c | 2 +-
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv4/udp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 840cf1b9e6ee..242e7f4ed6f4 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -772,7 +772,7 @@ int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
err = PTR_ERR(rt);
rt = NULL;
if (err == -ENETUNREACH)
- IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
+ IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
goto out;
}
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 59a6f8b90cd9..067213924751 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -177,7 +177,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
if (err == -ENETUNREACH)
- IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
+ IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
return err;
}
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 44dfaa09b584..44e3884f9e4c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -999,7 +999,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
err = PTR_ERR(rt);
rt = NULL;
if (err == -ENETUNREACH)
- IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
+ IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
goto out;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] inet: fix possible seqlock deadlocks
2013-11-28 17:51 ` [PATCH v2] inet: fix possible seqlock deadlocks Eric Dumazet
@ 2013-11-28 18:09 ` Hannes Frederic Sowa
2013-11-29 21:38 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Hannes Frederic Sowa @ 2013-11-28 18:09 UTC (permalink / raw)
To: Eric Dumazet
Cc: jongman.heo, David Miller, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
On Thu, Nov 28, 2013 at 09:51:22AM -0800, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left
> another places where IP_INC_STATS_BH() were improperly used.
>
> udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from
> process context, not from softirq context.
>
> This was detected by lockdep seqlock support.
>
> Reported-by: jongman heo <jongman.heo@samsung.com>
> Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
> Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Just got home after getting distracted with other things today and the work is
already done. Thanks, Eric! ;)
Exactly the spots I noticed this morning, so
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Should we do something about the naming? I find it rather dangerous because
they look like the _bh lock postfixes but act exactly in the opposite?
Greetings,
Hannes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] inet: fix possible seqlock deadlocks
@ 2013-11-29 2:08 Jongman Heo
0 siblings, 0 replies; 4+ messages in thread
From: Jongman Heo @ 2013-11-29 2:08 UTC (permalink / raw)
To: Eric Dumazet
Cc: David Miller, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Hannes Frederic Sowa
------ Original Message -------
Sender : Eric Dumazet<eric.dumazet@gmail.com>
Date : 2013-11-29 02:51 (GMT+09:00)
Title : [PATCH v2] inet: fix possible seqlock deadlocks
>
> From: Eric Dumazet
>
> In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left
> another places where IP_INC_STATS_BH() were improperly used.
>
> udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from
> process context, not from softirq context.
>
> This was detected by lockdep seqlock support.
>
> Reported-by: jongman heo
> Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
> Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
> Signed-off-by: Eric Dumazet
> Cc: Hannes Frederic Sowa
> ---
> net/ipv4/ping.c | 2 +-
> net/ipv4/tcp_ipv4.c | 2 +-
> net/ipv4/udp.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
> index 840cf1b9e6ee..242e7f4ed6f4 100644
> --- a/net/ipv4/ping.c
> +++ b/net/ipv4/ping.c
> @@ -772,7 +772,7 @@ int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> err = PTR_ERR(rt);
> rt = NULL;
> if (err == -ENETUNREACH)
> - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
> + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
> goto out;
> }
>
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index 59a6f8b90cd9..067213924751 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -177,7 +177,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
> if (IS_ERR(rt)) {
> err = PTR_ERR(rt);
> if (err == -ENETUNREACH)
> - IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
> + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
> return err;
> }
>
> diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
> index 44dfaa09b584..44e3884f9e4c 100644
> --- a/net/ipv4/udp.c
> +++ b/net/ipv4/udp.c
> @@ -999,7 +999,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> err = PTR_ERR(rt);
> rt = NULL;
> if (err == -ENETUNREACH)
> - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
> + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
> goto out;
> }
>
Hi, Eric,
I've applied your patch, and will let you know the result, after a full day or half day test.
Usually the issue happens within 10 minutes after boot, but to be sure...
Regards,
Jongman Heo.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] inet: fix possible seqlock deadlocks
2013-11-28 18:09 ` Hannes Frederic Sowa
@ 2013-11-29 21:38 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-11-29 21:38 UTC (permalink / raw)
To: hannes; +Cc: eric.dumazet, jongman.heo, netdev, linux-kernel
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Thu, 28 Nov 2013 19:09:14 +0100
> On Thu, Nov 28, 2013 at 09:51:22AM -0800, Eric Dumazet wrote:
>> From: Eric Dumazet <edumazet@google.com>
>>
>> In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left
>> another places where IP_INC_STATS_BH() were improperly used.
>>
>> udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from
>> process context, not from softirq context.
>>
>> This was detected by lockdep seqlock support.
>>
>> Reported-by: jongman heo <jongman.heo@samsung.com>
>> Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
>> Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
>> Signed-off-by: Eric Dumazet <edumazet@google.com>
>> Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
>
> Just got home after getting distracted with other things today and the work is
> already done. Thanks, Eric! ;)
>
> Exactly the spots I noticed this morning, so
>
> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-29 21:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-29 2:08 [PATCH v2] inet: fix possible seqlock deadlocks Jongman Heo
-- strict thread matches above, loose matches on Subject: below --
2013-11-28 4:17 3.13.0-rc1+ INFO: inconsistent lock state 허종만
2013-11-28 17:23 ` [PATCH] udp: fix possible seqlock deadlock Eric Dumazet
2013-11-28 17:51 ` [PATCH v2] inet: fix possible seqlock deadlocks Eric Dumazet
2013-11-28 18:09 ` Hannes Frederic Sowa
2013-11-29 21:38 ` 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).