Module Name: src Committed By: riz Date: Sun Apr 24 16:23:49 UTC 2011
Modified Files: src/sys/nfs [netbsd-5]: nfs_socket.c Log Message: Pull up following revision(s) (requested by tls in ticket #1600): sys/nfs/nfs_socket.c: revision 1.189 As suggested by matt@: change socket buffer reservations for NFS send/receive to 3 times max RPC size rather than 2 times. Avoids nasty TCP stalls observed at Panix. Will require increase to sbmax via sysctl for those running really huge NFS rsize/wsize (>64K). To generate a diff of this commit: cvs rdiff -u -r1.173.4.8 -r1.173.4.9 src/sys/nfs/nfs_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/nfs/nfs_socket.c diff -u src/sys/nfs/nfs_socket.c:1.173.4.8 src/sys/nfs/nfs_socket.c:1.173.4.9 --- src/sys/nfs/nfs_socket.c:1.173.4.8 Tue Mar 29 19:47:37 2011 +++ src/sys/nfs/nfs_socket.c Sun Apr 24 16:23:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_socket.c,v 1.173.4.8 2011/03/29 19:47:37 riz Exp $ */ +/* $NetBSD: nfs_socket.c,v 1.173.4.9 2011/04/24 16:23:49 riz Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1995 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.8 2011/03/29 19:47:37 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.9 2011/04/24 16:23:49 riz Exp $"); #include "fs_nfs.h" #include "opt_nfs.h" @@ -321,13 +321,13 @@ so->so_snd.sb_timeo = 0; } if (nmp->nm_sotype == SOCK_DGRAM) { - sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR) * 2; + sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR) * 3; rcvreserve = (max(nmp->nm_rsize, nmp->nm_readdirsize) + NFS_MAXPKTHDR) * 2; } else if (nmp->nm_sotype == SOCK_SEQPACKET) { - sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR) * 2; + sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR) * 3; rcvreserve = (max(nmp->nm_rsize, nmp->nm_readdirsize) + - NFS_MAXPKTHDR) * 2; + NFS_MAXPKTHDR) * 3; } else { sounlock(so); if (nmp->nm_sotype != SOCK_STREAM) @@ -343,9 +343,9 @@ sizeof(val)); } sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR + - sizeof (u_int32_t)) * 2; + sizeof (u_int32_t)) * 3; rcvreserve = (nmp->nm_rsize + NFS_MAXPKTHDR + - sizeof (u_int32_t)) * 2; + sizeof (u_int32_t)) * 3; solock(so); } error = soreserve(so, sndreserve, rcvreserve);