From nobody Thu May 28 02:47:08 2026 X-Original-To: dev-commits-src-all@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 4gQrVn5Wnjz6g6F4 for ; Thu, 28 May 2026 02:47:13 +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 4gQrVn4tVXz48J0 for ; Thu, 28 May 2026 02:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779936433; 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=yZtxmy+kSsKBj6L2PQj7LRiHsobIWLjC6nfcAAvAxHk=; b=O1ATPYWiEIRkeboscjEv7yOILMotrfoGEvNMMZ6lB18LzOfG+oSPEYRQ6vKx/UL3zune9e 0bzhtryqqcUlznOM5PaXDyO5DYAH1rr+2Ilk2UTC6D4dTBKSohVEkl9gXIDkMMoUTzwuiC kJKU+CG6COIJcuKxlMRNT4XXzk32LOZ+zi2hPvFTqJR6rr74R5Hw22w0ENoxHfrtE61Oq8 PaYIMYSnlQDJgnPCuREi7VjyFylLELu+nDUwL3OAPlxMLk/QwEXAsn22gk9+/vyiKzXHqa mJvDsQ1zDNE8keUudeh4n5yOtlx2q6Dd5+8Je+Jy4iYow3rsAOzCTkPZ+s15mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779936433; a=rsa-sha256; cv=none; b=XHfFbnLdEAXzg0w7YeBO4yjnLHLehcpn6m512u+6OJmnvACD8CKPIEtHisF6gCHBam/tzR duu97mAO1wQdCJUXnCdvU5UCu+ARSC1pKtTRpa25SNakYlt8EmXFpPxZrRcHCx2tLBLQuQ a7q4ohGcMyZdlyBjykfFvoBktkOa47geEmtUG1RA54Oeas1XUqtrsdYqlik6+S8DKLlCwx hUDQwxooZp3fX40UZ7LLkrNBgG9NEJeKCQxM9fl0+FK4K+STQe5sQkKmC8UFkjfUBH4bRv L+N3RxDSe/sqUS2ghrMUHF+6IcHuqAAjsRc5pwDzYAt3x/tiblD+O+p0iVCyAw== 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=1779936433; 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=yZtxmy+kSsKBj6L2PQj7LRiHsobIWLjC6nfcAAvAxHk=; b=En0R1aDYY696KOXXLiTy23kChfGjp6SqS6TdW2D3THb3vHVKbqQgWzPi2iu2r+WDezgdIy C/wI8N2yHLRYQhOp/Yj9wfGYiL38/m5aGUTpZmenLpT33KiqRUFIZZvXjWiiGQ76/OOyRX 2ic2pv0NfBzbbKWpfKuFVl06BlshK6qEOhNSK3IPUD7CV9B2Jkyh0HlbgHI3d+YlBCiva2 bJAxKBqFU34fKUGlf4qL4zob0cLKdHQYrkWjF68rLgLcPVLLoxtMoBNN4rsO8l7hpCi8Ji AP7OpNaJdtZ6KpzwvlNVsqXFAxAKk9MpDfhwNa5LekSvsgYT4w0o5CvaLqQfUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQrVn4DTGz9sR for ; Thu, 28 May 2026 02:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30785 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 02:47:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: efe287822bcb - stable/15 - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: efe287822bcbebbf5ad5448280c6d91aa3676fe4 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 02:47:08 +0000 Message-Id: <6a17acac.30785.38ac59ba@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=efe287822bcbebbf5ad5448280c6d91aa3676fe4 commit efe287822bcbebbf5ad5448280c6d91aa3676fe4 Author: Rick Macklem AuthorDate: 2026-05-14 22:33:23 +0000 Commit: Rick Macklem CommitDate: 2026-05-28 02:45:54 +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.) (cherry picked from commit b92b9da3300655c86dcd42ea8a5ba45badd90847) --- 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 63f7b5ecf564..a33b5ed620a2 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) {