diff options
author | Santosh Shilimkar <santosh.shilimkar@oracle.com> | 2015-09-11 18:44:29 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@oracle.com> | 2015-10-05 14:19:01 -0400 |
commit | db6526dcb51b054961a2d96ba43dec23e38818b3 (patch) | |
tree | 37d72344806ac00cf13ed36e59b08cba1f882a02 /net/rds/send.c | |
parent | 4bebdd7a4d2960b2ff6c40b27156d041ea270765 (diff) |
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>
Diffstat (limited to 'net/rds/send.c')
-rw-r--r-- | net/rds/send.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index b0acd45a9d42..a081a6478e67 100644 --- a/net/rds/send.c +++ b/net/rds/send.c | |||
@@ -1123,8 +1123,9 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len) | |||
1123 | */ | 1123 | */ |
1124 | rds_stats_inc(s_send_queued); | 1124 | rds_stats_inc(s_send_queued); |
1125 | 1125 | ||
1126 | if (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags)) | 1126 | ret = rds_send_xmit(conn); |
1127 | rds_send_xmit(conn); | 1127 | if (ret == -ENOMEM || ret == -EAGAIN) |
1128 | queue_delayed_work(rds_wq, &conn->c_send_w, 1); | ||
1128 | 1129 | ||
1129 | rds_message_put(rm); | 1130 | rds_message_put(rm); |
1130 | return payload_len; | 1131 | return payload_len; |
@@ -1180,8 +1181,9 @@ rds_send_pong(struct rds_connection *conn, __be16 dport) | |||
1180 | rds_stats_inc(s_send_queued); | 1181 | rds_stats_inc(s_send_queued); |
1181 | rds_stats_inc(s_send_pong); | 1182 | rds_stats_inc(s_send_pong); |
1182 | 1183 | ||
1183 | if (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags)) | 1184 | ret = rds_send_xmit(conn); |
1184 | queue_delayed_work(rds_wq, &conn->c_send_w, 0); | 1185 | if (ret == -ENOMEM || ret == -EAGAIN) |
1186 | queue_delayed_work(rds_wq, &conn->c_send_w, 1); | ||
1185 | 1187 | ||
1186 | rds_message_put(rm); | 1188 | rds_message_put(rm); |
1187 | return 0; | 1189 | return 0; |