Date: Thu, 30 Nov 2006 01:18:56 +0200 From: Iasen Kostoff <tbyte@otel.net> To: freebsd-hackers@freebsd.org Subject: Driver not unset properly after kldunload Message-ID: <1164842336.1066.6.camel@WarHeaD.OTEL.net>
next in thread | raw e-mail | index | archive | help
--=-PAH/twysuwDrzpoEvaGo Content-Type: text/plain Content-Transfer-Encoding: 7bit Hi, It seems that after I load and then unload a driver its name stays linked to the device e.g: nfe0@pci0:10:0: class=0x068000 card=0x81411043 chip=0x005710de rev=0xa3 hdr=0x00 but of course if_nfe is neither compiled in kernel nor is loaded as module anymore. I digged around in kernel and saw this in device_detach(): if (!(dev->flags & DF_FIXEDCLASS)) devclass_delete_device(dev->devclass, dev); dev->state = DS_NOTPRESENT; device_set_driver(dev, NULL); device_set_desc(dev, NULL); device_sysctl_fini(dev); I've put some device_printf()s around and then looked at devclass_delete_device(). It destroys (frees) a lot of the info about the device and so the device_printf() prints device name as "unknown" (NULL). That seems to be a problem for at least device_set_driver(dev, NULL) - it doesn't unset the driver. I'm not so sure about the other 2 but I guess it's same there. So when I changed the order of this funcs everything worked fine (at least it looks like it worked fine :) I'm not absolutely sure that this won't broke something else). I've attached a patch for review. (I've filled a PR http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/104777) --=-PAH/twysuwDrzpoEvaGo Content-Disposition: attachment; filename=subr_bus.c.diff Content-Type: text/x-patch; name=subr_bus.c.diff; charset=us-ascii Content-Transfer-Encoding: 7bit --- subr_bus.c.bak Sun Oct 22 18:42:11 2006 +++ subr_bus.c Mon Oct 23 00:27:22 2006 @@ -2417,13 +2417,14 @@ if (dev->parent) BUS_CHILD_DETACHED(dev->parent, dev); + device_set_driver(dev, NULL); + device_set_desc(dev, NULL); + device_sysctl_fini(dev); + if (!(dev->flags & DF_FIXEDCLASS)) devclass_delete_device(dev->devclass, dev); dev->state = DS_NOTPRESENT; - device_set_driver(dev, NULL); - device_set_desc(dev, NULL); - device_sysctl_fini(dev); return (0); } --=-PAH/twysuwDrzpoEvaGo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1164842336.1066.6.camel>