mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-08 09:30:41 +00:00
9d5b524597
The timeline of the race condition is the following:
[1] Thread A is about to finish condesing the first vdev in
spa_condense_indirect_thread(), so it calls the
spa_condense_indirect_complete_sync() sync task which sets
the spa_condensing_indirect field to NULL. Waiting for the
sync task to finish, thread A sleeps until the txg is done.
When this happens, thread A will acquire spa_async_lock and
set spa_condense_thread to NULL.
[2] While thread A waits for the txg to finish, thread B which is
running spa_sync() checks whether it should condense the
second vdev in vdev_indirect_should_condense() by checking the
spa_condensing_indirect field which was set to NULL by
spa_condense_indirect_thread() from thread A. So it goes on
and tries to spawn a new condensing thread in
spa_condense_indirect_start_sync() and the aforementioned
assertions fails because thread A has not set spa_condense_thread
to NULL (which is basically the last thing it does before returning).
The main issue here is that we rely on both spa_condensing_indirect
and spa_condense_thread to signify whether a condensing thread is
running. Ideally we would only use one throughout the codebase. In
addition, for managing spa_condense_thread we currently use
spa_async_lock which basically tights condensing to scrubing when
it comes to pausing and resuming those actions during spa export.
This commit introduces the ZTHR infrastructure, which is basically
threads created during spa_load()/spa_create() and exist until we
export or destroy the pool. ZTHRs sleep the majority of the time,
until they are notified to wake up and do some predefined type of work.
In the context of the current bug, a zthr to does the condensing of
indirect mappings replacing the older code that used bare kthreads.
When a pool is created, the condensing zthr is spawned but sleeps
right away, until it is awaken by a signal from spa_sync(). If an
existing pool is loaded, the condensing zthr looks if there is
anything to condense before going to sleep, in case we were condensing
mappings in the pool before it got exported.
The benefits of this solution are the following:
- The current bug is fixed
- spa_condensing_indirect is the sole indicator of whether we are
currently condensing or not
- condensing is more decoupled from the spa_async_thread related
functionality.
As a final note, this commit also sets up the path on upstreaming
other features that use the ZTHR code like zpool checkpoint and
fast clone deletion.
Authored by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Ported-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://illumos.org/issues/9079
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/3dc606ee
Closes #6900
150 lines
5.4 KiB
Makefile
150 lines
5.4 KiB
Makefile
SUBDIRS = fm fs crypto lua sysevent
|
|
|
|
COMMON_H = \
|
|
$(top_srcdir)/include/sys/abd.h \
|
|
$(top_srcdir)/include/sys/arc.h \
|
|
$(top_srcdir)/include/sys/arc_impl.h \
|
|
$(top_srcdir)/include/sys/avl.h \
|
|
$(top_srcdir)/include/sys/avl_impl.h \
|
|
$(top_srcdir)/include/sys/blkptr.h \
|
|
$(top_srcdir)/include/sys/bplist.h \
|
|
$(top_srcdir)/include/sys/bpobj.h \
|
|
$(top_srcdir)/include/sys/bptree.h \
|
|
$(top_srcdir)/include/sys/bqueue.h \
|
|
$(top_srcdir)/include/sys/dbuf.h \
|
|
$(top_srcdir)/include/sys/ddt.h \
|
|
$(top_srcdir)/include/sys/dmu.h \
|
|
$(top_srcdir)/include/sys/dmu_impl.h \
|
|
$(top_srcdir)/include/sys/dmu_objset.h \
|
|
$(top_srcdir)/include/sys/dmu_send.h \
|
|
$(top_srcdir)/include/sys/dmu_traverse.h \
|
|
$(top_srcdir)/include/sys/dmu_tx.h \
|
|
$(top_srcdir)/include/sys/dmu_zfetch.h \
|
|
$(top_srcdir)/include/sys/dnode.h \
|
|
$(top_srcdir)/include/sys/dsl_bookmark.h \
|
|
$(top_srcdir)/include/sys/dsl_dataset.h \
|
|
$(top_srcdir)/include/sys/dsl_deadlist.h \
|
|
$(top_srcdir)/include/sys/dsl_deleg.h \
|
|
$(top_srcdir)/include/sys/dsl_destroy.h \
|
|
$(top_srcdir)/include/sys/dsl_dir.h \
|
|
$(top_srcdir)/include/sys/dsl_crypt.h \
|
|
$(top_srcdir)/include/sys/dsl_pool.h \
|
|
$(top_srcdir)/include/sys/dsl_prop.h \
|
|
$(top_srcdir)/include/sys/dsl_scan.h \
|
|
$(top_srcdir)/include/sys/dsl_synctask.h \
|
|
$(top_srcdir)/include/sys/dsl_userhold.h \
|
|
$(top_srcdir)/include/sys/edonr.h \
|
|
$(top_srcdir)/include/sys/efi_partition.h \
|
|
$(top_srcdir)/include/sys/frame.h \
|
|
$(top_srcdir)/include/sys/hkdf.h \
|
|
$(top_srcdir)/include/sys/metaslab.h \
|
|
$(top_srcdir)/include/sys/metaslab_impl.h \
|
|
$(top_srcdir)/include/sys/mmp.h \
|
|
$(top_srcdir)/include/sys/mntent.h \
|
|
$(top_srcdir)/include/sys/multilist.h \
|
|
$(top_srcdir)/include/sys/nvpair.h \
|
|
$(top_srcdir)/include/sys/nvpair_impl.h \
|
|
$(top_srcdir)/include/sys/pathname.h \
|
|
$(top_srcdir)/include/sys/policy.h \
|
|
$(top_srcdir)/include/sys/range_tree.h \
|
|
$(top_srcdir)/include/sys/refcount.h \
|
|
$(top_srcdir)/include/sys/rrwlock.h \
|
|
$(top_srcdir)/include/sys/sa.h \
|
|
$(top_srcdir)/include/sys/sa_impl.h \
|
|
$(top_srcdir)/include/sys/sdt.h \
|
|
$(top_srcdir)/include/sys/sha2.h \
|
|
$(top_srcdir)/include/sys/skein.h \
|
|
$(top_srcdir)/include/sys/spa_boot.h \
|
|
$(top_srcdir)/include/sys/space_map.h \
|
|
$(top_srcdir)/include/sys/space_reftree.h \
|
|
$(top_srcdir)/include/sys/spa.h \
|
|
$(top_srcdir)/include/sys/spa_impl.h \
|
|
$(top_srcdir)/include/sys/spa_checksum.h \
|
|
$(top_srcdir)/include/sys/sysevent.h \
|
|
$(top_srcdir)/include/sys/trace.h \
|
|
$(top_srcdir)/include/sys/trace_acl.h \
|
|
$(top_srcdir)/include/sys/trace_arc.h \
|
|
$(top_srcdir)/include/sys/trace_common.h \
|
|
$(top_srcdir)/include/sys/trace_dbgmsg.h \
|
|
$(top_srcdir)/include/sys/trace_dbuf.h \
|
|
$(top_srcdir)/include/sys/trace_dmu.h \
|
|
$(top_srcdir)/include/sys/trace_dnode.h \
|
|
$(top_srcdir)/include/sys/trace_multilist.h \
|
|
$(top_srcdir)/include/sys/trace_txg.h \
|
|
$(top_srcdir)/include/sys/trace_vdev.h \
|
|
$(top_srcdir)/include/sys/trace_zil.h \
|
|
$(top_srcdir)/include/sys/trace_zio.h \
|
|
$(top_srcdir)/include/sys/trace_zrlock.h \
|
|
$(top_srcdir)/include/sys/txg.h \
|
|
$(top_srcdir)/include/sys/txg_impl.h \
|
|
$(top_srcdir)/include/sys/u8_textprep_data.h \
|
|
$(top_srcdir)/include/sys/u8_textprep.h \
|
|
$(top_srcdir)/include/sys/uberblock.h \
|
|
$(top_srcdir)/include/sys/uberblock_impl.h \
|
|
$(top_srcdir)/include/sys/uio_impl.h \
|
|
$(top_srcdir)/include/sys/unique.h \
|
|
$(top_srcdir)/include/sys/uuid.h \
|
|
$(top_srcdir)/include/sys/vdev_disk.h \
|
|
$(top_srcdir)/include/sys/vdev_file.h \
|
|
$(top_srcdir)/include/sys/vdev.h \
|
|
$(top_srcdir)/include/sys/vdev_impl.h \
|
|
$(top_srcdir)/include/sys/vdev_indirect_births.h \
|
|
$(top_srcdir)/include/sys/vdev_indirect_mapping.h \
|
|
$(top_srcdir)/include/sys/vdev_raidz.h \
|
|
$(top_srcdir)/include/sys/vdev_raidz_impl.h \
|
|
$(top_srcdir)/include/sys/vdev_removal.h \
|
|
$(top_srcdir)/include/sys/xvattr.h \
|
|
$(top_srcdir)/include/sys/zap.h \
|
|
$(top_srcdir)/include/sys/zap_impl.h \
|
|
$(top_srcdir)/include/sys/zap_leaf.h \
|
|
$(top_srcdir)/include/sys/zcp.h \
|
|
$(top_srcdir)/include/sys/zcp_global.h \
|
|
$(top_srcdir)/include/sys/zcp_iter.h \
|
|
$(top_srcdir)/include/sys/zcp_prop.h \
|
|
$(top_srcdir)/include/sys/zfeature.h \
|
|
$(top_srcdir)/include/sys/zfs_acl.h \
|
|
$(top_srcdir)/include/sys/zfs_context.h \
|
|
$(top_srcdir)/include/sys/zfs_ctldir.h \
|
|
$(top_srcdir)/include/sys/zfs_debug.h \
|
|
$(top_srcdir)/include/sys/zfs_delay.h \
|
|
$(top_srcdir)/include/sys/zfs_dir.h \
|
|
$(top_srcdir)/include/sys/zfs_fuid.h \
|
|
$(top_srcdir)/include/sys/zfs_project.h \
|
|
$(top_srcdir)/include/sys/zfs_ratelimit.h \
|
|
$(top_srcdir)/include/sys/zfs_rlock.h \
|
|
$(top_srcdir)/include/sys/zfs_sa.h \
|
|
$(top_srcdir)/include/sys/zfs_stat.h \
|
|
$(top_srcdir)/include/sys/zfs_vfsops.h \
|
|
$(top_srcdir)/include/sys/zfs_vnops.h \
|
|
$(top_srcdir)/include/sys/zfs_znode.h \
|
|
$(top_srcdir)/include/sys/zil.h \
|
|
$(top_srcdir)/include/sys/zil_impl.h \
|
|
$(top_srcdir)/include/sys/zio_checksum.h \
|
|
$(top_srcdir)/include/sys/zio_compress.h \
|
|
$(top_srcdir)/include/sys/zio_crypt.h \
|
|
$(top_srcdir)/include/sys/zio.h \
|
|
$(top_srcdir)/include/sys/zio_impl.h \
|
|
$(top_srcdir)/include/sys/zio_priority.h \
|
|
$(top_srcdir)/include/sys/zrlock.h \
|
|
$(top_srcdir)/include/sys/zthr.h
|
|
|
|
KERNEL_H = \
|
|
$(top_srcdir)/include/sys/zfs_ioctl.h \
|
|
$(top_srcdir)/include/sys/zfs_onexit.h \
|
|
${top_srcdir}/include/sys/zpl.h \
|
|
$(top_srcdir)/include/sys/zvol.h
|
|
|
|
USER_H =
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
if CONFIG_USER
|
|
libzfsdir = $(includedir)/libzfs/sys
|
|
libzfs_HEADERS = $(COMMON_H) $(USER_H)
|
|
endif
|
|
|
|
if CONFIG_KERNEL
|
|
kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
|
|
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
|
endif
|