[src/netbsd-8]: src/sys/netinet Pull up following revision(s) (requested by o...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/77d6d549bb82
branches:  netbsd-8
changeset: 434548:77d6d549bb82
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jan 13 05:45:06 2018 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #488):
        sys/netinet/in.c: revision 1.213
Don't pass rwlock to callout_halt

diffstat:

 sys/netinet/in.c |  26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 85e3dfe999cc -r 77d6d549bb82 sys/netinet/in.c
--- a/sys/netinet/in.c  Sat Jan 13 05:43:44 2018 +0000
+++ b/sys/netinet/in.c  Sat Jan 13 05:45:06 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.203.2.5 2018/01/02 10:56:58 snj Exp $ */
+/*     $NetBSD: in.c,v 1.203.2.6 2018/01/13 05:45:06 snj Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.5 2018/01/02 10:56:58 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.6 2018/01/13 05:45:06 snj Exp $");
 
 #include "arp.h"
 
@@ -1953,6 +1953,7 @@
 {
        struct ifnet *ifp __diagused;
        size_t pkts_dropped;
+       bool locked = false;
 
        LLE_WLOCK_ASSERT(lle);
        KASSERT(llt != NULL);
@@ -1962,15 +1963,32 @@
                ifp = llt->llt_ifp;
                IF_AFDATA_WLOCK_ASSERT(ifp);
                lltable_unlink_entry(llt, lle);
+               locked = true;
        }
 
+       /*
+        * We need to release the lock here to lle_timer proceeds;
+        * lle_timer should stop immediately if LLE_LINKED isn't set.
+        * Note that we cannot pass lle->lle_lock to callout_halt
+        * because it's a rwlock.
+        */
+       LLE_ADDREF(lle);
+       LLE_WUNLOCK(lle);
+       if (locked)
+               IF_AFDATA_WUNLOCK(ifp);
+
        /* cancel timer */
-       if (callout_halt(&lle->lle_timer, &lle->lle_lock))
-               LLE_REMREF(lle);
+       callout_halt(&lle->lle_timer, NULL);
+
+       LLE_WLOCK(lle);
+       LLE_REMREF(lle);
 
        /* Drop hold queue */
        pkts_dropped = llentry_free(lle);
        arp_stat_add(ARP_STAT_DFRDROPPED, (uint64_t)pkts_dropped);
+
+       if (locked)
+               IF_AFDATA_WLOCK(ifp);
 }
 
 static int