svn commit: r261052 - stable/10/sys/rpc

[Alexander Motin]

Author: mav
Date: Wed Jan 22 23:50:13 2014
New Revision: 261052
URL: http://svnweb.freebsd.org/changeset/base/261052

Log:
  MFC r260031:
  In addition to r259632 completely block receive upcalls if we have more
  data than we need.  This reduces lock pressure from xprt_active() side.

Modified:
  stable/10/sys/rpc/svc_vc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/rpc/svc_vc.c
==============================================================================
--- stable/10/sys/rpc/svc_vc.c	Wed Jan 22 23:49:37 2014	(r261051)
+++ stable/10/sys/rpc/svc_vc.c	Wed Jan 22 23:50:13 2014	(r261052)
@@ -619,7 +619,15 @@ svc_vc_process_pending(SVCXPRT *xprt)
 		}
 	}
 
-	so->so_rcv.sb_lowat = imax(1, imin(cd->resid, so->so_rcv.sb_hiwat / 2));
+	/*
+	 * Block receive upcalls if we have more data pending,
+	 * otherwise report our need.
+	 */
+	if (cd->mpending)
+		so->so_rcv.sb_lowat = INT_MAX;
+	else
+		so->so_rcv.sb_lowat =
+		    imax(1, imin(cd->resid, so->so_rcv.sb_hiwat / 2));
 	return (TRUE);
 }