From nobody Thu May 28 02:47:08 2026 X-Original-To: dev-commits-src-branches@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 4gQrVh6SB5z6g6hb for ; Thu, 28 May 2026 02:47:08 +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 4gQrVh3dBhz486H for ; Thu, 28 May 2026 02:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779936428; 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=E1MHoDcihTyZ1plAZUD1/Pdu1MUHPCtmXiYdmUfVFHW7lNvx4Ny5GhJ2U+h8nthXKeC+K1 OPNFWBKzLg7BJWd0tazvYW31I0X2AkX9J/noSwhcqi2ElQU1HkatG5EX5KX45x+L/0ZTTB oRSWThqtMjg9OxwVhR88xh1jZc5TjqOWRiSrrVD9kXH5YPY9qeij6YC2/qASWsFQEnuL71 oOe5lf2rxCtIwNVMtDR/wi0fD7H/5ix/YnxNMSBR8D/QDZLQJewRMpIEzEmCEZ+MCNcknM /rDKQRr4TBnzHuHacmgJObeny1CbgoncYEb+asSymEZRhngccJmhbB/kdvmWiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779936428; a=rsa-sha256; cv=none; b=fE+HRdgWgsjPUwJHfjbHrJIcWJUB7JTVy3rjiRTbos1iMkblBp+aXCt3Thf2uYad9nbalF t4FD7994g4DAh29q4GTnS3HATarXBs+5gJgPzC2tT1WfSGWOyWweIIGH3lcK8n61PbYCQY hd6tRUzd0NmIvpAXyo+Z+golEpztqWS0UpMKzz+b3TPveAGQ1Bd8kLNZwKcDfg85v7jECN hmwoXKy3NT/lSAqh1iN4Zw+cKya0ZZz7p280NM/rzeNel4P0zEM8jB30Sqcym/c+xxBE1K taEFkxOna+MSLiTblnOiJ/KMOCBoO06G/fplbbhyhmfc8hikCsvusWJhDgOpaQ== 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=1779936428; 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=SujCmpHXyrZvJG6OjowofRf6lrbSPLvGOtJrhDZkSe/s9t97cQofmMGs4gGcuV3HS4rqXa ucIHQAoPeEoLWowQEMoDsKlnlzBYVSi1r6b3bUcWp+haX3GHJ9sW7pgjIep8RGgBvMlDvc 4RnfMse3TIsxifTj39Tk0Xc0ECsvPGnvsi46n065vz4hkt0Lmjnr5NIgN/FfTG2CvdQZXk gyQtduuV56u7bLyKXRYOVAoNFhGCzoGMD5QI7NE528RWjIwejwxb5t+QpCBselNpQKEIq8 QYKMcYzrN/JwPRLkbPivJvnOWPQDCOx1CSXQ916yAc0MsA9L7Bh+GdR9ZAj+3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQrVh30J4z9sQ for ; Thu, 28 May 2026 02:47:08 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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) {