Attachment 197531 Details for Bug 231080 – debug patch

[patch] debug patch

diff (text/plain), 3.25 KB, created by Mark Johnston on 2018-09-26 17:50:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Johnston

Created: 2018-09-26 17:50:17 UTC

Size: 3.25 KB

patch

obsolete

>diff --git a/sys/netinet/in.c b/sys/netinet/in.c
>index 9646f73a2045..03d313d12950 100644
>--- a/sys/netinet/in.c
>+++ b/sys/netinet/in.c
>@@ -1051,30 +1051,30 @@ struct in_llentry {
> 	(((((((k >> 8) ^ k) >> 8) ^ k) >> 8) ^ k) & ((h) - 1))
> 
> /*
>- * Do actual deallocation of @lle.
>+ * Called by the datapath to indicate that
>+ * the entry was used.
>  */
> static void
>-in_lltable_destroy_lle_unlocked(epoch_context_t ctx)
>+in_lltable_mark_used(struct llentry *lle)
> {
>-	struct llentry *lle;
> 
>-	lle = __containerof(ctx, struct llentry, lle_epoch_ctx);
>-	LLE_LOCK_DESTROY(lle);
>-	LLE_REQ_DESTROY(lle);
>-	free(lle, M_LLTABLE);
>+	LLE_REQ_LOCK(lle);
>+	lle->r_skip_req = 0;
>+	LLE_REQ_UNLOCK(lle);
> }
> 
> /*
>- * Called by the datapath to indicate that
>- * the entry was used.
>+ * Do actual deallocation of @lle.
>  */
> static void
>-in_lltable_mark_used(struct llentry *lle)
>+in_lltable_destroy_lle_deferred(epoch_context_t ctx)
> {
>+	struct llentry *lle;
> 
>-	LLE_REQ_LOCK(lle);
>-	lle->r_skip_req = 0;
>-	LLE_REQ_UNLOCK(lle);
>+	lle = __containerof(ctx, struct llentry, lle_epoch_ctx);
>+	LLE_LOCK_DESTROY(lle);
>+	LLE_REQ_DESTROY(lle);
>+	free(lle, M_LLTABLE);
> }
> 
> /*
>@@ -1085,8 +1085,11 @@ static void
> in_lltable_destroy_lle(struct llentry *lle)
> {
> 
>+	if (callout_pending(&lle->lle_timer))
>+		panic("lle %p still pending", lle);
> 	LLE_WUNLOCK(lle);
>-	epoch_call(net_epoch_preempt,  &lle->lle_epoch_ctx, in_lltable_destroy_lle_unlocked);
>+	epoch_call(net_epoch_preempt, &lle->lle_epoch_ctx,
>+	    in_lltable_destroy_lle_deferred);
> }
> 
> static struct llentry *
>@@ -1347,7 +1350,8 @@ in_lltable_alloc(struct lltable *llt, u_int flags, const struct sockaddr *l3addr
> 		linkhdrsize = LLE_MAX_LINKHDR;
> 		if (lltable_calc_llheader(ifp, AF_INET, IF_LLADDR(ifp),
> 		    linkhdr, &linkhdrsize, &lladdr_off) != 0) {
>-			epoch_call(net_epoch_preempt,  &lle->lle_epoch_ctx, in_lltable_destroy_lle_unlocked);
>+			epoch_call(net_epoch_preempt, &lle->lle_epoch_ctx,
>+			    in_lltable_destroy_lle_deferred);
> 			return (NULL);
> 		}
> 		lltable_set_entry_addr(ifp, lle, linkhdr, linkhdrsize,
>diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
>index 82eb08fb505e..6b4e965b7ea3 100644
>--- a/sys/netinet6/in6.c
>+++ b/sys/netinet6/in6.c
>@@ -2045,7 +2045,7 @@ struct in6_llentry {
>  * Do actual deallocation of @lle.
>  */
> static void
>-in6_lltable_destroy_lle_unlocked(epoch_context_t ctx)
>+in6_lltable_destroy_lle_deferred(epoch_context_t ctx)
> {
> 	struct llentry *lle;
> 
>@@ -2063,8 +2063,11 @@ static void
> in6_lltable_destroy_lle(struct llentry *lle)
> {
> 
>+	if (callout_pending(&lle->lle_timer))
>+		panic("lle %p still pending", lle);
> 	LLE_WUNLOCK(lle);
>-	epoch_call(net_epoch_preempt,  &lle->lle_epoch_ctx, in6_lltable_destroy_lle_unlocked);
>+	epoch_call(net_epoch_preempt, &lle->lle_epoch_ctx,
>+	    in6_lltable_destroy_lle_deferred);
> }
> 
> static struct llentry *
>@@ -2287,7 +2290,8 @@ in6_lltable_alloc(struct lltable *llt, u_int flags,
> 		linkhdrsize = LLE_MAX_LINKHDR;
> 		if (lltable_calc_llheader(ifp, AF_INET6, IF_LLADDR(ifp),
> 		    linkhdr, &linkhdrsize, &lladdr_off) != 0) {
>-			epoch_call(net_epoch_preempt,  &lle->lle_epoch_ctx, in6_lltable_destroy_lle_unlocked);
>+			epoch_call(net_epoch_preempt,  &lle->lle_epoch_ctx,
>+			    in6_lltable_destroy_lle_deferred);
> 			return (NULL);
> 		}
> 		lltable_set_entry_addr(ifp, lle, linkhdr, linkhdrsize,

Actions: View | Diff

Attachments on bug 231080: 196771 | 196916 | 196917 | 197531