From d36967bd2b32e8a790830e2fa45163729c7e8b00 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 23 Aug 2018 05:06:16 +0000 Subject: [PATCH] Add a new device flag: DF_ATTACHED_ONCE This flag is set once the device has been successfully attached. When set, it inhibits devmatch from trying to match the device. This in turn allows kldunload to work as expected. Prior to the change, the driver would immediately reload because devmatch had no notion that the driver had once been attached, and therefore shouldn't participate in further matching. Differential Revision: https://reviews.freebsd.org/D16735 --- sbin/devmatch/devmatch.c | 2 ++ sys/kern/subr_bus.c | 1 + sys/sys/bus.h | 1 + 3 files changed, 4 insertions(+) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index a53cd5d81f82..9173270520a6 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -422,6 +422,8 @@ find_unmatched(struct devinfo_dev *dev, void *arg) break; if (!(dev->dd_flags & DF_ENABLED)) break; + if (dev->dd_flags & DF_ATTACHED_ONCE) + break; parent = devinfo_handle_to_device(dev->dd_parent); bus = strdup(parent->dd_name); p = bus + strlen(bus) - 1; diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 9d09d341ae1d..72bf63eb295c 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -2950,6 +2950,7 @@ device_attach(device_t dev) dev->state = DS_NOTPRESENT; return (error); } + dev->flags |= DF_ATTACHED_ONCE; attachtime = get_cyclecount() - attachtime; /* * 4 bits per device is a reasonable value for desktop and server diff --git a/sys/sys/bus.h b/sys/sys/bus.h index a96cfc6c8f72..e565002760d7 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -93,6 +93,7 @@ struct u_device { #define DF_REBID 0x80 /* Can rebid after attach */ #define DF_SUSPENDED 0x100 /* Device is suspended. */ #define DF_QUIET_CHILDREN 0x200 /* Default to quiet for all my children */ +#define DF_ATTACHED_ONCE 0x400 /* Has been attached at least once */ #define DF_NEEDNOMATCH 0x800 /* Has a pending NOMATCH event */ /**