From owner-dev-commits-src-branches@freebsd.org Wed Mar 10 22:27:44 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@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 661B75793B4;
Wed, 10 Mar 2021 22:27:44 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Dwmt773YSz4m2x;
Wed, 10 Mar 2021 22:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(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)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50F9C192C7;
Wed, 10 Mar 2021 22:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12AMRhJi032396;
Wed, 10 Mar 2021 22:27:43 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12AMRhXU032395;
Wed, 10 Mar 2021 22:27:43 GMT (envelope-from git)
Date: Wed, 10 Mar 2021 22:27:43 GMT
Message-Id: <202103102227.12AMRhXU032395@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Subject: git: f67641675958 - stable/13 - Make in_localip_more() fib-aware.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: melifaro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f67641675958cb566b0ae50dc6942017d42393fe
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Mar 2021 22:27:45 -0000
The branch stable/13 has been updated by melifaro:
URL: https://cgit.FreeBSD.org/src/commit/?id=f67641675958cb566b0ae50dc6942017d42393fe
commit f67641675958cb566b0ae50dc6942017d42393fe
Author: Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2021-02-16 20:00:46 +0000
Commit: Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2021-03-10 21:47:39 +0000
Make in_localip_more() fib-aware.
It fixes loopback route installation for the interfaces
in the different fibs using the same prefix.
Reviewed By: donner
PR: 189088
Differential Revision: https://reviews.freebsd.org/D28673
(cherry picked from commit 9fdbf7eef5c006002769add15b1ebb8fa8d9e220)
---
sys/netinet/in.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index eb58c3453cfc..bcf071a81e0e 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -163,18 +163,23 @@ in_ifhasaddr(struct ifnet *ifp, struct in_addr in)
* the supplied one but with same IP address value.
*/
static struct in_ifaddr *
-in_localip_more(struct in_ifaddr *ia)
+in_localip_more(struct in_ifaddr *original_ia)
{
struct rm_priotracker in_ifa_tracker;
- in_addr_t in = IA_SIN(ia)->sin_addr.s_addr;
- struct in_ifaddr *it;
+ in_addr_t original_addr = IA_SIN(original_ia)->sin_addr.s_addr;
+ uint32_t original_fib = original_ia->ia_ifa.ifa_ifp->if_fib;
+ struct in_ifaddr *ia;
IN_IFADDR_RLOCK(&in_ifa_tracker);
- LIST_FOREACH(it, INADDR_HASH(in), ia_hash) {
- if (it != ia && IA_SIN(it)->sin_addr.s_addr == in) {
- ifa_ref(&it->ia_ifa);
+ LIST_FOREACH(ia, INADDR_HASH(original_addr), ia_hash) {
+ in_addr_t addr = IA_SIN(ia)->sin_addr.s_addr;
+ uint32_t fib = ia->ia_ifa.ifa_ifp->if_fib;
+ if (!V_rt_add_addr_allfibs && (original_fib != fib))
+ continue;
+ if ((original_ia != ia) && (original_addr == addr)) {
+ ifa_ref(&ia->ia_ifa);
IN_IFADDR_RUNLOCK(&in_ifa_tracker);
- return (it);
+ return (ia);
}
}
IN_IFADDR_RUNLOCK(&in_ifa_tracker);
@@ -1007,11 +1012,6 @@ in_scrubprefix(struct in_ifaddr *target, u_int flags)
if (ia_need_loopback_route(target) && (flags & LLE_STATIC)) {
struct in_ifaddr *eia;
- /*
- * XXXME: add fib-aware in_localip.
- * We definitely don't want to switch between
- * prefixes in different fibs.
- */
eia = in_localip_more(target);
if (eia != NULL) {