Commit b91083a4 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

tipc: block BH in TCP callbacks

TCP stack can now run from process context.

Use read_lock_bh(&sk->sk_callback_lock) variant to restore previous
assumption.

Fixes: 5413d1ba ("net: do not block BH while processing socket backlog")
Fixes: d41a69f1 ("tcp: make tcp_sendmsg() aware of socket backlog")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Ying Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38036629
...@@ -138,28 +138,28 @@ static void sock_data_ready(struct sock *sk) ...@@ -138,28 +138,28 @@ static void sock_data_ready(struct sock *sk)
{ {
struct tipc_conn *con; struct tipc_conn *con;
read_lock(&sk->sk_callback_lock); read_lock_bh(&sk->sk_callback_lock);
con = sock2con(sk); con = sock2con(sk);
if (con && test_bit(CF_CONNECTED, &con->flags)) { if (con && test_bit(CF_CONNECTED, &con->flags)) {
conn_get(con); conn_get(con);
if (!queue_work(con->server->rcv_wq, &con->rwork)) if (!queue_work(con->server->rcv_wq, &con->rwork))
conn_put(con); conn_put(con);
} }
read_unlock(&sk->sk_callback_lock); read_unlock_bh(&sk->sk_callback_lock);
} }
static void sock_write_space(struct sock *sk) static void sock_write_space(struct sock *sk)
{ {
struct tipc_conn *con; struct tipc_conn *con;
read_lock(&sk->sk_callback_lock); read_lock_bh(&sk->sk_callback_lock);
con = sock2con(sk); con = sock2con(sk);
if (con && test_bit(CF_CONNECTED, &con->flags)) { if (con && test_bit(CF_CONNECTED, &con->flags)) {
conn_get(con); conn_get(con);
if (!queue_work(con->server->send_wq, &con->swork)) if (!queue_work(con->server->send_wq, &con->swork))
conn_put(con); conn_put(con);
} }
read_unlock(&sk->sk_callback_lock); read_unlock_bh(&sk->sk_callback_lock);
} }
static void tipc_register_callbacks(struct socket *sock, struct tipc_conn *con) static void tipc_register_callbacks(struct socket *sock, struct tipc_conn *con)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment