From nobody Fri May 15 19:44: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 4gHHhD3pfWz6dt6Q for ; Fri, 15 May 2026 19:44:12 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb12e.google.com (mail-yx1-xb12e.google.com [IPv6:2607:f8b0:4864:20::b12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHHh93pGPz42Sr for ; Fri, 15 May 2026 19:44:09 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20251104 header.b=fP9jZIjQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of oliver.pntr@gmail.com designates 2607:f8b0:4864:20::b12e as permitted sender) smtp.mailfrom=oliver.pntr@gmail.com; arc=pass ("google.com:s=arc-20240605:i=1") Received: by mail-yx1-xb12e.google.com with SMTP id 956f58d0204a3-65890a6ca20so505445d50.0 for ; Fri, 15 May 2026 12:44:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778874243; cv=none; d=google.com; s=arc-20240605; b=VOinThimzI2omjvjGyZ2H4wcEOa/8zljuWXnBb8r3QmBEnPkEdQYTgEV9JHvz+LBkC S1gTF4/aSqvXgZGELD6YXFt6RiBAhabeLmloEsxMV9R1Vxfs7T3mx8/Y9GlfdnJZnmyj p9B8JnNXETGC7Oe/tom9Rl9QfkZNmQdJx3kIdqMGBYa+adbK2Y1f7TCnOHPHhbYGzjIW bRDkRu6H1NHLuOt5AnKApCsQYv5h2O3DQhVpud0p5aqd7+Ee8HQGg4DhBngDhGw+HYAG QNePjspKCYDGQkKCV6oiSscs2A2P7WLfH7dt0+RkriMhC8nOr0xZS8Sp9ZZG6r+5MGsZ UUOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature; bh=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; fh=OUZET+XACTXEClX38p9UqupcRclP0oidushUFgAnmLg=; b=goE/ijGEtvTuJOYR4AVw6Qw5za5nQMZ/kdjQwF9wmbq+5/U/K7wRS0JtDf5qmwhOLy ye9nIvaC2+VN/NJ7b0J6aDDKPV6NRLS1AfrHbQe56BXdRGK9izcprRpRG1gg6ZcZLKrb nAWmQZUz3g8WaPXxbT62gy0hxdfj+KDGdLvdJjZF0TPvw1YP8dNmNK5Y/Dfkuw3blYGa UVVkEwO6RZEbaV7ugZvPCalx0Ze/Va/fZ4vuXR8rf7twWyDffOSrTb0xsyntQrz9ajI8 kqZYGHQstyLWCuZdc+OdXgA06qUDWHNYH/5WcKYlmTf5P7LjZVCDV7KhSrxE5EmAzBeG s6xw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874243; x=1779479043; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; b=fP9jZIjQ60kc5utmR1bipUiQctvFZxs8FilqyMkvmnM9c3FjZP/rbp4KGIED+euAqY XwmeChzQW9db/ITR2Hs898kJcmOZV8YNeYtXFFKYFEOYgvkmESGGGcmvL0qPPKg7IQqF cCe7lhzyCmgDwipUgmXC6BtJmcmt/xI/kiKJELEpztHlw1zzz4sD0Khmpw4HVBRZprs2 ZNmLphnIrrRd1bNu0tckzLp65bijANgJbf0o7Xb4Bf9rqaE9k38CwfOlOss+P9k0HD6W fuLCw8al5LGoz1vWUo2WvrfkUkV3VVNneextx3u8Gqt7yi1diY/hFsTluOa0+DyfRgRe ya1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874243; x=1779479043; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; b=g7qDHsx9tNDRDquSSil/uEnDGuXjnzN0ZI8aKa5k4loruyWzHYzNnyyWCxrHGR3Gl9 Z1gDqzFh1d8O8mUKzCqdXwAciKbygqY6HvDxBfJBBZGRziLScMXo7P13B4ouLQdpIDYL 9r/x7lXq24aT9uZ8Jn9tr/oHPga1Gf+3G+Ano/D3qGVcMqYBtQrUXAsGQ5JoeRB4WaIP Xln08IPat/nbOJ5sNo6T7KbRUuLlYROA+cbqLVAqscemj+0PXjP1vCeSKYIn5VXZA7nL vzYLsx8bM03x9JGnRvs5bAgrNa9Fk2FfSZaTp7iRTUqHRLLl8WOweABM+kizet+PIC/b 54tg== X-Forwarded-Encrypted: i=1; AFNElJ/eMQkDEs2P5I3A1r4kmwMnYbaDjKPqjeOsozCSXyc/OUPHUlg8CT3xq4IwcfliiZEpFDUPV/6hDmwoXQ1fXmqiOyUWLQ==@freebsd.org X-Gm-Message-State: AOJu0YxnUxIa0C9DkPU3N/JO/lxW/LbtOpVanJdMJ3gHAFEoKl11aygU Uhp32d3cp/Q9o8DnvmNt5JckfHwiD81b80UJklRgf+WG+VLAdwM+O0TUUStfQo95FjB3tu1mpiT MbMWaWN5+lys1z5318kGbwfl+adqSrRI= X-Gm-Gg: Acq92OFrsoBoGely1f+jY5MEG7HfNcm381zmc+K41A0oygMzpr8ehJB0c+2mPi+2kNB jvdf+AZyyZlNFRje6cCUwUPictFUjzw+4C6bOfpBI6jPWlBLxgVnAVcEVk40/ASTVKlZS2iFK73 erpX/aJd9XHHitvxD3R1khbeZzs90FjYzujV+W5GlEgp/lEyBV3zNcriO4hrwtvKwS8Tzo30CKC awhrGlAgQkqCwHMlJ8jRVYq65qrOa9+6gKatosW23By9OqrRvfzQo7TB2hHJoMbK+tAp45eBn8M dZ4uukk+g4JqB6vyA6X4y0i5zgkc445Wnb3p7al1 X-Received: by 2002:a05:690e:4806:b0:650:a6d:d6bf with SMTP id 956f58d0204a3-65e2282a752mr3961703d50.51.1778874243448; Fri, 15 May 2026 12:44:03 -0700 (PDT) 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 Received: by 2002:a05:7011:1b89:b0:518:4b65:6f6d with HTTP; Fri, 15 May 2026 12:44:01 -0700 (PDT) In-Reply-To: References: <6a064e15.44875.4253434b@gitrepo.freebsd.org> From: Oliver Pinter Date: Fri, 15 May 2026 20:44:01 +0100 X-Gm-Features: AVHnY4IC9OLCdRqd-o7eXF-nlG1X0nc_yb7PXAIBMUCV9xQ_77_Qr7z4MW1F12c Message-ID: Subject: Re: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes To: Rick Macklem Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000006184be0651e06f17" X-Spamd-Result: default: False [-5.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4864::/56:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20251104]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROMTLD(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b12e:from] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4gHHh93pGPz42Sr --0000000000006184be0651e06f17 Content-Type: text/plain; charset="UTF-8" On Friday, May 15, 2026, Oliver Pinter wrote: > Hi! > > On Friday, May 15, 2026, Rick Macklem wrote: > >> The branch main has been updated by rmacklem: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=b92b9da3300655c86dcd >> 42ea8a5ba45badd90847 >> >> 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") > > > Wouldn't be better to introduce an MFC with tag, rater than abusing the > Fixes tag? This seems to me like a new "feature", rather than a bug. And it > will may be added to releasenotes also. > > (sorry, I've just seen now, the release notes, I'm going through on the commit from oldest to newest, but the other part is still relevant) > --- >> 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) { >> >> --0000000000006184be0651e06f17 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Friday, May 15, 2026, Oliver Pinter <oliver.pntr@gmail.com> wrote:
Hi!

