Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1242901 > unrolled thread
| Started by | Kosuke Tatsukawa <tatsu@ab.jp.nec.com> |
|---|---|
| First post | 2015-10-09 02:40 +0200 |
| Last post | 2015-10-09 03:20 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] sunrpc: fix waitqueue_active without memory barrier in sunrpc Kosuke Tatsukawa <tatsu@ab.jp.nec.com> - 2015-10-09 02:40 +0200
Re: [PATCH] sunrpc: fix waitqueue_active without memory barrier in sunrpc kbuild test robot <lkp@intel.com> - 2015-10-09 03:20 +0200
| From | Kosuke Tatsukawa <tatsu@ab.jp.nec.com> |
|---|---|
| Date | 2015-10-09 02:40 +0200 |
| Subject | [PATCH] sunrpc: fix waitqueue_active without memory barrier in sunrpc |
| Message-ID | <qhtT5-2Qh-27@gated-at.bofh.it> |
There are several places in net/sunrpc/svcsock.c which calls
waitqueue_active() without calling a memory barrier. Change the code
to call wq_has_sleeper() instead, which other networking code uses in
similar places.
I found this issue when I was looking through the linux source code
for places calling waitqueue_active() before wake_up*(), but without
preceding memory barriers, after sending a patch to fix a similar
issue in drivers/tty/n_tty.c (Details about the original issue can be
found here: https://lkml.org/lkml/2015/9/28/849).
Signed-off-by: Kosuke Tatsukawa <tatsu@ab.jp.nec.com>
---
net/sunrpc/svcsock.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 0c81202..cf081b8 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -414,7 +414,7 @@ static void svc_udp_data_ready(struct sock *sk)
set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
svc_xprt_enqueue(&svsk->sk_xprt);
}
- if (wq && waitqueue_active(wq))
+ if (wq_has_sleeper(wq))
wake_up_interruptible(wq);
}
@@ -432,7 +432,7 @@ static void svc_write_space(struct sock *sk)
svc_xprt_enqueue(&svsk->sk_xprt);
}
- if (wq && waitqueue_active(wq)) {
+ if (wq_has_sleeper(wq)) {
dprintk("RPC svc_write_space: someone sleeping on %p\n",
svsk);
wake_up_interruptible(wq);
@@ -787,7 +787,7 @@ static void svc_tcp_listen_data_ready(struct sock *sk)
}
wq = sk_sleep(sk);
- if (wq && waitqueue_active(wq))
+ if (wq_has_sleeper(wq))
wake_up_interruptible_all(wq);
}
@@ -808,7 +808,7 @@ static void svc_tcp_state_change(struct sock *sk)
set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
svc_xprt_enqueue(&svsk->sk_xprt);
}
- if (wq && waitqueue_active(wq))
+ if (wq_has_sleeper(wq))
wake_up_interruptible_all(wq);
}
@@ -823,7 +823,7 @@ static void svc_tcp_data_ready(struct sock *sk)
set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
svc_xprt_enqueue(&svsk->sk_xprt);
}
- if (wq && waitqueue_active(wq))
+ if (wq_has_sleeper(wq))
wake_up_interruptible(wq);
}
@@ -1594,7 +1594,7 @@ static void svc_sock_detach(struct svc_xprt *xprt)
sk->sk_write_space = svsk->sk_owspace;
wq = sk_sleep(sk);
- if (wq && waitqueue_active(wq))
+ if (wq_has_sleeper(wq))
wake_up_interruptible(wq);
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | kbuild test robot <lkp@intel.com> |
|---|---|
| Date | 2015-10-09 03:20 +0200 |
| Message-ID | <qhuvM-3OT-11@gated-at.bofh.it> |
| In reply to | #1242901 |
Hi Kosuke,
[auto build test WARNING on v4.3-rc4 -- if it's inappropriate base, please ignore]
reproduce:
# apt-get install sparse
make ARCH=x86_64 allmodconfig
make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
>> net/sunrpc/svcsock.c:417:28: sparse: incorrect type in argument 1 (different base types)
net/sunrpc/svcsock.c:417:28: expected struct socket_wq *wq
net/sunrpc/svcsock.c:417:28: got struct __wait_queue_head [usertype] *wq
>> net/sunrpc/svcsock.c:1597:28: sparse: incorrect type in argument 1 (different base types)
net/sunrpc/svcsock.c:1597:28: expected struct socket_wq *wq
net/sunrpc/svcsock.c:1597:28: got struct __wait_queue_head [usertype] *[assigned] wq
net/sunrpc/svcsock.c:435:28: sparse: incorrect type in argument 1 (different base types)
net/sunrpc/svcsock.c:435:28: expected struct socket_wq *wq
net/sunrpc/svcsock.c:435:28: got struct __wait_queue_head [usertype] *wq
net/sunrpc/svcsock.c:790:28: sparse: incorrect type in argument 1 (different base types)
net/sunrpc/svcsock.c:790:28: expected struct socket_wq *wq
net/sunrpc/svcsock.c:790:28: got struct __wait_queue_head [usertype] *[assigned] wq
net/sunrpc/svcsock.c:811:28: sparse: incorrect type in argument 1 (different base types)
net/sunrpc/svcsock.c:811:28: expected struct socket_wq *wq
net/sunrpc/svcsock.c:811:28: got struct __wait_queue_head [usertype] *wq
net/sunrpc/svcsock.c:826:28: sparse: incorrect type in argument 1 (different base types)
net/sunrpc/svcsock.c:826:28: expected struct socket_wq *wq
net/sunrpc/svcsock.c:826:28: got struct __wait_queue_head [usertype] *wq
net/sunrpc/svcsock.c: In function 'svc_udp_data_ready':
net/sunrpc/svcsock.c:417:21: warning: passing argument 1 of 'wq_has_sleeper' from incompatible pointer type [-Wincompatible-pointer-types]
if (wq_has_sleeper(wq))
^
In file included from include/net/inet_sock.h:27:0,
from include/linux/udp.h:20,
from net/sunrpc/svcsock.c:30:
include/net/sock.h:1879:20: note: expected 'struct socket_wq *' but argument is of type 'wait_queue_head_t * {aka struct __wait_queue_head *}'
static inline bool wq_has_sleeper(struct socket_wq *wq)
^
net/sunrpc/svcsock.c: In function 'svc_write_space':
net/sunrpc/svcsock.c:435:21: warning: passing argument 1 of 'wq_has_sleeper' from incompatible pointer type [-Wincompatible-pointer-types]
if (wq_has_sleeper(wq)) {
^
In file included from include/net/inet_sock.h:27:0,
from include/linux/udp.h:20,
from net/sunrpc/svcsock.c:30:
include/net/sock.h:1879:20: note: expected 'struct socket_wq *' but argument is of type 'wait_queue_head_t * {aka struct __wait_queue_head *}'
static inline bool wq_has_sleeper(struct socket_wq *wq)
^
net/sunrpc/svcsock.c: In function 'svc_tcp_listen_data_ready':
net/sunrpc/svcsock.c:790:21: warning: passing argument 1 of 'wq_has_sleeper' from incompatible pointer type [-Wincompatible-pointer-types]
if (wq_has_sleeper(wq))
^
In file included from include/net/inet_sock.h:27:0,
from include/linux/udp.h:20,
from net/sunrpc/svcsock.c:30:
include/net/sock.h:1879:20: note: expected 'struct socket_wq *' but argument is of type 'wait_queue_head_t * {aka struct __wait_queue_head *}'
static inline bool wq_has_sleeper(struct socket_wq *wq)
^
net/sunrpc/svcsock.c: In function 'svc_tcp_state_change':
net/sunrpc/svcsock.c:811:21: warning: passing argument 1 of 'wq_has_sleeper' from incompatible pointer type [-Wincompatible-pointer-types]
if (wq_has_sleeper(wq))
^
In file included from include/net/inet_sock.h:27:0,
from include/linux/udp.h:20,
from net/sunrpc/svcsock.c:30:
include/net/sock.h:1879:20: note: expected 'struct socket_wq *' but argument is of type 'wait_queue_head_t * {aka struct __wait_queue_head *}'
static inline bool wq_has_sleeper(struct socket_wq *wq)
^
net/sunrpc/svcsock.c: In function 'svc_tcp_data_ready':
net/sunrpc/svcsock.c:826:21: warning: passing argument 1 of 'wq_has_sleeper' from incompatible pointer type [-Wincompatible-pointer-types]
if (wq_has_sleeper(wq))
^
In file included from include/net/inet_sock.h:27:0,
from include/linux/udp.h:20,
from net/sunrpc/svcsock.c:30:
include/net/sock.h:1879:20: note: expected 'struct socket_wq *' but argument is of type 'wait_queue_head_t * {aka struct __wait_queue_head *}'
static inline bool wq_has_sleeper(struct socket_wq *wq)
^
net/sunrpc/svcsock.c: In function 'svc_sock_detach':
net/sunrpc/svcsock.c:1597:21: warning: passing argument 1 of 'wq_has_sleeper' from incompatible pointer type [-Wincompatible-pointer-types]
if (wq_has_sleeper(wq))
^
In file included from include/net/inet_sock.h:27:0,
from include/linux/udp.h:20,
from net/sunrpc/svcsock.c:30:
include/net/sock.h:1879:20: note: expected 'struct socket_wq *' but argument is of type 'wait_queue_head_t * {aka struct __wait_queue_head *}'
static inline bool wq_has_sleeper(struct socket_wq *wq)
^
vim +417 net/sunrpc/svcsock.c
401
402 /*
403 * INET callback when data has been received on the socket.
404 */
405 static void svc_udp_data_ready(struct sock *sk)
406 {
407 struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data;
408 wait_queue_head_t *wq = sk_sleep(sk);
409
410 if (svsk) {
411 dprintk("svc: socket %p(inet %p), busy=%d\n",
412 svsk, sk,
413 test_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags));
414 set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
415 svc_xprt_enqueue(&svsk->sk_xprt);
416 }
> 417 if (wq_has_sleeper(wq))
418 wake_up_interruptible(wq);
419 }
420
421 /*
422 * INET callback when space is newly available on the socket.
423 */
424 static void svc_write_space(struct sock *sk)
425 {
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web