aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2009-07-08 08:10:31 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-09 20:06:58 -0400
commitad46276952f1af34cd91d46d49ba13d347d56367 (patch)
tree55cf35156794ab34d8a607c25fd044c37231f9e4 /include/net
parenta57de0b4336e48db2811a2030bb68dba8dd09d88 (diff)
memory barrier: adding smp_mb__after_lock
Adding smp_mb__after_lock define to be used as a smp_mb call after a lock. Making it nop for x86, since {read|write|spin}_lock() on x86 are full memory barriers. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 4eb8409249f6..2c0da9239b95 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1271,6 +1271,9 @@ static inline int sk_has_allocations(const struct sock *sk)
1271 * in its cache, and so does the tp->rcv_nxt update on CPU2 side. The CPU1 1271 * in its cache, and so does the tp->rcv_nxt update on CPU2 side. The CPU1
1272 * could then endup calling schedule and sleep forever if there are no more 1272 * could then endup calling schedule and sleep forever if there are no more
1273 * data on the socket. 1273 * data on the socket.
1274 *
1275 * The sk_has_sleeper is always called right after a call to read_lock, so we
1276 * can use smp_mb__after_lock barrier.
1274 */ 1277 */
1275static inline int sk_has_sleeper(struct sock *sk) 1278static inline int sk_has_sleeper(struct sock *sk)
1276{ 1279{
@@ -1280,7 +1283,7 @@ static inline int sk_has_sleeper(struct sock *sk)
1280 * 1283 *
1281 * This memory barrier is paired in the sock_poll_wait. 1284 * This memory barrier is paired in the sock_poll_wait.
1282 */ 1285 */
1283 smp_mb(); 1286 smp_mb__after_lock();
1284 return sk->sk_sleep && waitqueue_active(sk->sk_sleep); 1287 return sk->sk_sleep && waitqueue_active(sk->sk_sleep);
1285} 1288}
1286 1289