From nobody Mon Mar 28 09:16:01 2022 X-Original-To: dev-commits-src-branches@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 5FBA91A410D8; Mon, 28 Mar 2022 09:16:02 +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 4KRn9t0T0mz4sVq; Mon, 28 Mar 2022 09:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458962; 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=SLU+bvTlpehcbYQdHfsfxtau+OBHYUQYQM9zI1HpC/c=; b=oLw9b9ZjDsVh8B4RsPiadnpkLA7SKJIGBmasFu5G3SlAREMDfHHg1fyoARQGFkfdPtFO/p 2C+TQif572v71CGD5jp8hHZ6hgW01lpdlWhaTEbHbT1z2Rhs8h7PaDwTASrvmGUZe2WprQ GnbO0P+u7dECNJPvx/gPztwYPHwjOV+gltVdy5eZSDK2r7BHEMelbgmA/w/sexeqfbd91K mFSwWteMl5ln0co5I/VgWVjgbZi998Drm9s8sPz6BzewDZs4ZWUNBG9NyjBiRduzXpUIvD /C/Qyvt2wpjkGn+IAKVAAO9wLvN7mHU/A/x59F4Tt3jDxIMeukjYw9qgRnp7JA== 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 C55A026DB7; Mon, 28 Mar 2022 09:16:01 +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 22S9G1Rl087687; Mon, 28 Mar 2022 09:16:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S9G1bl087686; Mon, 28 Mar 2022 09:16:01 GMT (envelope-from git) Date: Mon, 28 Mar 2022 09:16:01 GMT Message-Id: <202203280916.22S9G1bl087686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: ffcca53561ed - stable/13 - [lltable] Add per-family lltable getters. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ffcca53561ed0b3d4755dbd2ce1d9942ea4a468e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458962; 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=SLU+bvTlpehcbYQdHfsfxtau+OBHYUQYQM9zI1HpC/c=; b=ftqozKmGCwtjiRDAUXl+tQa3VDKBrDNsb8dnVRYmSdbH66kkjUb3e3dvUb1wL6w+jNG9P2 p4v7R8WD875UwbN6zFpaRb/Pi2s+ucs55g60oxH/eH8Di5xkaAQXQ9xSqXK+2pW/aqutsN OI7fzEf+7Q4W2EzZffaayXuWVnsSeeYszK5T9KpiLkbdu9wHHkqPZ6vMhgHO7vhY/GjGcX L8wBcAvejtznoWHxMeC+qZngV7P1EblRL23p18lp//8EVDdGi4MjVoI8BUVk4N1J5jjHFP m8wzixaPhraSZUziggPLevTG53JqelLBJngPCwfTJ5Dk9BHv1gbrQgdxyqD+yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648458962; a=rsa-sha256; cv=none; b=S5xp2/QHuFKVXURku0doGmEHQeWOgjvotO39rHhPvjhq6XK6pPAtA+o4SnGGEUUWtSVMat 7+1JyjRE7Sda7SS4frDJ8JbeAiAZEQJBq0jREKmL75PJ3DNpn7+fljUr6nnUwEM/UMHT0S zUikHx6jUuy76e6UbdDb2VefDv72CP3mDNPUmwh1iG7t1fJA9LPEdGXeOqQEanSLTYByFo I2+frxbFjp1SiImDv1Okq52wws/GzNQHV/g2aealdhlHkEDWLVyy+4432CS9IxiKpitm0M 5HDe98XsErzuKvEY5lb44Z4NO8FM+kIfwtYGW9e1YrU3yC+YIX/3H5kKzi4naw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=ffcca53561ed0b3d4755dbd2ce1d9942ea4a468e commit ffcca53561ed0b3d4755dbd2ce1d9942ea4a468e Author: Alexander V. Chernikov AuthorDate: 2021-12-26 12:39:26 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-03-28 08:47:38 +0000 [lltable] Add per-family lltable getters. Introduce a new function, lltable_get(), to retrieve lltable pointer for the specified interface and family. Use it to avoid all-iftable list traversal when adding or deleting ARP/ND records. Differential Revision: https://reviews.freebsd.org/D33660 MFC after: 2 weeks (cherry picked from commit ff3a85d32411cdd7894f932b1d3d7ce01ec7a648) --- sys/net/if_llatbl.c | 26 ++++++++++++++++++-------- sys/net/if_llatbl.h | 4 ++++ sys/netinet/in.c | 11 +++++++++++ sys/netinet6/in6.c | 11 +++++++++++ 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index e4dfc45705a8..10d555b1bd86 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -712,6 +712,22 @@ lltable_unlink(struct lltable *llt) } +/* + * Gets interface @ifp lltable for the specified @family + */ +struct lltable * +lltable_get(struct ifnet *ifp, int family) +{ + switch (family) { + case AF_INET: + return (in_lltable_get(ifp)); + case AF_INET6: + return (in6_lltable_get(ifp)); + } + + return (NULL); +} + /* * External methods used by lltable consumers */ @@ -823,14 +839,8 @@ lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info) return EINVAL; } - /* XXX linked list may be too expensive */ - LLTABLE_LIST_RLOCK(); - SLIST_FOREACH(llt, &V_lltables, llt_link) { - if (llt->llt_af == dst->sa_family && - llt->llt_ifp == ifp) - break; - } - LLTABLE_LIST_RUNLOCK(); + llt = lltable_get(ifp, dst->sa_family); + if (llt == NULL) return (ESRCH); diff --git a/sys/net/if_llatbl.h b/sys/net/if_llatbl.h index 7ad9d59a1a0e..dfb5e13a9436 100644 --- a/sys/net/if_llatbl.h +++ b/sys/net/if_llatbl.h @@ -222,6 +222,10 @@ void lltable_prefix_free(int, struct sockaddr *, struct sockaddr *, u_int); int lltable_sysctl_dumparp(int, struct sysctl_req *); +struct lltable *in_lltable_get(struct ifnet *ifp); +struct lltable *in6_lltable_get(struct ifnet *ifp); +struct lltable *lltable_get(struct ifnet *ifp, int family); + size_t llentry_free(struct llentry *); /* helper functions */ diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 5448c3b5fccd..2303a8f10aa4 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1695,6 +1695,17 @@ in_lltattach(struct ifnet *ifp) return (llt); } +struct lltable * +in_lltable_get(struct ifnet *ifp) +{ + struct lltable *llt = NULL; + + void *afdata_ptr = ifp->if_afdata[AF_INET]; + if (afdata_ptr != NULL) + llt = ((struct in_ifinfo *)afdata_ptr)->ii_llt; + return (llt); +} + void * in_domifattach(struct ifnet *ifp) { diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index d54aba58edb6..41b05ae2ca53 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2462,6 +2462,17 @@ in6_lltattach(struct ifnet *ifp) return (llt); } +struct lltable * +in6_lltable_get(struct ifnet *ifp) +{ + struct lltable *llt = NULL; + + void *afdata_ptr = ifp->if_afdata[AF_INET6]; + if (afdata_ptr != NULL) + llt = ((struct in6_ifextra *)afdata_ptr)->lltable; + return (llt); +} + void * in6_domifattach(struct ifnet *ifp) {