openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ocfs2/cluster: block BH in TCP callbacks 

TCP stack can now run from process context.

Use read_lock_bh() variant to restore previous assumption.

Fixes: 5413d1babe ("net: do not block BH while processing socket backlog")
Fixes: d41a69f1d3 ("tcp: make tcp_sendmsg() aware of socket backlog")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2016-05-17 17:44:07 -07:00 committed by David S. Miller
parent 7cb001d4c4
commit e1daca289a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ocfs2/cluster/tcp.c
View File

@ -600,10 +600,11 @@ static void o2net_set_nn_state(struct o2net_node *nn,
static void o2net_data_ready(struct sock *sk) static void o2net_data_ready(struct sock *sk)
{ {
void (*ready)(struct sock *sk); void (*ready)(struct sock *sk);
struct o2net_sock_container *sc;
read_lock(&sk->sk_callback_lock); read_lock_bh(&sk->sk_callback_lock);
if (sk->sk_user_data) { sc = sk->sk_user_data;
struct o2net_sock_container *sc = sk->sk_user_data; if (sc) {
sclog(sc, "data_ready hit\n"); sclog(sc, "data_ready hit\n");
o2net_set_data_ready_time(sc); o2net_set_data_ready_time(sc);
o2net_sc_queue_work(sc, &sc->sc_rx_work); o2net_sc_queue_work(sc, &sc->sc_rx_work);
@ -611,7 +612,7 @@ static void o2net_data_ready(struct sock *sk)
} else { } else {
ready = sk->sk_data_ready; ready = sk->sk_data_ready;
} }
read_unlock(&sk->sk_callback_lock); read_unlock_bh(&sk->sk_callback_lock);
ready(sk); ready(sk);
} }
@ -622,7 +623,7 @@ static void o2net_state_change(struct sock *sk)
void (*state_change)(struct sock *sk); void (*state_change)(struct sock *sk);
struct o2net_sock_container *sc; struct o2net_sock_container *sc;
read_lock(&sk->sk_callback_lock); read_lock_bh(&sk->sk_callback_lock);
sc = sk->sk_user_data; sc = sk->sk_user_data;
if (sc == NULL) { if (sc == NULL) {
state_change = sk->sk_state_change; state_change = sk->sk_state_change;
@ -649,7 +650,7 @@ static void o2net_state_change(struct sock *sk)
break; break;
} }
out: out:
read_unlock(&sk->sk_callback_lock); read_unlock_bh(&sk->sk_callback_lock);
state_change(sk); state_change(sk);
} }
@ -2012,7 +2013,7 @@ static void o2net_listen_data_ready(struct sock *sk)
{ {
void (*ready)(struct sock *sk); void (*ready)(struct sock *sk);
read_lock(&sk->sk_callback_lock); read_lock_bh(&sk->sk_callback_lock);
ready = sk->sk_user_data; ready = sk->sk_user_data;
if (ready == NULL) { /* check for teardown race */ if (ready == NULL) { /* check for teardown race */
ready = sk->sk_data_ready; ready = sk->sk_data_ready;
@ -2039,7 +2040,7 @@ static void o2net_listen_data_ready(struct sock *sk)
} }
out: out:
read_unlock(&sk->sk_callback_lock); read_unlock_bh(&sk->sk_callback_lock);
if (ready != NULL) if (ready != NULL)
ready(sk); ready(sk);
} }