Page MenuHomeFreeBSD
Files F142172230

D54728.diff
No OneTemporary
Actions

D54728.diff
View Options

diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -899,6 +899,19 @@
_in6_ifdetach(ifp, 1);
}
+static void
+in6_ifextra_free(epoch_context_t ctx)
+{
+ struct in6_ifextra *ext =
+ __containerof(ctx, struct in6_ifextra, epoch_ctx);
+
+ COUNTER_ARRAY_FREE(ext->in6_ifstat,
+ sizeof(struct in6_ifstat) / sizeof(uint64_t));
+ COUNTER_ARRAY_FREE(ext->icmp6_ifstat,
+ sizeof(struct icmp6_ifstat) / sizeof(uint64_t));
+ free(ext, M_IFADDR);
+}
+
static void
in6_ifdeparture(void *arg __unused, struct ifnet *ifp)
{
@@ -916,14 +929,16 @@
if (!VNET_IS_SHUTTING_DOWN(ifp->if_vnet))
#endif
_in6_ifdetach(ifp, 1);
+ /*
+ * XXXGL: mld and nd bits are left in a consistent state after
+ * destructors, but I'm not sure if it safe to call lltable_free() here.
+ * Individual lle entries are epoch(9) protected, but the table itself
+ * isn't.
+ */
mld_domifdetach(ifp);
nd6_ifdetach(ifp);
lltable_free(ext->lltable);
- COUNTER_ARRAY_FREE(ext->in6_ifstat,
- sizeof(struct in6_ifstat) / sizeof(uint64_t));
- COUNTER_ARRAY_FREE(ext->icmp6_ifstat,
- sizeof(struct icmp6_ifstat) / sizeof(uint64_t));
- free(ext, M_IFADDR);
+ NET_EPOCH_CALL(in6_ifextra_free, &ext->epoch_ctx);
}
EVENTHANDLER_DEFINE(ifnet_departure_event, in6_ifdeparture, NULL,
EVENTHANDLER_PRI_ANY);
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -531,6 +531,8 @@
} scope6_id;
struct lltable *lltable;
+
+ struct epoch_context epoch_ctx;
};
#define LLTABLE6(ifp) ((ifp)->if_inet6->lltable)

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 6:56 PM (9 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27697782
Default Alt Text
D54728.diff (1 KB)

Event Timeline