From owner-svn-src-stable@FreeBSD.ORG Tue Apr 14 09:58:12 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2683509; Tue, 14 Apr 2015 09:58:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2D28638; Tue, 14 Apr 2015 09:58:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E9wBHv081995; Tue, 14 Apr 2015 09:58:11 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E9wAl8081988; Tue, 14 Apr 2015 09:58:10 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201504140958.t3E9wAl8081988@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 14 Apr 2015 09:58:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r281520 - in stable/10: sys/rpc usr.sbin/nfsd X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 09:58:12 -0000 Author: mav Date: Tue Apr 14 09:58:10 2015 New Revision: 281520 URL: https://svnweb.freebsd.org/changeset/base/281520 Log: MFC r281199: Remove hard limits on number of accepting NFS connections. Limits of 5 connections set long ago creates problems for SPEC benchmark. Make the NFS follow system-wide maximum. Modified: stable/10/sys/rpc/svc_generic.c stable/10/sys/rpc/svc_vc.c stable/10/usr.sbin/nfsd/nfsd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/rpc/svc_generic.c ============================================================================== --- stable/10/sys/rpc/svc_generic.c Tue Apr 14 07:25:57 2015 (r281519) +++ stable/10/sys/rpc/svc_generic.c Tue Apr 14 09:58:10 2015 (r281520) @@ -168,7 +168,7 @@ svc_tp_create( taddr = uaddr2taddr(nconf, uaddr); bind.addr = *taddr; free(taddr, M_RPC); - bind.qlen = SOMAXCONN; + bind.qlen = -1; xprt = svc_tli_create(pool, NULL, nconf, &bind, 0, 0); free(bind.addr.buf, M_RPC); } else { @@ -256,7 +256,7 @@ svc_tli_create( goto freedata; } } - solisten(so, SOMAXCONN, curthread); + solisten(so, -1, curthread); } else { if (bindresvport(so, (struct sockaddr *)bindaddr->addr.buf)) { Modified: stable/10/sys/rpc/svc_vc.c ============================================================================== --- stable/10/sys/rpc/svc_vc.c Tue Apr 14 07:25:57 2015 (r281519) +++ stable/10/sys/rpc/svc_vc.c Tue Apr 14 09:58:10 2015 (r281520) @@ -177,7 +177,7 @@ svc_vc_create(SVCPOOL *pool, struct sock xprt_register(xprt); - solisten(so, SOMAXCONN, curthread); + solisten(so, -1, curthread); SOCKBUF_LOCK(&so->so_rcv); xprt->xp_upcallset = 1; Modified: stable/10/usr.sbin/nfsd/nfsd.c ============================================================================== --- stable/10/usr.sbin/nfsd/nfsd.c Tue Apr 14 07:25:57 2015 (r281519) +++ stable/10/usr.sbin/nfsd/nfsd.c Tue Apr 14 09:58:10 2015 (r281520) @@ -626,7 +626,7 @@ main(int argc, char **argv) bindhost[i]); nfsd_exit(1); } - if (listen(tcpsock, 5) < 0) { + if (listen(tcpsock, -1) < 0) { syslog(LOG_ERR, "listen failed"); nfsd_exit(1); } @@ -701,7 +701,7 @@ main(int argc, char **argv) bindhost[i]); nfsd_exit(1); } - if (listen(tcp6sock, 5) < 0) { + if (listen(tcp6sock, -1) < 0) { syslog(LOG_ERR, "listen failed"); nfsd_exit(1); }