From nobody Mon Aug 29 10:23:49 2022 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 4MGRP16sk7z4Zp8Y; Mon, 29 Aug 2022 10:23:49 +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 4MGRP15t7hz3tly; Mon, 29 Aug 2022 10:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661768629; 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=D5q04BUaCaicXTwX815c5qht46m2Llz94zNkBmBHR4g=; b=sC40OOvITDOdf7CjzltdJTXD10q5DVTKpLGSyxAEgkIzPWUlGuHxDmIr11nN2jIEIxlldL Z579qp5T6e5CS2ud/YRgLzGm0B7DqmO8UQoPoDAaVnDQsXE97ObapeeANphLeHsVe0zXqw sNMjqsSjEm8zxj4/3fWYG6y3iIk41lE4lnHe6SxLSWaOLgETYlHsppQxly4xblEKJeE2m2 U8tcxXw0eX4+xTmFEyoJObsKaB5/Wy2U6K6fzW6vnnd0rF+IA24N1otJ5UWnpeGImCTkfL Rynha54j/UHSdxEw+stIyH4oE5v6C5qBGJOcLZ+XpjZPNujbw5gy8QBOpgt8+w== 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 4MGRP14Z5rzPM5; Mon, 29 Aug 2022 10:23:49 +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 27TANnhe015060; Mon, 29 Aug 2022 10:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27TANnKt015058; Mon, 29 Aug 2022 10:23:49 GMT (envelope-from git) Date: Mon, 29 Aug 2022 10:23:49 GMT Message-Id: <202208291023.27TANnKt015058@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: 835a611e6840 - main - routing: make IPv6 defrouter code use new nhop-based KPI. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 835a611e684094d82de306209071e233bb83123a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661768629; 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=D5q04BUaCaicXTwX815c5qht46m2Llz94zNkBmBHR4g=; b=dOhbTWZvYA+HXBi9bYQrMrRYvm7sm5c6tLIaf8ShZnex4fnNgakiHmItkW3yH9VNlYOG+i 3RST8yzt+CDSop0EysXXkLTBPnS2w1ZY1+JW5IEHrHE7wSKguRA3aSFykuahZOgK+RAaME JkLaKcKHbqeszfYGHcYWgSAp25vEycEzZAZe3M30RNJAwtFjz6i+tYTovxzdHqbKzmvXHy DTX4F+L1ceiqk7MwCmrfzsRuee29joq+LvZ9F5EbGt2yiw/leH8udL853yUal0Krac+t3r HgUBhby/t6pfynGBqPP2wsCu10pZdqAttp6e+fdQDWP8c5KjHCLGOtZDpmk+6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661768629; a=rsa-sha256; cv=none; b=nuwdPytZlO1ZEfuWfRf9q1mzj82GtYgmrG9Un9yZebnivdFzRhpqBkNtUUA3l3S9gwNITK FZ31rgizXDsk1Ax0g9BGcTgtj8JNDUGcAoNqc+0idqy510jhCrzi5tQJXTYJr4+RImt3ul jyqpkm39NGirjnhS0ZFChTeXiC0R2B24WDnLXRlTqFmXapqE7Pz3yf5BJBsgC/iC1wluxy Imtof0XrPB7W1fxLqWdVCH5/0x0ppPPO9XaMJ/vGoPhXR00S5APfyKtPXTX6z7ULIi+D7t aotEXaLU10r3s6+u0JONFDcHV6+uc1bty0G4SeM7aC9TWX9SlaWNwXK7XACpLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=835a611e684094d82de306209071e233bb83123a commit 835a611e684094d82de306209071e233bb83123a Author: Alexander V. Chernikov AuthorDate: 2022-08-09 11:33:45 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-08-29 10:08:47 +0000 routing: make IPv6 defrouter code use new nhop-based KPI. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D36168 --- sys/netinet6/nd6_rtr.c | 63 +++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 032d019702ac..a8431e23b815 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -674,30 +674,21 @@ pfxrtr_del(struct nd_pfxrouter *pfr) static void defrouter_addreq(struct nd_defrouter *new) { - struct sockaddr_in6 def, mask, gate; - struct rt_addrinfo info; - struct rib_cmd_info rc; - unsigned int fibnum; - int error; + uint32_t fibnum = new->ifp->if_fib; + struct rib_cmd_info rc = {}; + int error = 0; - bzero(&def, sizeof(def)); - bzero(&mask, sizeof(mask)); - bzero(&gate, sizeof(gate)); + NET_EPOCH_ASSERT(); - def.sin6_len = mask.sin6_len = gate.sin6_len = - sizeof(struct sockaddr_in6); - def.sin6_family = gate.sin6_family = AF_INET6; - gate.sin6_addr = new->rtaddr; - fibnum = new->ifp->if_fib; + struct sockaddr_in6 gw = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(struct sockaddr_in6), + .sin6_addr = new->rtaddr, + }; - bzero((caddr_t)&info, sizeof(info)); - info.rti_flags = RTF_GATEWAY; - info.rti_info[RTAX_DST] = (struct sockaddr *)&def; - info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&gate; - info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&mask; + error = rib_add_default_route(fibnum, AF_INET6, new->ifp, + (struct sockaddr *)&gw, &rc); - NET_EPOCH_ASSERT(); - error = rib_action(fibnum, RTM_ADD, &info, &rc); if (error == 0) { struct nhop_object *nh = nhop_select_func(rc.rc_nh_new, 0); rt_routemsg(RTM_ADD, rc.rc_rt, nh, fibnum); @@ -713,31 +704,25 @@ defrouter_addreq(struct nd_defrouter *new) static void defrouter_delreq(struct nd_defrouter *dr) { - struct sockaddr_in6 def, mask, gate; - struct rt_addrinfo info; - struct rib_cmd_info rc; + uint32_t fibnum = dr->ifp->if_fib; struct epoch_tracker et; - unsigned int fibnum; + struct rib_cmd_info rc; int error; - bzero(&def, sizeof(def)); - bzero(&mask, sizeof(mask)); - bzero(&gate, sizeof(gate)); - - def.sin6_len = mask.sin6_len = gate.sin6_len = - sizeof(struct sockaddr_in6); - def.sin6_family = gate.sin6_family = AF_INET6; - gate.sin6_addr = dr->rtaddr; - fibnum = dr->ifp->if_fib; + struct sockaddr_in6 dst = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(struct sockaddr_in6), + }; - bzero((caddr_t)&info, sizeof(info)); - info.rti_flags = RTF_GATEWAY; - info.rti_info[RTAX_DST] = (struct sockaddr *)&def; - info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&gate; - info.rti_info[RTAX_NETMASK] = (struct sockaddr *)&mask; + struct sockaddr_in6 gw = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(struct sockaddr_in6), + .sin6_addr = dr->rtaddr, + }; NET_EPOCH_ENTER(et); - error = rib_action(fibnum, RTM_DELETE, &info, &rc); + error = rib_del_route_px(fibnum, (struct sockaddr *)&dst, 0, + rib_match_gw, (struct sockaddr *)&gw, 0, &rc); if (error == 0) { struct nhop_object *nh = nhop_select_func(rc.rc_nh_old, 0); rt_routemsg(RTM_DELETE, rc.rc_rt, nh, fibnum);