From owner-svn-src-all@freebsd.org Thu May 28 07:35:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC1A8328F37; Thu, 28 May 2020 07:35:07 +0000 (UTC) (envelope-from melifaro@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49XfcC4crZz44jD; Thu, 28 May 2020 07:35:07 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9571822A9E; Thu, 28 May 2020 07:35:07 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04S7Z7jU049487; Thu, 28 May 2020 07:35:07 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04S7Z7R9049486; Thu, 28 May 2020 07:35:07 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202005280735.04S7Z7R9049486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 28 May 2020 07:35:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361575 - head/sys/fs/nfsclient X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: head/sys/fs/nfsclient X-SVN-Commit-Revision: 361575 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2020 07:35:07 -0000 Author: melifaro Date: Thu May 28 07:35:07 2020 New Revision: 361575 URL: https://svnweb.freebsd.org/changeset/base/361575 Log: Make NFS address selection use fib4_lookup(). fib4_lookup_nh_ represents pre-epoch generation of fib api, providing less guarantees over pointer validness and requiring on-stack data copying. Switch call to use new fib4_lookup(), allowing to eventually deprecate old api. Differential Revision: https://reviews.freebsd.org/D24977 Modified: head/sys/fs/nfsclient/nfs_clport.c Modified: head/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clport.c Thu May 28 07:31:53 2020 (r361574) +++ head/sys/fs/nfsclient/nfs_clport.c Thu May 28 07:35:07 2020 (r361575) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -976,24 +977,29 @@ nfscl_getmyip(struct nfsmount *nmp, struct in6_addr *p #endif #ifdef INET if (nmp->nm_nam->sa_family == AF_INET) { + struct epoch_tracker et; + struct nhop_object *nh; struct sockaddr_in *sin; - struct nhop4_extended nh_ext; + struct in_addr addr = {}; sin = (struct sockaddr_in *)nmp->nm_nam; + NET_EPOCH_ENTER(et); CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - error = fib4_lookup_nh_ext(fibnum, sin->sin_addr, 0, 0, - &nh_ext); + nh = fib4_lookup(fibnum, sin->sin_addr, 0, NHR_NONE, 0); CURVNET_RESTORE(); - if (error != 0) + if (nh != NULL) + addr = IA_SIN(ifatoia(nh->nh_ifa))->sin_addr; + NET_EPOCH_EXIT(et); + if (nh == NULL) return (NULL); - if (IN_LOOPBACK(ntohl(nh_ext.nh_src.s_addr))) { + if (IN_LOOPBACK(ntohl(addr.s_addr))) { /* Ignore loopback addresses */ return (NULL); } *isinet6p = 0; - *((struct in_addr *)paddr) = nh_ext.nh_src; + *((struct in_addr *)paddr) = addr; return (u_int8_t *)paddr; }