Skip to content

Commit

Permalink
module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits
Browse files Browse the repository at this point in the history
At shutdown time, we drain all of the zevents and set the
ZEVENT_SHUTDOWN flag.  On FreeBSD, we may end up calling
zfs_zevent_destroy() after the zevent_lock has been destroyed while
the sysevent thread is winding down; we observe ESHUTDOWN, then back
out.

Events have already been drained, so just inline the kmem_free call in
sysevent_worker() to avoid the race, and document the assumption that
zfs_zevent_destroy doesn't do anything else useful at that point.

This fixes a panic that can occur at module unload time.

Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
  • Loading branch information
kevans91 committed Mar 16, 2022
1 parent 2feba9a commit 4647795
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion module/os/freebsd/spl/spl_sysevent.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,17 @@ sysevent_worker(void *arg __unused)
nvlist_free(event);
}
}
zfs_zevent_destroy(ze);

/*
* We avoid zfs_zevent_destroy() here because we're otherwise racing
* against fm_fini() destroying the zevent_lock. zfs_zevent_destroy()
* will currently only clear `ze->ze_zevent` from an event list then
* free `ze`, so just inline the free() here -- events have already
* been drained.
*/
VERIFY3P(ze->ze_zevent, ==, NULL);
kmem_free(ze, sizeof (zfs_zevent_t));

kthread_exit();
}

Expand Down

0 comments on commit 4647795

Please sign in to comment.