From nobody Tue May 05 00:05:37 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 4g8f131Vg2z6cmhT for ; Tue, 05 May 2026 00:05:43 +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 4g8f130mBGz42fN for ; Tue, 05 May 2026 00:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777939543; 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=HPgaMzkmKmYoAWzRfiqtDbS8/L6YGBXbG4RdCfqIuxM=; b=teC6d7h0e90yn9+0KfEcb0bUBvH6P0mhFS7zyDJot+8za3XoKlzQfHbi030CdBvQ4Jtf5A hxNT0cZZErZ7+9DWXr8m5Ctyk/4uI3TBAIGPysrH5d7dYsYtyTN7Lty/HKOf6IRHZ4ePrE b/qK3wTGzWYT1lmhUo1SNFf1ceMprOErQ9csjNbn6J/JfuS0Nqc5e+Ez6MfNwkoaTCNSb4 EHn1Fcwhtidwl4tlHZahhD5LvPsi4OB8I9L6kOuJewT+A+KjBQbYCPt91IK31FXXYWyKBd 7UFymRfg+H5aCIk4IbYb+ZLsYwJFKgrw/TMoTsqq0hPl/jtU8xHZOQVtNMIEMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777939543; a=rsa-sha256; cv=none; b=kYnVrTu1k2bwS9xgYm+Yq7biMpNUzRmErDPaEoG1yPwSTLxbfVb/fq4mI7WyuhlhLsVqfB j7NLIXnh10u/jo5FuiwIWoau8OobJubFA4N0ixjd8tFEK1++kOyUC9uvIlQynu6sK+huGc oGwkoSn2Wo4zFGZCA23I7WOTH7laa0KYI1r9XQcC6U3VNuWKfwSDUSWL00NWYVoBF1d/WW 2aTBO7ngPNogAbBA0Bls6jlAsi+eLrviV7BNjR0lQteq1iKdaQmiaA2pXNskKQrZXFCrjF PrHylj+MFrESSmOtocYjD2Nef2mWuBRk3ZP6p1IVCUG0Gg7nwU40gx8+u6CRZw== 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=1777939543; 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=HPgaMzkmKmYoAWzRfiqtDbS8/L6YGBXbG4RdCfqIuxM=; b=J5NC8h/6TpKsbL3+JNZ1/DXecSjLzglaYk8sdR/Ke6VkMU/C8YI7QFcOcWWP+i4z3ddVnC PAvh+sR9/1qPhVaVTNrD6Envo2DshLIszDW97Wmn4itGHFTpb1qiiDVpIOr9HsIma+uA3a WWLtqCG4eA9qRnbd+FVJqFXQwlJSVuUemV6oBAbqCLLGpR+d6H67LEWB8g01ZekW3e/GVF PFDehdLcxAyo1I4yuUw+WOrshS9nFVIED1UxMfBTkOYmKgiMSZroT9prPdkKeEydMyytWf knsq5M8pGcmFu/OnkuE9fq+LskkADoCwnkchfEp/MUv7tbp0rWom00b4/+KlIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8f130Hrrzj7P for ; Tue, 05 May 2026 00:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 00:05:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 03e9e83f3586 - main - nfs_nfsdserv.c: Clip number of callback slots 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: 03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb Auto-Submitted: auto-generated Date: Tue, 05 May 2026 00:05:37 +0000 Message-Id: <69f93451.33c96.2c15b11d@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb commit 03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb Author: Rick Macklem AuthorDate: 2026-05-05 00:04:00 +0000 Commit: Rick Macklem CommitDate: 2026-05-05 00:04:00 +0000 nfs_nfsdserv.c: Clip number of callback slots The client tells the server how many callback slots it can handle in the callback session. However, the NFSv4.1/4.2 server can only handle a maximum of NFSV4_SLOTS slots. This patch clips the client's value to that, to avoid using too high a slot# for a callback. Fortunately, I do not know of an extant client that specifies a value greater than NFSV4_SLOTS, so this patch is not really needed, as yet. Also, the client rarely uses a slot# above 0 when doing callbacks. MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 855d018e72d2..ad0f495bbd69 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4869,6 +4869,14 @@ nfsrvd_createsession(struct nfsrv_descript *nd, __unused int isdgram, *tl++ = txdr_unsigned(sep->sess_cbsess.nfsess_foreslots); *tl++ = txdr_unsigned(1); *tl = txdr_unsigned(0); /* No RDMA. */ + /* + * Although the client accepts slot#s up to + * sess_cbsess.nfsess_foreslots, the server can only use + * a maximum of NFSV4_SLOTS, so clip it to avoid ever using + * too high a slot. + */ + if (sep->sess_cbsess.nfsess_foreslots > NFSV4_SLOTS) + sep->sess_cbsess.nfsess_foreslots = NFSV4_SLOTS; } nfsmout: if (nd->nd_repstat != 0 && sep != NULL)