Date: Tue, 23 Nov 2021 03:59:43 GMT From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fe499a8452cd - main - ifnet: merge if_destroy() and if_free_internal() into one Message-ID: <202111230359.1AN3xhhw073316@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fe499a8452cd9c25a4949c33f4396966872ae589 commit fe499a8452cd9c25a4949c33f4396966872ae589 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2021-11-23 03:53:12 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2021-11-23 03:53:12 +0000 ifnet: merge if_destroy() and if_free_internal() into one New function has more meaningful name if_free_deferred() and has its header comment fixed to reflect reality. NFC --- sys/net/if.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 9f971d958030..3e640ebfa679 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -671,15 +671,16 @@ if_alloc(u_char type) } /* * Do the actual work of freeing a struct ifnet, and layer 2 common - * structure. This call is made when the last reference to an - * interface is released. + * structure. This call is made when the network epoch guarantees + * us that nobody holds a pointer to the interface. */ static void -if_free_internal(struct ifnet *ifp) +if_free_deferred(epoch_context_t ctx) { + struct ifnet *ifp = __containerof(ctx, struct ifnet, if_epoch_ctx); KASSERT((ifp->if_flags & IFF_DYING), - ("if_free_internal: interface not dying")); + ("%s: interface not dying", __func__)); if (if_com_free[ifp->if_alloctype] != NULL) if_com_free[ifp->if_alloctype](ifp->if_l2com, @@ -700,15 +701,6 @@ if_free_internal(struct ifnet *ifp) free(ifp, M_IFNET); } -static void -if_destroy(epoch_context_t ctx) -{ - struct ifnet *ifp; - - ifp = __containerof(ctx, struct ifnet, if_epoch_ctx); - if_free_internal(ifp); -} - /* * Deregister an interface and free the associated storage. */ @@ -727,7 +719,7 @@ if_free(struct ifnet *ifp) IFNET_WUNLOCK(); if (refcount_release(&ifp->if_refcount)) - NET_EPOCH_CALL(if_destroy, &ifp->if_epoch_ctx); + NET_EPOCH_CALL(if_free_deferred, &ifp->if_epoch_ctx); CURVNET_RESTORE(); } @@ -759,7 +751,7 @@ if_rele(struct ifnet *ifp) if (!refcount_release(&ifp->if_refcount)) return; - NET_EPOCH_CALL(if_destroy, &ifp->if_epoch_ctx); + NET_EPOCH_CALL(if_free_deferred, &ifp->if_epoch_ctx); } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111230359.1AN3xhhw073316>