From nobody Thu May 14 22:35:01 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGlWn2jcjz5vwdh for ; Thu, 14 May 2026 22:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlWn24xKz3cq4 for ; Thu, 14 May 2026 22:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LwtV8TrJ+wo9Ee5e/sNrUw3W5+b0Mlhea+gXrRlfpo=; b=bw+r1lMey/f8IcEGWyviKfh2UofxLCrf5UfVZMb50XrcwGpHud7sKQqRsvlT5kxwwFQvj4 bRx8u9UauvZqbPXxjfBLN+hUWRRrLOxEhQY7k1yBCLI8PHcdRvhxcanc7wJYxqlg6NBVlV YCnP0V02b4X2hcdPLwQ12C1uBNO2p/LSYIDSLbnaMTacYgoha50c2Mva0+kQ0M4jKxROC+ FJhe+4Jr/yU2iaCNFNJGbGZOz/wW1o1uVefnn0hiBoPgNQFersz63yB4dfF9s38ti1Dptu GqZeCIcH6rEnp/CstQeamCp2Fy1BH9aj3XE66uDlM7dT87bpb1WfrJACsTJtcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798101; a=rsa-sha256; cv=none; b=fFuj6uubnirAOLRNIMoqgIhpwMAOXlmae5IjV1192er8F8PFsiKS4KnlPYzPW+OC/NwwkC A1YklBGjeF2cYrGX4FbECH4WfkIoVHf/FT+7klWw2abiMAHqbYlhvMDcc/yn264XVXEiTG KZ7Zri3LRuiZVJ9u2VbO+yW/2bg9qaYsgaHUftw9FdmgpT0NQ06HQ4Qh4RdSBRDeGlmI5O A+U69QSOr3Cs6c/bg3bAWfb0u2CS+LcrEP4IIODStyMpckmFmudPRmm/EnM/cTguYHCIBb mC7yagejZIHGXO+lswOYdLt5bEVwv/1KJgxI2qftkHyHTkzi6n+Jx8eU8z8Pmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LwtV8TrJ+wo9Ee5e/sNrUw3W5+b0Mlhea+gXrRlfpo=; b=EM6WS5jHiYeAXVwbbM+lIlyBl8vurByK41DCbNAze1x0gZd6kpS81Pv7fb2jdceuj381rD GTfEsRtWRDnLeUnWr97Xl7sOhZyKhzEpFVT+oGW4mMPffNpr2Nx0TCES8Bw3FxOVZ4UvCN 6CCO5UADe9rF7tuU6l/ntyKlRzWl2g4A4J0AbPIKDS003RS521qx0XTx3udESIRvLU+7Y9 AKW07xAKbY21kMUMvh78WiG5ZxbMxlR5BcpJYoxs6cNhFllKQoqcuIi2DFnGZZ4LGUafk9 vwS2D5s9RbYfNPN656BGdngSOk1H73C31XTNw2qHszqOQnBkRyB8NhP8Mee+IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlWn1039zwLG for ; Thu, 14 May 2026 22:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44875 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:35:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b92b9da3300655c86dcd42ea8a5ba45badd90847 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:35:01 +0000 Message-Id: <6a064e15.44875.4253434b@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b92b9da3300655c86dcd42ea8a5ba45badd90847 commit b92b9da3300655c86dcd42ea8a5ba45badd90847 Author: Rick Macklem AuthorDate: 2026-05-14 22:33:23 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 22:33:23 +0000 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes Without this patch, the maximum setting for vfs.nfsd.srvmaxio was 1Mbyte. This patch increases that to 4Mbytes. The same as for any setting above 128Kbytes, settings up to 4Mbytes require that kern.ipc.maxsockbuf be increased. (A message generated after setting vfs.nfsd.srvmaxio via the /etc/rc.conf variable nfs_server_maxio will indicate the minimum setting, which will be somewhat greater than four times the setting of vfs.nfsd.srvmaxio.) Requested by: Cedric Blancher MFC after: 2 weeks Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS server I/O") --- sys/fs/nfs/nfsproto.h | 3 +++ sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 6e67c5be3416..1054c85d8e8f 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -89,8 +89,11 @@ * It used to be called NFS_MAXDATA, but has been renamed to clarify that * it refers to server side only and doesn't conflict with the NFS_MAXDATA * defined in rpcsvc/nfs_prot.h for userland. + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio */ #define NFS_SRVMAXIO (128 * 1024) +#define NFS_SRVLIMITIO (4 * 1024 * 1024) /* Stat numbers for rpc returns (version 2, 3 and 4) */ /* diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index e42d5ca1e0a3..1e6936ed351c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); return (EINVAL); } - if (newsrvmaxio > 1048576) { - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); + if (newsrvmaxio > NFS_SRVLIMITIO) { + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", + NFS_SRVLIMITIO); return (EINVAL); } if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) {