From nobody Thu Mar 30 09:57:23 2023 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 4PnJkC6qDrz42m8C; Thu, 30 Mar 2023 09:57:23 +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 4PnJkC6480z4MKW; Thu, 30 Mar 2023 09:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680170243; 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=Zd2+ATycv3W5x26YZEL7rBwfjxs6Et73s5pcqGNXSQM=; b=aGKxQ2Z5r9v+97GqsPjz0IbvTqo82uk0hyPCS3NecL9Qd5wr76+71eQU4PkSa6fCSDLMzk g2RPYovk6xR2ajq3Q8xZK8kO/aH+XKWHtnD/hmc2MBoc4e2ltWm29+qSiBfh4kLMsKl11K ZOt6NSrKYIPC9KZn2yfJv/4Unq4JPiNPvV9uBevdzOGp3rl36yiDHBq+HdqMVuRdh07BSv lYkRF6NZKfwStYMbUjCPgh7IBJ+JIPk8NW79XMRl47opQnhocUIU+DwdrgyVo77Fr1mH9q xKwS0iwhpTVF988Sa1GFtOMtsPqIVZSrkvJysol6k7z4BZFfaeAbqb/pab9zfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680170243; 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=Zd2+ATycv3W5x26YZEL7rBwfjxs6Et73s5pcqGNXSQM=; b=AGWq+2+1WDVrkO8vN8MxC6i07saFWwuepG1Mi2YgsU0gAhnuD/dYFJGRz2plRzTXQ0G2CN tzk9NZMvE7+QVtuCHTPhu4AN3s/DOQf3nQdFN3FQdyinAhYW4LG01bAgqdhOrGPBN38BGM D9qccLPr/1dsmz4uQFZSvP7Tf8fpBSAXWgPMVWo/4wbiyNe0GlP1GroC4P931wXDQTSB3u GCTC6qNO49YMcHn+0cFBvZbnUv7c5ryND2usi1Ny95WZ4ePyhVD07WRTDaPFREWD6ydpE9 kQTNW5Zb7QINk5Q/uuHdWcnOSc06FUnGbcjjMZszGMXXFiyt0nj8QI7nhJlpTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680170243; a=rsa-sha256; cv=none; b=avoccSqJjaUMrzpOlhOJxovkHjA8eKMXyLDUQqfO0jXI+ftTYYg/2VSZdYz76N4AWecT3a dGkCatdE8VXP63aDB6DYq8gfU9WGPsqkY7RxNFvnkS0dHMyW2rpIXM39XcrI+udh/n9SPV OUbFjWl7qxWZ6he207DITOTaZ2WOEdkci68BUA5YeSbda7oWdUY2V4EZb7q3N/t3QecH/w yDwK28gVZG6o0HCGfm7Q18ccTdj800FZwUEnnyIASUxMY+DJdj5CGSbWu9SDO7kwCWEmaB Zaa+IWTQuiEdHIt7VhFUiDYSaF7ONeGxWKOeOr1d/nz0MJveXw6m5/d7SJNncQ== 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 4PnJkC5B0Tz16Nx; Thu, 30 Mar 2023 09:57:23 +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 32U9vNhB018917; Thu, 30 Mar 2023 09:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U9vNDC018916; Thu, 30 Mar 2023 09:57:23 GMT (envelope-from git) Date: Thu, 30 Mar 2023 09:57:23 GMT Message-Id: <202303300957.32U9vNDC018916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: b755f1a009b0 - main - netlink: Fix adding routes with nexthops on p2p interfaces. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: b755f1a009b05cec45108e2ae83ae72c6e264c29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=b755f1a009b05cec45108e2ae83ae72c6e264c29 commit b755f1a009b05cec45108e2ae83ae72c6e264c29 Author: Alexander V. Chernikov AuthorDate: 2023-03-29 14:13:44 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-30 09:53:50 +0000 netlink: Fix adding routes with nexthops on p2p interfaces. Use full-featured ifa_ifwithroute() to guess route ifa/ifp instead of ifa_ifwithnet(). This change makes the route addition logic closer to the rt_getifa_fib() used by rtsock. Reported by: glebius Tested by: glebius Differential Revision: https://reviews.freebsd.org/D39335 MFC after: 2 weeks --- sys/netlink/route/rt.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7785dd42dc65..6d76390016dd 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -661,7 +661,7 @@ handle_rtm_dump(struct nlpcb *nlp, uint32_t fibnum, int family, } static struct nhop_object * -finalize_nhop(struct nhop_object *nh, int *perror) +finalize_nhop(struct nhop_object *nh, const struct sockaddr *dst, int *perror) { /* * The following MUST be filled: @@ -682,7 +682,15 @@ finalize_nhop(struct nhop_object *nh, int *perror) } else { /* Gateway is set up, we can derive ifp if not set */ if (nh->nh_ifp == NULL) { - struct ifaddr *ifa = ifa_ifwithnet(&nh->gw_sa, 1, nhop_get_fibnum(nh)); + uint32_t fibnum = nhop_get_fibnum(nh); + uint32_t flags = 0; + + if (nh->nh_flags & NHF_GATEWAY) + flags = RTF_GATEWAY; + else if (nh->nh_flags & NHF_HOST) + flags = RTF_HOST; + + struct ifaddr *ifa = ifa_ifwithroute(flags, dst, &nh->gw_sa, fibnum); if (ifa == NULL) { NL_LOG(LOG_DEBUG, "Unable to determine ifp, skipping"); *perror = EINVAL; @@ -765,7 +773,7 @@ create_nexthop_one(struct nl_parsed_route *attrs, struct rta_mpath_nh *mpnh, if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); - *pnh = finalize_nhop(nh, &error); + *pnh = finalize_nhop(nh, attrs->rta_dst, &error); return (error); } @@ -852,7 +860,7 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, /* TODO: return ENOTSUP for other types if strict option is set */ } - nh = finalize_nhop(nh, perror); + nh = finalize_nhop(nh, attrs->rta_dst, perror); } return (nh);