diff options
author | David S. Miller <davem@davemloft.net> | 2016-05-19 11:36:50 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-19 11:36:50 -0700 |
commit | 87553aa5212f43d3d14b9b5d1dfba89f1a6e6f21 (patch) | |
tree | 694ab01c605470329b19bf7ae06f2d411b8687d9 /drivers | |
parent | e00be9e4d0ffcc0121606229f0aa4b246d6881d7 (diff) | |
parent | b91083a45e4c41b8c952cf02ceb0ce16f0b1b9b1 (diff) | |
download | linux-stable-87553aa5212f43d3d14b9b5d1dfba89f1a6e6f21.tar.gz linux-stable-87553aa5212f43d3d14b9b5d1dfba89f1a6e6f21.tar.bz2 linux-stable-87553aa5212f43d3d14b9b5d1dfba89f1a6e6f21.zip |
Merge branch 'tcp_bh_fixes'
Eric Dumazet says:
====================
net: block BH in TCP callbacks
Four layers using TCP stack were assuming sk_callback_lock could
be locked using read_lock() in their handlers because TCP stack
was running with BH disabled.
This is no longer the case. Since presumably the rest could
also depend on BH being disabled, just use read_lock_bh().
Then each layer might consider switching to RCU protection
and no longer depend on BH.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 2e4c82f8329c..ace4f1f41b8e 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -131,10 +131,10 @@ static void iscsi_sw_tcp_data_ready(struct sock *sk) struct iscsi_tcp_conn *tcp_conn; read_descriptor_t rd_desc; - read_lock(&sk->sk_callback_lock); + read_lock_bh(&sk->sk_callback_lock); conn = sk->sk_user_data; if (!conn) { - read_unlock(&sk->sk_callback_lock); + read_unlock_bh(&sk->sk_callback_lock); return; } tcp_conn = conn->dd_data; @@ -154,7 +154,7 @@ static void iscsi_sw_tcp_data_ready(struct sock *sk) /* If we had to (atomically) map a highmem page, * unmap it now. */ iscsi_tcp_segment_unmap(&tcp_conn->in.segment); - read_unlock(&sk->sk_callback_lock); + read_unlock_bh(&sk->sk_callback_lock); } static void iscsi_sw_tcp_state_change(struct sock *sk) @@ -165,10 +165,10 @@ static void iscsi_sw_tcp_state_change(struct sock *sk) struct iscsi_session *session; void (*old_state_change)(struct sock *); - read_lock(&sk->sk_callback_lock); + read_lock_bh(&sk->sk_callback_lock); conn = sk->sk_user_data; if (!conn) { - read_unlock(&sk->sk_callback_lock); + read_unlock_bh(&sk->sk_callback_lock); return; } session = conn->session; @@ -179,7 +179,7 @@ static void iscsi_sw_tcp_state_change(struct sock *sk) tcp_sw_conn = tcp_conn->dd_data; old_state_change = tcp_sw_conn->old_state_change; - read_unlock(&sk->sk_callback_lock); + read_unlock_bh(&sk->sk_callback_lock); old_state_change(sk); } |