From nobody Mon Mar 6 15:08: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 4PVhmH1Xmrz3x0mq; Mon, 6 Mar 2023 15:08:31 +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 4PVhmH0VpWz3n0x; Mon, 6 Mar 2023 15:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678115311; 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=FsmU82nL6KH1a3wkT4FnL3Yv2wKexoh2YQqfl/hiE9w=; b=mI2Zbtqq1jHcrT+JYC1h6nkIc7UuJjpMUj6asdZdjIzhhcC2OKE6Yz2fSkVVOH2a1FMwAz 5Fr8J95JFuGCOBD6DPLpjewc8rv1Ek+5BMnBhQA1TzxEtjLUDuX+sQrLRbnPjJbXcDscO1 Yr0j5kOl/rVUgTJrUWDFGrX06QuNJVLR6gtCNTDvbTscMT4mJwXhL7ueD0ofA7OmhyIMym 7RiDTNULixrEH9t8URPThRyum+SX95VTS/9/FbGeUzHSSbvtIqCG2hSmjdhlMQlGHzqsme GgnfptP0CLVzzMu84UXJNmlRW/Z+CPDd6E99ANLNUnqEEw5J7zw2/DsIloGkrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678115311; 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=FsmU82nL6KH1a3wkT4FnL3Yv2wKexoh2YQqfl/hiE9w=; b=eITY0Idw2kf60OKXGfHwIn8YYdOgHFqkX9ryxkeiR994T/099P9Z+NLdiGaepYc1ITf9M4 tkrJZraAeASfQp8+euiVJpDTdDPkr3M3NqStdc/7FacPzg5Ix8cs0qk0izr7TwqOOCJ9V3 staG6BOBSqQeRlZu6i+5xddcc8u08t6BydL3y0N5Qhha8BqRgvhl8e75B1ZZv0XKbY8QIl Ti9rGz8lvoH12Uqr/L75v8NGmyEO5bCIxpGkC7d54ohlH/BXFa0kDwoc2oRHo3Vh+vl3b5 X+Dt1w9OdEpIddmZs8wkvIeMKTvnOgYbTqnKPT55ZVCCRTLsBeobheRaApL/GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678115311; a=rsa-sha256; cv=none; b=MT7mUd95+KANwbcTyQYSPci/4gPdpiVx+JNrdyom2hfNYyGG5jFKcGtwag6l7Wak5sT8cX KRUqxmsw5x7Rve04o25DcwpEg06wkgdsPRTb3QD4gvDapo52VN5XQBo+BEVAF695qiUeyZ P672mcRmWbpSXf2icRPAnK4fRBFQZBYhTnUXrwcnRX5k9B+mQuw6zzlD7kaVIx20/kV2Kh KyzfFL65VNgMfg0k1+eTLAsSluZ2WGg2HooJuDMcP2fjlKCkOCOQ2UpclmmhHA3gMQxjQA G2H3xyzUpcf7BmbzEPBpAYlRrckkXA0yLVKSeoavGTLM4tgqCapJqYI0wjAPdw== 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 4PVhmG6jzWz165D; Mon, 6 Mar 2023 15:08: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 326F8UBW076674; Mon, 6 Mar 2023 15:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326F8U87076673; Mon, 6 Mar 2023 15:08:30 GMT (envelope-from git) Date: Mon, 6 Mar 2023 15:08:30 GMT Message-Id: <202303061508.326F8U87076673@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: 055776c84a41 - main - netlink: use newly-added if_foreach_sleep() to iterate over the interface list. 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: 055776c84a41bb88c6ccd67615ea172864f6804c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=055776c84a41bb88c6ccd67615ea172864f6804c commit 055776c84a41bb88c6ccd67615ea172864f6804c Author: Alexander V. Chernikov AuthorDate: 2023-03-04 15:15:56 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-06 15:08:08 +0000 netlink: use newly-added if_foreach_sleep() to iterate over the interface list. Summary: MFC after: 2 weeks Subscribers: imp, glebius Differential Revision: https://reviews.freebsd.org/D38907 --- sys/netlink/route/iface.c | 56 ++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 116acd863ba9..6704acd1624f 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -360,8 +360,10 @@ static const struct nlattr_parser nla_p_if[] = { NL_DECLARE_STRICT_PARSER(ifmsg_parser, struct ifinfomsg, check_ifmsg, nlf_p_if, nla_p_if); static bool -match_iface(struct nl_parsed_link *attrs, struct ifnet *ifp) +match_iface(struct ifnet *ifp, void *_arg) { + struct nl_parsed_link *attrs = (struct nl_parsed_link *)_arg; + if (attrs->ifi_index != 0 && attrs->ifi_index != ifp->if_index) return (false); if (attrs->ifi_type != 0 && attrs->ifi_index != ifp->if_type) @@ -373,6 +375,15 @@ match_iface(struct nl_parsed_link *attrs, struct ifnet *ifp) return (true); } +static int +dump_cb(struct ifnet *ifp, void *_arg) +{ + struct netlink_walkargs *wa = (struct netlink_walkargs *)_arg; + if (!dump_iface(wa->nw, ifp, &wa->hdr, 0)) + return (ENOMEM); + return (0); +} + /* * {nlmsg_len=52, nlmsg_type=RTM_GETLINK, nlmsg_flags=NLM_F_REQUEST, nlmsg_seq=1662842818, nlmsg_pid=0}, * {ifi_family=AF_PACKET, ifi_type=ARPHRD_NETROM, ifi_index=0, ifi_flags=0, ifi_change=0}, @@ -417,7 +428,7 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n } if (ifp != NULL) { - if (match_iface(&attrs, ifp)) { + if (match_iface(ifp, &attrs)) { if (!dump_iface(wa.nw, ifp, &wa.hdr, 0)) error = ENOMEM; } else @@ -438,46 +449,7 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n */ NL_LOG(LOG_DEBUG2, "Start dump"); - - struct ifnet **match_array = NULL; - int offset = 0, base_count = 0; - - NLP_LOG(LOG_DEBUG3, nlp, "MATCHING: index=%u type=%d name=%s", - attrs.ifi_index, attrs.ifi_type, attrs.ifla_ifname); - NET_EPOCH_ENTER(et); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - wa.count++; - if (match_iface(&attrs, ifp)) { - if (offset >= base_count) { - /* Too many matches, need to reallocate */ - struct ifnet **new_array; - /* Start with 128 bytes, do 2x increase on each realloc */ - base_count = (base_count != 0) ? base_count * 2 : 16; - new_array = malloc(base_count * sizeof(void *), M_TEMP, M_NOWAIT); - if (new_array == NULL) { - error = ENOMEM; - break; - } - memcpy(new_array, match_array, offset * sizeof(void *)); - free(match_array, M_TEMP); - match_array = new_array; - } - - if (if_try_ref(ifp)) - match_array[offset++] = ifp; - } - } - NET_EPOCH_EXIT(et); - - NL_LOG(LOG_DEBUG2, "Matched %d interface(s), dumping", offset); - for (int i = 0; error == 0 && i < offset; i++) { - if (!dump_iface(wa.nw, match_array[i], &wa.hdr, 0)) - error = ENOMEM; - } - for (int i = 0; i < offset; i++) - if_rele(match_array[i]); - free(match_array, M_TEMP); - + if_foreach_sleep(match_iface, &attrs, dump_cb, &wa); NL_LOG(LOG_DEBUG2, "End dump, iterated %d dumped %d", wa.count, wa.dumped); if (!nlmsg_end_dump(wa.nw, error, &wa.hdr)) {