From nobody Thu Sep 03 20:31:40 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 4hbWTt3F6dz6qN65; Thu, 03 Sep 2026 20:31:46 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbWTt2SSYz3vV2; Thu, 03 Sep 2026 20:31:46 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788467506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N7QFUcXgqLYOgpCrjwjHDchHhOXvzTu9Dtu30qwwIAA=; b=VRkprPKQRb6hGpy5/XGOOzjiXpnA2t5b4v3bo16gvuKonDoXmnN0ud9n2plw+W6c5vcb+H GpT4hw8jJ4FbieM/H5k/63l0UkylVuZAc4oXiT+1iuu5Mmk4rFi9MIcQlChCwmqKsA7Mlr Q/JdbwNZlowtAb34RZ9DDZ5Sm+hRKBKfHRVMvg3t8VRAcwva9eNLCh/eQ8FJGjpnT0hqPc M+mOAISQzom66SI/T68K+kTH+2eyS6Wa+l9tQg36/qtQza1d7QrpfhvAXZxcXPYV96ESmt P0MPMKLz2/pP+KWf4TSD/16+FGsLfPvuWgyocRp/CcdjwMOsDA0dxJwNob+mVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788467506; a=rsa-sha256; cv=none; b=s1ToopLN2c+h83WdRygOGZ+lmaWUoNcUVb+//y8vQoNwYaouhjM5MSdZPnc2g7M2Bx8Hj/ 25DeOXPl5uaTTkJ/JeUlNqULNhW/9Gb52Ww7UMsRlycwTKeJFH32xNXobuX2UNnoj//1kj NcOs2NgObt5goR9tu1Ks4ZEGzzAaYUpKkajSSAMM+oEJfCbkDn3KgUR4ZbCilaPLHCTS+p NQ911GefqlZtOmZTjVKBUYn6csfO9RsI8viUHjaCtjPzQWStGU0yDUb+Wor/obQATweHh+ 6jMRzR9ozATKw/h3dOGr3sTC1nS/LbGL6mdf7uOTbXajiY+WA4T9P0HGbtE1bQ== 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=1788467506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N7QFUcXgqLYOgpCrjwjHDchHhOXvzTu9Dtu30qwwIAA=; b=SY4AKbDNVkpRXcLq1CmyXf+KtJxYEAWxerh0fI3v/28uC0MTfasrQV+gtBpTwQw8Tm2AdE G26syRWK4nlTbAWoPiVDbIugmNQLVVTIjgS1tULdMljMfAiGVv8qIWxOz3ak5baU2gfjP7 L9HiUQckzDuKmWK9Bt6c5fiEWmj0duzojCYCPuWFxbTggVjiSo24VcOVwSRd5yvdzdD4H1 b7RqkKShXAVc6rixkka/tGsJaPbJkgAz7Jd7sD9aqrb3TPta/B9bDK2Nw5OCj9qeWFyfs9 nCNW/oufKG9YlY7q3b92Wyq7t7+74utnJXrw1zvoxq5whzZMNye0YQkSsJsXyg== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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 did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4hbWTs4VpczwPW; Thu, 03 Sep 2026 20:31:45 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Thu, 3 Sep 2026 13:31:40 -0700 From: Gleb Smirnoff To: Rick Macklem Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cc352a850f98 - main - nfs_clvfsops.c: Fix the non-VIMAGE build Message-ID: References: <6a970cbc.3b24c.6eba264f@gitrepo.freebsd.org> 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6a970cbc.3b24c.6eba264f@gitrepo.freebsd.org> On Tue, Sep 01, 2026 at 05:34:52PM +0000, Rick Macklem wrote: R> The branch main has been updated by rmacklem: R> R> URL: https://cgit.FreeBSD.org/src/commit/?id=cc352a850f9860eadf9558cf0c920a3655fae576 R> R> commit cc352a850f9860eadf9558cf0c920a3655fae576 R> Author: Rick Macklem R> AuthorDate: 2026-09-01 17:33:08 +0000 R> Commit: Rick Macklem R> CommitDate: 2026-09-01 17:33:08 +0000 R> R> nfs_clvfsops.c: Fix the non-VIMAGE build R> R> The OFED code checks for a vnet argument, but it is R> is not defined. R> R> Reported by: glebius R> MFC after: 3 months R> Fixes: 884ee8d6c9b4 ("nfscl: Add some glue for client side NFS over RDMA") R> --- R> sys/fs/nfsclient/nfs_clvfsops.c | 4 ++++ R> 1 file changed, 4 insertions(+) R> R> diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c R> index afe954c2a69d..f336e320b04c 100644 R> --- a/sys/fs/nfsclient/nfs_clvfsops.c R> +++ b/sys/fs/nfsclient/nfs_clvfsops.c R> @@ -1544,7 +1544,11 @@ nfs_mount(struct mount *mp) R> error = EINVAL; R> goto out; R> } R> +#ifdef VIMAGE R> error = rdma_check_route(vnet0, nam, NFSV4_CBSLOTS); R> +#else R> + error = rdma_check_route(NULL, nam, NFSV4_CBSLOTS); R> +#endif We might want a define for vnet0, so that this commit could have been a one liner. In net/vnet.h under !VIMAGE case: #define vnet0 NULL On the other hand, any module that wants to use vnet0, or check if curvnet is vnet0 or not, is very likely doing something wrong :) I haven't looked at rdma, but passing vnet as function parameter seems wrong. The above was rhetorical grumbling, not a request for any action :) -- Gleb Smirnoff