From: Tariq Saeed Date: Wed, 14 May 2014 00:01:27 +0000 (+1000) Subject: ocfs2/o2net: incorrect to terminate accepting connections loop upon rejecting an... X-Git-Tag: next-20140516~2^2~408 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f6d23c8d50cefe5b932d2b6fb5212a765596747;p=karo-tx-linux.git ocfs2/o2net: incorrect to terminate accepting connections loop upon rejecting an invalid one Orabug: 17489469 When o2net-accept-one() rejects an illegal connection, it terminates the loop picking up the remaining queued connections. This fix will continue accepting connections till the queue is emtpy. Signed-off-by: Tariq Saseed Signed-off-by: Srinivas Eeda Cc: Joel Becker Reviewed-by: Mark Fasheh Signed-off-by: Andrew Morton --- diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 40cc827afcde..681691bc233a 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -1921,12 +1921,30 @@ out: return ret; } +/* + * This function is invoked in response to one or more + * pending accepts at softIRQ level. We must drain the + * entire que before returning. + */ + static void o2net_accept_many(struct work_struct *work) { struct socket *sock = o2net_listen_sock; int more; int err; + /* + * It is critical to note that due to interrupt moderation + * at the network driver level, we can't assume to get a + * softIRQ for every single conn since tcp SYN packets + * can arrive back-to-back, and therefore many pending + * accepts may result in just 1 softIRQ. If we terminate + * the o2net_accept_one() loop upon seeing an err, what happens + * to the rest of the conns in the queue? If no new SYN + * arrives for hours, no softIRQ will be delivered, + * and the connections will just sit in the queue. + */ + for (;;) { err = o2net_accept_one(sock, &more); if (!more)