Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

RDS: fix rds-ping spinlock recursion

This is the revised patch for fixing rds-ping spinlock recursion
according to Venkat's suggestions.

RDS ping/pong over TCP feature has been broken for years(2.6.39 to
3.6.0) since we have to set TCP cork and call kernel_sendmsg() between
ping/pong which both need to lock "struct sock *sk". However, this
lock has already been hold before rds_tcp_data_ready() callback is
triggerred. As a result, we always facing spinlock resursion which
would resulting in system panic.

Given that RDS ping is only used to test the connectivity and not for
serious performance measurements, we can queue the pong transmit to
rds_wq as a delayed response.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
CC: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
CC: David S. Miller <davem@davemloft.net>
CC: James Morris <james.l.morris@oracle.com>
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

jeff.liu and committed by
David S. Miller
5175a5e7 4085a7f0

+1 -1
+1 -1
net/rds/send.c
··· 1122 1122 rds_stats_inc(s_send_pong); 1123 1123 1124 1124 if (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags)) 1125 - rds_send_xmit(conn); 1125 + queue_delayed_work(rds_wq, &conn->c_send_w, 0); 1126 1126 1127 1127 rds_message_put(rm); 1128 1128 return 0;