From nobody Mon May 30 10:54:03 2022 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 F0F4C1B65BEB; Mon, 30 May 2022 10:54:03 +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 4LBXMv6G2Pz4plP; Mon, 30 May 2022 10:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653908043; 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=4Vt4KM541hs1qKOBafvStrz4aYF2bfcuJpCQMvFubGI=; b=nN6/gCKfhj16g6AeGsWwegClV/+O8rsw/QU/EccdDduOljASpQ3CjhGeNvweWBmUuFs9+Y Rw1pslXF7O688rvwfi4O7ALbblO76/PxCUvQmykCKJjvybPptbHbir6UJgFOmT0Tkk148k KdQWm+zq+Mlkd24/wOsQCYFM8xJp/zoCptnYxEwbvWMJvxjJhsHPmpGeKUhl63v6YPBz9F 1kpGIFIJzcLRi7uGHWM6VPNkJeVbUvMG6dA3sLPRHr08+MrXTDnmTFRKA0GzAB1kKGYFsc 9zGs+TtFhubEPmNLCOWJZVyFOtiexXFyOfzFPMTaezfW+QYtHFV9z5oWQ7TY2w== 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 ABCC615F0B; Mon, 30 May 2022 10:54:03 +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 24UAs3lo066898; Mon, 30 May 2022 10:54:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UAs3Ln066897; Mon, 30 May 2022 10:54:03 GMT (envelope-from git) Date: Mon, 30 May 2022 10:54:03 GMT Message-Id: <202205301054.24UAs3Ln066897@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: 77001f9b6dac - main - lltable: introduce the llt_post_resolved callback 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: 77001f9b6dac3b8f898941287726e5a668bb5897 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653908043; 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=4Vt4KM541hs1qKOBafvStrz4aYF2bfcuJpCQMvFubGI=; b=rCAW5tzVpTTGqt6WTTNGjLADZV2b4XA1hKZ9684iYPE4oofHx5A2l+kYZuihBur0fH68rT 7JgnBrQmDD47R/WWpTyTDlf6lAIy0NrAJGssJCSEmT5gMtgsFdaPLTtZRzNnYpAwj7Dzup QmislkubM7lDG02+NiY7BJfSZijLdupeJz7msmkmhG6RaEuNH4/BMX0+imNcKxCMAYsAN3 WQHv4bMbMjGKEcEDMiGffsvMm9H0XYpu1Veb+bp+nxm9Mn20yTjLfZESZwnvEHVquECHiV GtyaI4UOFGjy7vw1AslwvMTIEgfepphOFzy9TX+VTI/3gD5l9k21Vno1arn4wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653908043; a=rsa-sha256; cv=none; b=ppfqxeWsMJOPXjGWWGyXYB7ZSRAb//+dupvSeGU3bFk3qjfc6cLgxdULiG5P3ks3YbK1xx lREPSTH4IDsLCdJ5By5qIJPJBZz3cr9rBCOGM9297mAjOA6zMR8fDmzSQT2umaFiT82SWK ToET0aTvfmLGc2iy3ryUMuozozMP6rN4IQzyMTVbIDXoDBvzsEE0PzR7uaul0J6IREEO5H g+aqFEJQj+CBrXCyiuFbpngjGYZ1MfTEP9+o0SeMPuwwE9yxAQceiovT6TEatOV7WMDc5H u+sw+C4QYnJwzpEKJTvidfw18drvbjRVyp7Cyo94gskBAwWo+B2UsuTxAPEHqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=77001f9b6dac3b8f898941287726e5a668bb5897 commit 77001f9b6dac3b8f898941287726e5a668bb5897 Author: KUROSAWA Takahiro AuthorDate: 2022-05-30 07:38:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-05-30 10:53:33 +0000 lltable: introduce the llt_post_resolved callback In order to decrease ifdef INET/INET6s in the lltable implementation, introduce the llt_post_resolved callback and implement protocol-dependent code in the protocol-dependent part. Reviewed By: melifaro Differential Revision: https://reviews.freebsd.org/D35322 MFC after: 2 weeks --- sys/net/if_llatbl.c | 10 +--------- sys/net/if_llatbl.h | 2 ++ sys/netinet/in.c | 12 ++++++++++++ sys/netinet6/in6.c | 7 +++++++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index d2fb58974d3f..1e7229ba95ca 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -970,15 +970,7 @@ lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info) */ EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_RESOLVED); LLE_WUNLOCK(lle); -#ifdef INET - /* gratuitous ARP */ - if ((laflags & LLE_PUB) && dst->sa_family == AF_INET) - arprequest(ifp, - &((struct sockaddr_in *)dst)->sin_addr, - &((struct sockaddr_in *)dst)->sin_addr, - (u_char *)LLADDR(dl)); -#endif - + llt->llt_post_resolved(llt, lle); break; case RTM_DELETE: diff --git a/sys/net/if_llatbl.h b/sys/net/if_llatbl.h index 059e918d4fea..a290fb2349aa 100644 --- a/sys/net/if_llatbl.h +++ b/sys/net/if_llatbl.h @@ -160,6 +160,7 @@ typedef void (llt_free_tbl_t)(struct lltable *); typedef int (llt_link_entry_t)(struct lltable *, struct llentry *); typedef int (llt_unlink_entry_t)(struct llentry *); typedef void (llt_mark_used_t)(struct llentry *); +typedef void (llt_post_resolved_t)(struct lltable *, struct llentry *); typedef int (llt_foreach_cb_t)(struct lltable *, struct llentry *, void *); typedef int (llt_foreach_entry_t)(struct lltable *, llt_foreach_cb_t *, void *); @@ -188,6 +189,7 @@ struct lltable { llt_fill_sa_entry_t *llt_fill_sa_entry; llt_free_tbl_t *llt_free_tbl; llt_mark_used_t *llt_mark_used; + llt_post_resolved_t *llt_post_resolved; }; MALLOC_DECLARE(M_LLTABLE); diff --git a/sys/netinet/in.c b/sys/netinet/in.c index e427b9e92db3..9e4b677cf7e1 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1681,6 +1681,17 @@ in_lltable_dump_entry(struct lltable *llt, struct llentry *lle, return (error); } +static void +in_lltable_post_resolved(struct lltable *llt, struct llentry *lle) +{ + struct ifnet *ifp = llt->llt_ifp; + + /* gratuitous ARP */ + if ((lle->la_flags & LLE_PUB) != 0) + arprequest(ifp, &lle->r_l3addr.addr4, &lle->r_l3addr.addr4, + lle->ll_addr); +} + static struct lltable * in_lltattach(struct ifnet *ifp) { @@ -1699,6 +1710,7 @@ in_lltattach(struct ifnet *ifp) llt->llt_free_entry = in_lltable_free_entry; llt->llt_match_prefix = in_lltable_match_prefix; llt->llt_mark_used = llentry_mark_used; + llt->llt_post_resolved = in_lltable_post_resolved; lltable_link(llt); return (llt); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index ba22dbb65e31..a39f7734e0ba 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2460,6 +2460,12 @@ in6_lltable_dump_entry(struct lltable *llt, struct llentry *lle, return (error); } +static void +in6_lltable_post_resolved(struct lltable *llt, struct llentry *lle) +{ + /* Handle proxy NDP entries (not yet). */ +} + static struct lltable * in6_lltattach(struct ifnet *ifp) { @@ -2478,6 +2484,7 @@ in6_lltattach(struct ifnet *ifp) llt->llt_free_entry = in6_lltable_free_entry; llt->llt_match_prefix = in6_lltable_match_prefix; llt->llt_mark_used = llentry_mark_used; + llt->llt_post_resolved = in6_lltable_post_resolved; lltable_link(llt); return (llt);