RDS: use rds_send_xmit() state instead of RDS_LL_SEND_FULL
In Transport indepedent rds_sendmsg(), we shouldn't make decisions based on RDS_LL_SEND_FULL which is used to manage the ring for RDMA based transports. We can safely issue rds_send_xmit() and the using its return value take decision on deferred work. This will also fix the scenario where at times we are seeing connections stuck with the LL_SEND_FULL bit getting set and never cleared. We kick krdsd after any time we see -ENOMEM or -EAGAIN from the ring allocation code. Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
This commit is contained in:
Родитель
4bebdd7a4d
Коммит
db6526dcb5
|
@ -1123,8 +1123,9 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
|
|||
*/
|
||||
rds_stats_inc(s_send_queued);
|
||||
|
||||
if (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags))
|
||||
rds_send_xmit(conn);
|
||||
ret = rds_send_xmit(conn);
|
||||
if (ret == -ENOMEM || ret == -EAGAIN)
|
||||
queue_delayed_work(rds_wq, &conn->c_send_w, 1);
|
||||
|
||||
rds_message_put(rm);
|
||||
return payload_len;
|
||||
|
@ -1180,8 +1181,9 @@ rds_send_pong(struct rds_connection *conn, __be16 dport)
|
|||
rds_stats_inc(s_send_queued);
|
||||
rds_stats_inc(s_send_pong);
|
||||
|
||||
if (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags))
|
||||
queue_delayed_work(rds_wq, &conn->c_send_w, 0);
|
||||
ret = rds_send_xmit(conn);
|
||||
if (ret == -ENOMEM || ret == -EAGAIN)
|
||||
queue_delayed_work(rds_wq, &conn->c_send_w, 1);
|
||||
|
||||
rds_message_put(rm);
|
||||
return 0;
|
||||
|
|
|
@ -162,7 +162,9 @@ void rds_send_worker(struct work_struct *work)
|
|||
int ret;
|
||||
|
||||
if (rds_conn_state(conn) == RDS_CONN_UP) {
|
||||
clear_bit(RDS_LL_SEND_FULL, &conn->c_flags);
|
||||
ret = rds_send_xmit(conn);
|
||||
cond_resched();
|
||||
rdsdebug("conn %p ret %d\n", conn, ret);
|
||||
switch (ret) {
|
||||
case -EAGAIN:
|
||||
|
|
Загрузка…
Ссылка в новой задаче