From nobody Sun Apr 2 13:50:45 2023 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 4PqFm545kvz43fd3; Sun, 2 Apr 2023 13:50:45 +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 4PqFm53J32z3hVL; Sun, 2 Apr 2023 13:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680443445; 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=BaJoXrQN5e9PEiDU5TxGv0n2rDVqKNu3akch+DFlFo0=; b=H3anQkFB9ZrfGIKMVHkdr08snd3R1vuMatASKDTFxmm9w8lLk/yAHxcEw67oqFhbJd0owC jLXLfaVcb/MTWEpZXln1HchDC9pP2HlsqB2Js95kTapqB2arVrQSmvInGViO6qrJf6oHDi e+GSJ1w7L2Iz9Yc4qe/SSN8peB19nCJ9UePgmen5A6UOiQ0sCU5+6FIjNO4Kc7/CZPG89U CzuoiyRxiqLKLQjWhai6+wZhBYn3v5CH/bD6hCPkL0l1SavFNv+A2Rh6hD2fvlr7pX3ya5 zjjNg9Zby1GBBd/JzwopEH0lKzLfe3mFHkeiEtwIacuf6yKljWTH4wFJ/Tl8Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680443445; 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=BaJoXrQN5e9PEiDU5TxGv0n2rDVqKNu3akch+DFlFo0=; b=RiG6tt72Rxl9Ui/hbBSvZb+nPh7Xr+c/PTlFhep+XytsK30A5zlkfYhhSXUN2KNMAXYk2E NAkfj8rrsF3Q4djb6Ik1ELUv+C8LE8/z0AJoqPbfjlUbVZBOxqhMY4qPn+kJevsgLi5pKr LX9JqzAGPaVP5R7mF1kxHwLnFKVAKn+RBUWqe4IVAiTqj0GRv34x0+7RSp8b2DoV6jGeJh D4JjLEeqUbHW0aKPCaJfNWMkUalmBN6IouvNkd5WZeybBg9YAFPvw78ogCbgKItGJn/h9G HtVOI3nnonz8Jt4sECGnUOtW9l2YjV+0IUX3Ftvw0sbwwzwfcwBQF5L+9cY3nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680443445; a=rsa-sha256; cv=none; b=EqdSX+PCE8vEs33omRqcSTufnBZ2jDorvPUQmYmVUBuvlPWaazt/e8Mq5AsDfN4Ubf4wTY wAYGRl2RlMY6cw8gHUYj2mQakA0sPJeEOM30sdH0I/+oxwm80q57WIPcnS7ojwumUZCobB lrna2kG2zr0x0RAWno81QyEhzRcbZX8haJLBis/K0AdD91HOx3KAgoA8m0zcvz6OozCMmJ vYPo71p9X+tiUoX9m1ixnEbRnFaMjUKyfxrXeNyrt04ddOxxOUqcE5XgZh67oHlk9VzvNK ad35FaaKSn899CCOUMtIrc9OyJ4SXCxfw9SSDsxQ8c18DlaFNzkeicQhWxzF8Q== 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 4PqFm52MjkzJyt; Sun, 2 Apr 2023 13:50:45 +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 332Dojwj012473; Sun, 2 Apr 2023 13:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332Dojpt012472; Sun, 2 Apr 2023 13:50:45 GMT (envelope-from git) Date: Sun, 2 Apr 2023 13:50:45 GMT Message-Id: <202304021350.332Dojpt012472@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: c35a43b261f8 - main - netlink: allow exact-match route lookups via RTM_GETROUTE. 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: c35a43b261f807fd85b8cc30306112eee9dd62ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=c35a43b261f807fd85b8cc30306112eee9dd62ce commit c35a43b261f807fd85b8cc30306112eee9dd62ce Author: Alexander V. Chernikov AuthorDate: 2023-04-02 13:47:10 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 13:47:10 +0000 netlink: allow exact-match route lookups via RTM_GETROUTE. Use already-existing RTM_F_PREFIX rtm_flag to indicate that the request assumes exact-prefix lookup instead of the longest-prefix-match. MFC after: 2 weeks --- sys/net/route/route_ctl.c | 14 ++++++++++++++ sys/net/route/route_ctl.h | 6 ++---- sys/netlink/route/rt.c | 13 ++++++++++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 755765869e84..db3728c3cd88 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -96,6 +96,8 @@ static int delete_route(struct rib_head *rnh, struct rtentry *rt, static int rt_delete_conditional(struct rib_head *rnh, struct rtentry *rt, int prio, rib_filter_f_t *cb, void *cbdata, struct rib_cmd_info *rc); +static bool fill_pxmask_family(int family, int plen, struct sockaddr *_dst, + struct sockaddr **pmask); static int get_prio_from_info(const struct rt_addrinfo *info); static int nhop_get_prio(const struct nhop_object *nh); @@ -391,6 +393,18 @@ lookup_prefix(struct rib_head *rnh, const struct rt_addrinfo *info, return (rt); } +const struct rtentry * +rib_lookup_prefix_plen(struct rib_head *rnh, struct sockaddr *dst, int plen, + struct route_nhop_data *rnd) +{ + union sockaddr_union mask_storage; + struct sockaddr *netmask = &mask_storage.sa; + + if (fill_pxmask_family(dst->sa_family, plen, dst, &netmask)) + return (lookup_prefix_bysa(rnh, dst, netmask, rnd)); + return (NULL); +} + static bool fill_pxmask_family(int family, int plen, struct sockaddr *_dst, struct sockaddr **pmask) diff --git a/sys/net/route/route_ctl.h b/sys/net/route/route_ctl.h index b65b64fcdaa0..7a4ed804feb7 100644 --- a/sys/net/route/route_ctl.h +++ b/sys/net/route/route_ctl.h @@ -123,11 +123,9 @@ struct nhop_object; struct nhgrp_object; struct ucred; -const struct rtentry *rib_lookup_prefix(uint32_t fibnum, int family, - const struct sockaddr *dst, const struct sockaddr *netmask, +const struct rtentry * +rib_lookup_prefix_plen(struct rib_head *rnh, struct sockaddr *dst, int plen, struct route_nhop_data *rnd); -const struct rtentry *rib_lookup_lpm(uint32_t fibnum, int family, - const struct sockaddr *dst, struct route_nhop_data *rnd); /* rtentry accessors */ bool rt_is_host(const struct rtentry *rt); diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 6d76390016dd..288ff111a038 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -461,6 +461,7 @@ struct nl_parsed_route { uint8_t rtm_dst_len; uint8_t rtm_protocol; uint8_t rtm_type; + uint32_t rtm_flags; }; #define _IN(_field) offsetof(struct rtmsg, _field) @@ -488,6 +489,7 @@ static const struct nlfield_parser nlf_p_rtmsg[] = { { .off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_type), .off_out = _OUT(rtm_type), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_flags), .off_out = _OUT(rtm_flags), .cb = nlf_get_u32 }, }; #undef _IN #undef _OUT @@ -581,7 +583,8 @@ handle_rtm_getroute(struct nlpcb *nlp, struct nl_parsed_route *attrs, { RIB_RLOCK_TRACKER; struct rib_head *rnh; - struct rtentry *rt; + const struct rtentry *rt; + struct route_nhop_data rnd; uint32_t fibnum = attrs->rta_table; sa_family_t family = attrs->rtm_family; @@ -596,13 +599,17 @@ handle_rtm_getroute(struct nlpcb *nlp, struct nl_parsed_route *attrs, RIB_RLOCK(rnh); - rt = (struct rtentry *)rnh->rnh_matchaddr(attrs->rta_dst, &rnh->head); + struct sockaddr *dst = attrs->rta_dst; + + if (attrs->rtm_flags & RTM_F_PREFIX) + rt = rib_lookup_prefix_plen(rnh, dst, attrs->rtm_dst_len, &rnd); + else + rt = (const struct rtentry *)rnh->rnh_matchaddr(dst, &rnh->head); if (rt == NULL) { RIB_RUNLOCK(rnh); return (ESRCH); } - struct route_nhop_data rnd; rt_get_rnd(rt, &rnd); rnd.rnd_nhop = nhop_select_func(rnd.rnd_nhop, 0);