From owner-svn-src-head@FreeBSD.ORG Fri Jul 12 18:25:17 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 653D214B; Fri, 12 Jul 2013 18:25:17 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wi0-x235.google.com (mail-wi0-x235.google.com [IPv6:2a00:1450:400c:c05::235]) by mx1.freebsd.org (Postfix) with ESMTP id 7DC44174B; Fri, 12 Jul 2013 18:25:16 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id hq4so993927wib.8 for ; Fri, 12 Jul 2013 11:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=se+VAbCuomFiF4vr4nOfgqOJvYsSnY/gFkXejOtyAmQ=; b=mSiYaKsGEzi9kGRx8ncBG06lMvh0kqcz8Vf6ILZPz6xwWmSAKgpJjJ/zDlfUm0DxRP /tlu9CacfTszjnTZ+P9Byyv7pgWmuOTzNO5ssZadVYGJlCT8tRXFAZXnIcs6cGscDK7Z iPNq+b9LWn01klN7LHHBJOUF69/JsbR6IVSlgLnBeaQHR9j+yorWMYEJq++LQK+Wy04V oTfhkE/yjBu+jplI0xyeEj2Ei2Cyu9zA5BI7YmaQmuP02zmaSHgI1szHUwooO7rCXGX/ e/12lRyK22ZxNV2uBdYh+iBJZqT3oUkozQy4to2ZFnkTFzuTn2bcWzF5LZGNjeOoS4mG Bs+Q== MIME-Version: 1.0 X-Received: by 10.180.160.165 with SMTP id xl5mr2347061wib.46.1373653515475; Fri, 12 Jul 2013 11:25:15 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.217.94.132 with HTTP; Fri, 12 Jul 2013 11:25:15 -0700 (PDT) In-Reply-To: References: <201307120803.r6C83ACp016523@svn.freebsd.org> Date: Fri, 12 Jul 2013 11:25:15 -0700 X-Google-Sender-Auth: nrSr7tk6SwxkEx56byD8yi4FDqQ Message-ID: Subject: Re: svn commit: r253255 - head/sys/netgraph/bluetooth/drivers/ubt From: Adrian Chadd To: Craig Rodrigues Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jul 2013 18:25:17 -0000 .. oh, and this particular patch is for destroying netgraph nodes, not just upon attach. -adrian On 12 July 2013 11:24, Adrian Chadd wrote: > Hm, I just found a patch in my local collection which works for all > netgraph nodes. > > Maybe we should do that instead of this? > > http://people.freebsd.org/~adrian/ath/20130712-netgraph-vimage.diff > > That should solve it for all dynamic netgraph stuff, rather than just bluetooth. > > > > -adrian > > On 12 July 2013 01:03, Craig Rodrigues wrote: >> Author: rodrigc >> Date: Fri Jul 12 08:03:10 2013 >> New Revision: 253255 >> URL: http://svnweb.freebsd.org/changeset/base/253255 >> >> Log: >> PR: kern/168520 >> Submitted by: "YAMAMOTO, Shigeru" >> Reviewed by: adrian >> >> In PC-BSD 9.1, VIMAGE is enabled in the kernel config. >> For laptops with Bluetooth capability, such as the HP Elitebook 8460p, >> the kernel will panic upon bootup, because curthread->td_vnet >> is not initialized. >> >> Properly initialize curthread->td_vnet when initializing the Bluetooth stack. >> >> This allows laptops such as the HP Elitebook 8460p laptop >> to properly boot with VIMAGE kernels. >> >> Modified: >> head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c >> >> Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c >> ============================================================================== >> --- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Fri Jul 12 07:43:56 2013 (r253254) >> +++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Fri Jul 12 08:03:10 2013 (r253255) >> @@ -109,7 +109,9 @@ >> #include >> #include >> #include >> +#include >> #include >> +#include >> >> #include "usbdevs.h" >> #include >> @@ -123,6 +125,7 @@ >> #include >> #include >> >> +#include >> #include >> #include >> #include >> @@ -487,13 +490,14 @@ ubt_attach(device_t dev) >> >> sc->sc_dev = dev; >> sc->sc_debug = NG_UBT_WARN_LEVEL; >> - >> + CURVNET_SET(TD_TO_VNET(curthread)); >> /* >> * Create Netgraph node >> */ >> >> if (ng_make_node_common(&typestruct, &sc->sc_node) != 0) { >> UBT_ALERT(sc, "could not create Netgraph node\n"); >> + CURVNET_RESTORE(); >> return (ENXIO); >> } >> >> @@ -501,10 +505,12 @@ ubt_attach(device_t dev) >> if (ng_name_node(sc->sc_node, device_get_nameunit(dev)) != 0) { >> UBT_ALERT(sc, "could not name Netgraph node\n"); >> NG_NODE_UNREF(sc->sc_node); >> + CURVNET_RESTORE(); >> return (ENXIO); >> } >> NG_NODE_SET_PRIVATE(sc->sc_node, sc); >> NG_NODE_FORCE_WRITER(sc->sc_node); >> + CURVNET_RESTORE(); >> >> /* >> * Initialize device softc structure >> @@ -631,8 +637,10 @@ ubt_detach(device_t dev) >> /* Destroy Netgraph node */ >> if (node != NULL) { >> sc->sc_node = NULL; >> + CURVNET_SET(node->nd_vnet); >> NG_NODE_REALLY_DIE(node); >> ng_rmnode_self(node); >> + CURVNET_RESTORE(); >> } >> >> /* Make sure ubt_task in gone */