From nobody Sun Jan 29 16:04:30 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 4P4bjV30dYz3b8B4; Sun, 29 Jan 2023 16:04:30 +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 4P4bjV2KDHz4PHf; Sun, 29 Jan 2023 16:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675008270; 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=Hbo91nyVbwyM+t/LAaDSJowYtmguKHITYkCrHY2Dpus=; b=TESe8Q9Ot6lw6VnyrJ+bEvNcJ0HCPLNFsNqXs7PaBWcj+sNwY4j31SBNpIqYSvJ9HRvObL dP+NUqh1vBD+WV/CP2CVqt7+5gIuhQAnOxoriD8Y2uYyMHwGBHjQKsIYG0TSDdp1d63RCo WoSelnfAlKMJbHYHSuyxlUAi5vQ5IJDShKOk/heR90gMgtKqHdApMjw5o414VXZTTe1m5X OvigynnHP1tvreYNsVx7M2+j//3DLi6HOLt6P/UkM1iFpkiizrJ2WUWsNrikGIV8715Zr6 5hX3CbhUOu+4XjjB7ITeiIwyJ/1HQJJuLh49qHqdGEsBxEZTYzzvNgCZQVQAkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675008270; 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=Hbo91nyVbwyM+t/LAaDSJowYtmguKHITYkCrHY2Dpus=; b=tZ+XNmhZrDj3mmI/mB94irR+tiDPYe3Hw+1T4G1JPW1UL09iz2XDZi3As93JdO5BjFdAgv kC+DBH7hKo2DCBBqTEjY2wBqBYfZV3KF3Yl+elL+30ja6K2iYMTWnn5ANU1EMvYXPxRi4R +R1VBcaf6hY7DJY5ppQFZ/oov/2M/vLwZDBGb0meHNflsoDQdCGj6jclA0fc54VBIdFK/i lbR0AI1SZWpc41Qs0Qj/lXub6I4V8aa1nf2SmhTgUrRh4DN+frFVBDUH8OYcGCx+1RM0BD ekveV2eNcjRd3hkEPoZVFoqNlaviOlHqP40XgqNLd4EAA48TGZFnlJJHqIUIfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675008270; a=rsa-sha256; cv=none; b=a7wMBzzLdJqfDHMoiEL534VGJACgdhHMC4uABN/GZyvhfmr6scTOwfVFjfAyILf9amBKOS OjWB+/DQhRrSrb78+OS45GZYn13SwZEaRURtnJEojLWhjPYC48zLPwevdiJgO5KKSjX1Sn lYRgBLC7XzGHEe9Ia/Tm/QCmNI5HE76YsMhWix+SBdA6Hhrp6L69f6+2JyK5Yvfe4vYzDK SBTSnh3G+eigPb13mWF/SF0OQ3+5pfB8mkIjG5HZ8HYEmLQs31SxViycl5Uu45aTrY3Xm1 kg++uat7kHuvFjUNuufRKmQyu4VboNTZnQtd7txbVLOoYnpKfUGaBQZYvT11/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 4P4bjV1Mz0zZjJ; Sun, 29 Jan 2023 16:04:30 +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 30TG4Ups049752; Sun, 29 Jan 2023 16:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TG4U7n049751; Sun, 29 Jan 2023 16:04:30 GMT (envelope-from git) Date: Sun, 29 Jan 2023 16:04:30 GMT Message-Id: <202301291604.30TG4U7n049751@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: 3ebccb20d564 - main - netlink: allow path weight manipulations for single-path routes. 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: 3ebccb20d56455f4bef1366f942680d1b60828f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3ebccb20d56455f4bef1366f942680d1b60828f6 commit 3ebccb20d56455f4bef1366f942680d1b60828f6 Author: Alexander V. Chernikov AuthorDate: 2023-01-29 15:53:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-29 16:04:10 +0000 netlink: allow path weight manipulations for single-path routes. Add support for the scenario when user adds/deletes paths for a single prefix one-by-one, all with different weights. This change adds a new FreeBSD-specific RTA attribute, NL_RTA_WEIGHT. When dumping non-multipath routes, this attribute is added if the route weight is not RT_DEFAULT_WEIGHT. When adding a new route, this attribute is parsed as a relative path weight. MFC after: 2 weeks --- sys/netlink/route/route.h | 3 ++- sys/netlink/route/rt.c | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 6e1ef6cbf0c6..b4b326b2b06b 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -157,8 +157,9 @@ enum rtattr_type_t { NL_RTA_FLOW = 11, /* not supported */ NL_RTA_CACHEINFO = 12, /* not supported */ NL_RTA_SESSION = 13, /* not supported / deprecated */ + NL_RTA_WEIGHT = 13, /* u32, FreeBSD specific, path weight */ NL_RTA_MP_ALGO = 14, /* not supported / deprecated */ - NL_RTA_RTFLAGS = 14, /* u32, FreeBSD specific, */ + NL_RTA_RTFLAGS = 14, /* u32, FreeBSD specific, path flags (RTF_)*/ NL_RTA_TABLE = 15, /* u32, fibnum */ NL_RTA_MARK = 16, /* not supported */ NL_RTA_MFC_STATS = 17, /* not supported */ diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 5e7f00f28b0b..59b34c53ad4b 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -208,14 +208,15 @@ dump_rc_nhg(struct nl_writer *nw, const struct nhgrp_object *nhg, struct rtmsg * #endif static void -dump_rc_nhop(struct nl_writer *nw, const struct nhop_object *nh, struct rtmsg *rtm) +dump_rc_nhop(struct nl_writer *nw, const struct route_nhop_data *rnd, struct rtmsg *rtm) { #ifdef ROUTE_MPATH - if (NH_IS_NHGRP(nh)) { - dump_rc_nhg(nw, (const struct nhgrp_object *)nh, rtm); + if (NH_IS_NHGRP(rnd->rnd_nhop)) { + dump_rc_nhg(nw, rnd->rnd_nhgrp, rtm); return; } #endif + const struct nhop_object *nh = rnd->rnd_nhop; uint32_t rtflags = nhop_get_rtflags(nh); /* @@ -243,6 +244,9 @@ dump_rc_nhop(struct nl_writer *nw, const struct nhop_object *nh, struct rtmsg *r /* In any case, fill outgoing interface */ nlattr_add_u32(nw, NL_RTA_OIF, nh->nh_ifp->if_index); + + if (rnd->rnd_weight != RT_DEFAULT_WEIGHT) + nlattr_add_u32(nw, NL_RTA_WEIGHT, rnd->rnd_weight); } /* @@ -309,7 +313,7 @@ dump_px(uint32_t fibnum, const struct nlmsghdr *hdr, rtm = nlattr_restore_offset(nw, rtm_off, struct rtmsg); if (plen > 0) rtm->rtm_dst_len = plen; - dump_rc_nhop(nw, rnd->rnd_nhop, rtm); + dump_rc_nhop(nw, rnd, rtm); if (nlmsg_end(nw)) return (0); @@ -438,6 +442,7 @@ struct nl_parsed_route { uint32_t rta_table; uint32_t rta_rtflags; uint32_t rta_nh_id; + uint32_t rta_weight; uint32_t rtax_mtu; uint8_t rtm_family; uint8_t rtm_dst_len; @@ -457,6 +462,7 @@ static const struct nlattr_parser nla_p_rtmsg[] = { { .type = NL_RTA_GATEWAY, .off = _OUT(rta_gw), .cb = nlattr_get_ip }, { .type = NL_RTA_METRICS, .arg = &metrics_parser, .cb = nlattr_get_nested }, { .type = NL_RTA_MULTIPATH, .off = _OUT(rta_multipath), .cb = nlattr_get_multipath }, + { .type = NL_RTA_WEIGHT, .off = _OUT(rta_weight), .cb = nlattr_get_uint32 }, { .type = NL_RTA_RTFLAGS, .off = _OUT(rta_rtflags), .cb = nlattr_get_uint32 }, { .type = NL_RTA_TABLE, .off = _OUT(rta_table), .cb = nlattr_get_uint32 }, { .type = NL_RTA_VIA, .off = _OUT(rta_gw), .cb = nlattr_get_ipvia }, @@ -849,8 +855,9 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, } } - int weight = NH_IS_NHGRP(nh) ? 0 : RT_DEFAULT_WEIGHT; - struct route_nhop_data rnd = { .rnd_nhop = nh, .rnd_weight = weight }; + if (!NH_IS_NHGRP(nh) && attrs.rta_weight == 0) + attrs.rta_weight = RT_DEFAULT_WEIGHT; + struct route_nhop_data rnd = { .rnd_nhop = nh, .rnd_weight = attrs.rta_weight }; int op_flags = get_op_flags(hdr->nlmsg_flags); error = rib_add_route_px(attrs.rta_table, attrs.rta_dst, attrs.rtm_dst_len,