From nobody Thu May 14 22:35:01 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 4gGlWt4vlMz5vwSM for ; Thu, 14 May 2026 22:35:06 +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 4gGlWt2RLqz3d3s for ; Thu, 14 May 2026 22:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798106; 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=W0kDUSXfz9upYKJ5IGrmKf1p6tuyF1mJHuoB7XjYa5HZlHyr1QTf2gSmlz+/yAfpH9AOaf 9h0TBFCrgvc4TiCmNsS/3BgN1dge/4wliHGRMWCtaEX7X3Gyg70WvxbdU8MNaKa9AF2I5f O0/uMDzHywdz1ai4IQIp7sVNonNuV+czUBraIZxM6BdnNPzz6qP2VE5wIL2iyCQzxkLVf0 vlHxOt67KCgS2dJfWnqYRp6wCmOG4/mm6R83btfTnHws64KfoQxlZ4OxLl7eOhkCzOEXdv KkRiBFa2y0tkejQT0H+xWJZ8r9v4YKhLLsfBAEI1uFXuQck6889q1nZ60NurGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798106; a=rsa-sha256; cv=none; b=ZawhhrBXHsHfuP/1I76YgLy+dAfN84zWPO3paqA3ygjnNwP9wJ6q5bih4G/qqiTZ9R8iGz l3kZGo3QapMZ+RLSCW7W8SEndiPbHxOxvjjXIF7DbdIpgsa1sHetZ/Cmi5bWZjdr8Lr7rM PLITQazGX6CoXAAwTNsgLxOzI64LyjSCXTAVJyQYyO9Kp72SN9QCf5eO2nziA/3W+Nqzxh qEEN8sWOCYmddqciox0YQAls8gW9vkpKB2YLDtrKfbF2GR89gLFbzoPoLbCc7F7UGg30Yt 9XS0llbamL56GTh8ptszJ/0NhVEDvRI0WFMnMqGZZy3o1W6nSO36vyqOqU3VJg== 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=1778798106; 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=v2JLpXkMi0H8V9LMOYDwwCeFyNRMplVw+oXirPxVx5BhnqG5Ir03bRG7+zV062uOP+3mEV EEUjjFt+fR4t0ZZJxlQ7WF/YPqJFXzCmoxj7HZ5dtwI1E9g/yM81GURfleyN5+61dgmLrs 01zKbg689nidmUpgnds4+TCVOsdhedmfLccAHZyUDgNYgLN9HtG/Z/XVaeCQNYMuyWU/nf 5nhdYLYb7I3k2pSOdQ4akLk9j6GdJhO6pAAJJ6WnMu+/BE+79H7wCRiQ4bgq43ZAxlfTUR Fl38H7Qvspday/PiwK4NNiDRZn/69nk3PYJ43QfjOtQfDAfXxx+txDo/rmlUGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlWt1cSJzwdr for ; Thu, 14 May 2026 22:35:06 +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 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/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) {