From nobody Fri May 15 19:42:20 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 4gHHf90FHJz6dsy8 for ; Fri, 15 May 2026 19:42:25 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb12d.google.com (mail-yx1-xb12d.google.com [IPv6:2607:f8b0:4864:20::b12d]) (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 4gHHf83r5lz42Kh for ; Fri, 15 May 2026 19:42:24 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-xb12d.google.com with SMTP id 956f58d0204a3-65c364b893aso465776d50.0 for ; Fri, 15 May 2026 12:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778874142; cv=none; d=google.com; s=arc-20240605; b=Xwj/O6c5Xcw4l2wdvIAAfEouvAQ2hvfVGk7St5fabfqa75fUc+fI5o1j1eIJmgJ4IJ 4WhyRCHfAj59Y4qQfBKHjOtgWXj0fOoHb3TPBjtt4FNz8TF1i9LsJfFDftje8vE6v/l/ HoG/g2q2yJr1NKJInOcwZS02gmaiZXtL/WumKp9lnTNeZQXS8vJWA68G5XEbfMA54w62 7m2AqkiTtOws3CtFZJR+21plywxLbH+SkTGV9VFx921gb0H3+AdlkBoi2I04gGQ/PXg0 3i8G0iIQOLJ/AfFBlTMFx15vkhJ8b2tPFmJEpPgl4jBalSP/UqltMeQTq0BL9kwLOuyn WxEQ== 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=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; fh=g6jKeGrhgsC8Zn4WAwzveZDfTDoj7+YItktGHoQtPS8=; b=CYrWJ7QSPeNti4cubOx9CbO89/Gyz0L+zX3puvtRzZWvTN8kjGstmumYLH4kGXk1s0 UQRiU5OckwiNKjT35EBEAefl82gS/j9ZjgPw4Pm3B9M6X416aFhseirzfeNHbtqn1w/W B7Dm8nbRg8g04pwQgpoMxrPcs2cLozsYbWmtKMWoW+sq9t47aNj3XLgCqEGvLfZ0TDns Jw9XVsw57sY17WZvdsXAR78ysOQLGVwCDMA6308Kj2ICNOX420CYb5vs89nXNlbhIhgd nFHSzbCoPakFxeh0FRTsEIhHDNUSym/mwSA/n2B0lvDPDFoMpa90Nu2/cf3AXkq7UJx+ zLFw==; 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=1778874142; x=1779478942; 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=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; b=X6Xq5N3A+6BOgt7I1KsAQLQLqQqOayF5M1clyRHpndqvqk0f8zNzjknyPl3jwWqmwt cRCPlDt+DNHTFS2vF10q7L8SPgwXeTGJFByLOfm0JQsu0Xz2/o0UesULuJOO8jA8HBVW A8/IS2O541kBk7C0LjUlLE9i+4fomWP0g3BgftM4TOcCKr4HDAe6ltqo+rBa1CTlLgIZ HioIsUPK6zZy3yI+u1J9QwAfpCeeh05pz2vjupX0avbjofSt4wGTStGN9jDmLBB4rO+g H6NQD8MUYcAWIMWaJx/EZJT0Vu9oDyXqZ8OGbc0vzKB2dQJhaFwYVkDfU3Zl/gbDfXx8 MFuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874142; x=1779478942; 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=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; b=THkLLaPLec/L2wWPX14410jzBgkuMgMZjLPzcLuV6usdT+yIMgV/HGo/KUgLrnn7Eu DZnMLNW9HLUnTJOYr2hjddz1QljuNilrh+essi3xP1c9FiIbBA6HFzsyZ0rvrWCMascV shRaqJ80rJrH4llR1eqZ+l53wiz+ntT8v4VlS2gJ6dlNh1ZMA3xTzZkJ4uz+mTt0bISs eXZcV5Y2slWoJb/GqsBO5FtAEssz443JDS/uf//r3/i1p+U+KYDHnI2Dc4fg/wmh3vrw VAGMFDJRr5k7GYzSrxY+aRHJVrwYdJKeh43ctXIwZA2lWZAod+2ZAInz1A5WpbZLcZL3 dpKA== X-Forwarded-Encrypted: i=1; AFNElJ8YBlWq5TYdnET3u0Q7CA0+F6Et+E5ICQv+dfqtuCmml1YrDW0V/MNcHcSzVsyS/onZKKas45u8qzRhpysbaL1/iUuZpA==@freebsd.org X-Gm-Message-State: AOJu0YzJdeUL78TtsMwcJYbtGSZBzpOcZQRyTAij0ymapSeCQ70HhDbj VIpN2ZBGxpjL4Pn/9cuNhHWhfoJrBmkPB7Sw5frQbzZed9MrQ/7KBh7V+I4Fc6DdZVH8qfcvSqv IWyZ0uWH1gownUjsyVPD/nmQTJKpjj/E= X-Gm-Gg: Acq92OGVOC+WVTD5FKf3cwJVd3y+f5UtrEAdOFMAfmcBVju4oSJDnhU3nabdVVPP1nP NVMYVSYLHJzbxXMLFaMSOUcGVXmQdhXu6AayCgY74sFA8B7+9N08VaACv4bOIGPZg1Faysmp3LW o5ukbBsZmyDmeTBwW0D3oeWjVmeXmHRJvpAiHHTWDf/jUcLhMxPm7yYeZcWKMRSESyDQlyeCNlU 5dV5C+607q6jznGQRYSqcU/6LXvqqPl9e+rlRjAD03iOurRox7tR0QGd33kRblg2WacUhwCfWhZ y8AivpInmfIxk9EycnA3HrmkyUMYUHHDPLEPYZAtgI631mCuqFw= X-Received: by 2002:a05:690e:1402:b0:65d:6f10:d42a with SMTP id 956f58d0204a3-65e227cfff6mr5395860d50.39.1778874142364; Fri, 15 May 2026 12:42:22 -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:c9a:b0:514:c31c:db89 with HTTP; Fri, 15 May 2026 12:42:20 -0700 (PDT) In-Reply-To: <6a064e15.44875.4253434b@gitrepo.freebsd.org> References: <6a064e15.44875.4253434b@gitrepo.freebsd.org> From: Oliver Pinter Date: Fri, 15 May 2026 20:42:20 +0100 X-Gm-Features: AVHnY4KHqD2ECw2L6wgkbEZgWe3CrVi5X3X0ChNljK0_PYUDWiepeylSSfHkyGA 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="0000000000005b16ab0651e0699c" X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4gHHf83r5lz42Kh X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --0000000000005b16ab0651e0699c Content-Type: text/plain; charset="UTF-8" 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= > 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") 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. > --- > 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) { > > --0000000000005b16ab0651e0699c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi!

On Friday, May 15, 2026, Rick Macklem <rmacklem@freebsd.org> wrote:
The branch main has been updated 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")

Wouldn&#= 39;t be better to introduce an MFC with tag, rater than abusing the Fixes t= ag? This seems to me like a new "feature", rather than a bug. And= it will may be added to releasenotes also.
=C2=A0
---
=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_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)
=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) {

--0000000000005b16ab0651e0699c--