On Friday, May 15, 2026, Rick Macklem <rmacklem@freebsd.org= > wrote:
The branch main has been upda= ted by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db92b9da3300655c86dcd42ea8a5ba45badd90847

commit b92b9da3300655c86dcd42ea8a5ba45badd90847
Author:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-05-14 22:33:23 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-05-14 22:33:23 +0000

=C2=A0 =C2=A0 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes

=C2=A0 =C2=A0 Without this patch, the maximum setting for
=C2=A0 =C2=A0 vfs.nfsd.srvmaxio was 1Mbyte.=C2=A0 This patch increases
=C2=A0 =C2=A0 that to 4Mbytes.

=C2=A0 =C2=A0 The same as for any setting above 128Kbytes, settings up to =C2=A0 =C2=A0 4Mbytes require that kern.ipc.maxsockbuf be increased.
=C2=A0 =C2=A0 (A message generated after setting vfs.nfsd.srvmaxio via
=C2=A0 =C2=A0 the /etc/rc.conf variable nfs_server_maxio will indicate
=C2=A0 =C2=A0 the minimum setting, which will be somewhat greater than
=C2=A0 =C2=A0 four times the setting of vfs.nfsd.srvmaxio.)

=C2=A0 =C2=A0 Requested by:=C2=A0 =C2=A0Cedric Blancher <cedric.blancher@gmail.com>
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
=C2=A0 =C2=A0 Fixes:=C2=A0 13d3bd165e22 ("subr_uio.c: Remove a KASSERT= () for large NFS server I/O")


---
=C2=A0sys/fs/nfs/nfsproto.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 3 +++=
=C2=A0sys/fs/nfsserver/nfs_nfsdport.c | 5 +++--
=C2=A02 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 @@
=C2=A0 * It used to be called NFS_MAXDATA, but has been renamed to clarify = that
=C2=A0 * it refers to server side only and doesn't conflict with the NF= S_MAXDATA
=C2=A0 * 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
=C2=A0 */
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVMAXIO=C2=A0 =C2=A0 (128 * 1= 024)
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVLIMITIO=C2=A0 (4 * 1024 * 1024)<= br>
=C2=A0/* Stat numbers for rpc returns (version 2, 3 and 4) */
=C2=A0/*
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nf= sdport.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)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printf("nfsd: = vfs.nfsd.srvmaxio can only be increased\n");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > 1048576) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > 1Mbyte\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > NFS_SRVLIMITIO) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > %d\n",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NFS_S= RVLIMITIO);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if ((newsrvmaxio & (newsrvmaxio - 1)) !=3D = 0) {

--0000000000006184be0651e06f17--