diff options
author | Andy Grover <andy.grover@oracle.com> | 2010-03-11 08:50:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-17 00:16:59 -0400 |
commit | b98ba52f96e7cdb4dbe2b06bced83d95d94c9d02 (patch) | |
tree | 72e22772c6326ff554bd030bda35abcb1526249e /net/rds/send.c | |
parent | 550a8002e4340eaf3bc333e33b59427e9c20272d (diff) |
RDS: only put sockets that have seen congestion on the poll_waitq
rds_poll_waitq's listeners will be awoken if we receive a congestion
notification. Bad performance may result because *all* polled sockets
contend for this single lock. However, it should not be necessary to
wake pollers when a congestion update arrives if they have never
experienced congestion, and not putting these on the waitq will
hopefully greatly reduce contention.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/send.c')
-rw-r--r-- | net/rds/send.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index 192a480076d0..51e2def50b12 100644 --- a/net/rds/send.c +++ b/net/rds/send.c | |||
@@ -894,8 +894,10 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, | |||
894 | queue_delayed_work(rds_wq, &conn->c_conn_w, 0); | 894 | queue_delayed_work(rds_wq, &conn->c_conn_w, 0); |
895 | 895 | ||
896 | ret = rds_cong_wait(conn->c_fcong, dport, nonblock, rs); | 896 | ret = rds_cong_wait(conn->c_fcong, dport, nonblock, rs); |
897 | if (ret) | 897 | if (ret) { |
898 | rs->rs_seen_congestion = 1; | ||
898 | goto out; | 899 | goto out; |
900 | } | ||
899 | 901 | ||
900 | while (!rds_send_queue_rm(rs, conn, rm, rs->rs_bound_port, | 902 | while (!rds_send_queue_rm(rs, conn, rm, rs->rs_bound_port, |
901 | dport, &queued)) { | 903 | dport, &queued)) { |