[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <5f877b89716358c7a08272275979b5e039ca1c29.1427936719.git.sowmini.varadhan@oracle.com>
Date: Thu, 2 Apr 2015 09:50:46 -0400
From: Sowmini Varadhan <sowmini.varadhan@...cle.com>
To: netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: chien.yen@...cle.com, davem@...emloft.net,
rds-devel@....oracle.com, agrover@...hat.com, clm@...com,
zab@...bo.net, ajaykumar.hotchandani@...cle.com,
Sowmini Varadhan <sowmini.varadhan@...cle.com>
Subject: [PATCH 3/6] rds: check for excessive looping in rds_send_xmit
Original patch by Andy Grover
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@...cle.com>
---
net/rds/send.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/net/rds/send.c b/net/rds/send.c
index 44672be..b1741a2 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -140,6 +140,7 @@ int rds_send_xmit(struct rds_connection *conn)
struct scatterlist *sg;
int ret = 0;
LIST_HEAD(to_be_dropped);
+ int same_rm = 0;
restart:
@@ -177,6 +178,18 @@ int rds_send_xmit(struct rds_connection *conn)
rm = conn->c_xmit_rm;
+ if (!rm) {
+ same_rm = 0;
+ } else {
+ same_rm++;
+ if (same_rm >= 4096) {
+ printk_ratelimited(KERN_ERR "RDS: Stuck rm\n");
+ cond_resched();
+ ret = -EAGAIN;
+ break;
+ }
+ }
+
/*
* If between sending messages, we can send a pending congestion
* map update.
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists