From nobody Wed May 10 09:57:52 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 4QGVnr3VL4z49fZF; Wed, 10 May 2023 09:57:52 +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 4QGVnr2zHzz4WPC; Wed, 10 May 2023 09:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712672; 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=K1Bs/FClPTRwHnnUMh2UPhB7iqgvw58kWF+2fOtXulg=; b=x+qVlYjfn4qkLNL/jmCI1O9jvzwDUcpUufxNF5DpiphCVuzl4/I0mIt5F11EH5dsQGL4ne nzJTDaizHygzIvOAaibyaztRyQ2Z0lZgqcDe7iSPSZgKo9sgdLx0+9cDGU1m+TXixMqk78 bZQC5tg/PRaFacgP2msGkLcFj4XQBFpsQpqvu6kX27LLok8XLFI+DcOrh6pYlnYuoZCpg5 /igYr6aA/XFQ2fTE2aSPbQOF73vLrCoZjqob4xOQ1VIZopSriKn8Wo3Qmn4O9dAqX6vH9/ iaqCPxo5j2IYf7rCLLZUe85VmkKDawjFa15N4ICKYxDOGaT+RZ5YuTac/ozqAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712672; 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=K1Bs/FClPTRwHnnUMh2UPhB7iqgvw58kWF+2fOtXulg=; b=Qe7vSMUidqPrt0AOhK/lxVFKG5mPC/EtiYAhewWb7HS1J0nZn03vPZ6mCWjai5zxepOIOM 5NDQAUsEDX6SgvopIE0zVA8vLe7UGRu35Y4HMDCHbDmxDhDvA2DrehhAJAQ1VPLSM771tu esxrz20cX+GOM2K4r3uSA5UgL7Nei8xc3+dSH1bc6OAxF3Ci/Uwme6eNk19A+251gxtQF/ 1LfjUTEL8wPKxqiM9CTW+dTcr35Fv9PQWlxBOllhg+MuGFnrHr3uSqmXLh7WuLia2JDBgv nEwg7tSRqe2rSz08QW5SkDhnV68Bi4AJiiMyJnggP2HF0FtrTMF/04/7ajNM3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683712672; a=rsa-sha256; cv=none; b=ynkTE+/b1zjk9TrFzW8U9YVtNDux/PevDSrNgn4MYQLqa9YMbkhPQg8+xMfa5ts1a39I5Y 2kGSE7XKRAR+CNAw02sEAroFqHqTbosCtoWStBVFNOpKRnyDCTosLdOj6OJsv31wE6g2Ep 9XYhMnXHanRUCTIGnX9kBkhyHer5v5HwduHDuBdJj3RHH/X8/AeYVJZf4msorrEgWfb6uz xzFK0b2mIiXElZUmyRknqr9HzlElfsOCd702i45/gRsjZMA1oiIrjCs3/VVNN/yhKUNsCS DSmZn+QZLJpuBqBMzTl2ysTkAwWIzfXpLcFNXeIJPvI98tiLq8I2LZywzLOqwg== 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 4QGVnr1twDz14yX; Wed, 10 May 2023 09:57:52 +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 34A9vqBF041764; Wed, 10 May 2023 09:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9vqV8041763; Wed, 10 May 2023 09:57:52 GMT (envelope-from git) Date: Wed, 10 May 2023 09:57:52 GMT Message-Id: <202305100957.34A9vqV8041763@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: 3c851dc19bbd - main - netlink: provide original interface lladdr in the interface dump. 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: 3c851dc19bbde2056a9367cc43e935f9a35925a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3c851dc19bbde2056a9367cc43e935f9a35925a4 commit 3c851dc19bbde2056a9367cc43e935f9a35925a4 Author: Alexander V. Chernikov AuthorDate: 2023-05-10 09:49:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 09:57:01 +0000 netlink: provide original interface lladdr in the interface dump. * Store lladdr in the FreeBSD-specific IFLAF_ORIG_HWADDR attr * Do not export empty IFLA_ADDRESS for interfaces w/o lladdrs. MFC after: 2 weeks --- sys/netlink/netlink_snl_route_parsers.h | 9 ++++++++- sys/netlink/route/iface.c | 25 +++++++++++++++++++++++-- sys/netlink/route/interface.h | 9 +++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index a4877a4d7939..75ba6d461731 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -202,10 +202,16 @@ struct snl_parsed_link { char *ifla_ifalias; uint32_t ifla_promiscuity; struct rtnl_link_stats64 *ifla_stats64; + struct nlattr *iflaf_orig_hwaddr; }; #define _IN(_field) offsetof(struct ifinfomsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_link, _field) +static const struct snl_attr_parser _nla_p_link_fbsd[] = { + { .type = IFLAF_ORIG_HWADDR, .off = _OUT(iflaf_orig_hwaddr), .cb = snl_attr_dup_nla }, +}; +SNL_DECLARE_ATTR_PARSER(_link_fbsd_parser, _nla_p_link_fbsd); + static const struct snl_attr_parser _nla_p_link[] = { { .type = IFLA_ADDRESS, .off = _OUT(ifla_address), .cb = snl_attr_dup_nla }, { .type = IFLA_BROADCAST, .off = _OUT(ifla_broadcast), .cb = snl_attr_dup_nla }, @@ -216,6 +222,7 @@ static const struct snl_attr_parser _nla_p_link[] = { { .type = IFLA_STATS64, .off = _OUT(ifla_stats64), .cb = snl_attr_dup_struct }, { .type = IFLA_PROMISCUITY, .off = _OUT(ifla_promiscuity), .cb = snl_attr_get_uint32 }, { .type = IFLA_CARRIER, .off = _OUT(ifla_carrier), .cb = snl_attr_get_uint8 }, + { .type = IFLA_FREEBSD, .arg = &_link_fbsd_parser, .cb = snl_attr_get_nested }, }; static const struct snl_field_parser _fp_p_link[] = { {.off_in = _IN(ifi_index), .off_out = _OUT(ifi_index), .cb = snl_field_get_uint32 }, @@ -394,7 +401,7 @@ SNL_DECLARE_PARSER_EXT(snl_nhmsg_parser, struct nhmsg, _fp_p_nh, _nla_p_nh, _cb_ static const struct snl_hdr_parser *snl_all_route_parsers[] = { &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser, &snl_rtm_route_parser, - &snl_rtm_link_parser, &snl_rtm_link_parser_simple, + &_link_fbsd_parser, &snl_rtm_link_parser, &snl_rtm_link_parser_simple, &_neigh_fbsd_parser, &snl_rtm_neigh_parser, &_addr_fbsd_parser, &snl_rtm_addr_parser, &_nh_fbsd_parser, &snl_nhmsg_parser, }; diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index edcf8b635f50..aaed11e637a2 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -194,6 +194,17 @@ get_operstate(struct ifnet *ifp, struct if_state *pstate) } } +static void +get_hwaddr(struct nl_writer *nw, struct ifnet *ifp) +{ + struct ifreq ifr = {}; + + if (if_gethwaddr(ifp, &ifr) == 0) { + nlattr_add(nw, IFLAF_ORIG_HWADDR, if_getaddrlen(ifp), + ifr.ifr_addr.sa_data); + } +} + static unsigned ifp_flags_to_netlink(const struct ifnet *ifp) { @@ -281,8 +292,10 @@ dump_iface(struct nl_writer *nw, struct ifnet *ifp, const struct nlmsghdr *hdr, nlattr_add_u8(nw, IFLA_PROTO_DOWN, val); nlattr_add_u8(nw, IFLA_LINKMODE, val); */ - if ((ifp->if_addr != NULL)) { - dump_sa(nw, IFLA_ADDRESS, ifp->if_addr->ifa_addr); + if (if_getaddrlen(ifp) != 0) { + struct ifaddr *ifa = if_getifaddr(ifp); + + dump_sa(nw, IFLA_ADDRESS, ifa->ifa_addr); } if ((ifp->if_broadcastaddr != NULL)) { @@ -300,6 +313,14 @@ dump_iface(struct nl_writer *nw, struct ifnet *ifp, const struct nlmsghdr *hdr, if (ifp->if_description != NULL) nlattr_add_string(nw, IFLA_IFALIAS, ifp->if_description); + /* Store FreeBSD-specific attributes */ + int off = nlattr_add_nested(nw, IFLA_FREEBSD); + if (off != 0) { + get_hwaddr(nw, ifp); + + nlattr_set_len(nw, off); + } + get_stats(nw, ifp); uint32_t val = (ifp->if_flags & IFF_PROMISC) != 0; diff --git a/sys/netlink/route/interface.h b/sys/netlink/route/interface.h index ec0e1e246a07..c78a0be60a21 100644 --- a/sys/netlink/route/interface.h +++ b/sys/netlink/route/interface.h @@ -142,10 +142,19 @@ enum { IFLA_DEVLINK_PORT, IFLA_GSO_IPV4_MAX_SIZE, IFLA_GRO_IPV4_MAX_SIZE, + IFLA_FREEBSD, __IFLA_MAX }; #define IFLA_MAX (__IFLA_MAX - 1) +enum { + IFLAF_UNSPEC = 0, + IFLAF_ORIG_IFNAME = 1, /* string, original interface name at creation */ + IFLAF_ORIG_HWADDR = 2, /* binary, original hardware address */ + __IFLAF_MAX +}; +#define IFLAF_MAX (__IFLAF_MAX - 1) + /* * Attributes that can be used as filters: * IFLA_IFNAME, IFLA_GROUP, IFLA_ALT_IFNAME