Skip to content

Commit

Permalink
Remove fastwrite mutex
Browse files Browse the repository at this point in the history
The fast write mutex is intended to protect accounting, but it
introduces a scaling regression by serializing all metaslab IO behind a
mutex. The accounting done by fast writes is done via atomic operations,
which renders the fast write mutex unnecessary.

Signed-off-by: Richard Yao <ryao@gentoo.org>
  • Loading branch information
ryao committed Jul 28, 2015
1 parent 48511ea commit 5dab5fa
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion include/sys/metaslab_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ struct metaslab_class {
uint64_t mc_space; /* total space (alloc + free) */
uint64_t mc_dspace; /* total deflated space */
uint64_t mc_histogram[RANGE_TREE_HISTOGRAM_SIZE];
kmutex_t mc_fastwrite_lock;
};

/*
Expand Down
9 changes: 0 additions & 9 deletions module/zfs/metaslab.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ metaslab_class_create(spa_t *spa, metaslab_ops_t *ops)
mc->mc_spa = spa;
mc->mc_rotor = NULL;
mc->mc_ops = ops;
mutex_init(&mc->mc_fastwrite_lock, NULL, MUTEX_DEFAULT, NULL);

return (mc);
}
Expand All @@ -212,7 +211,6 @@ metaslab_class_destroy(metaslab_class_t *mc)
ASSERT(mc->mc_space == 0);
ASSERT(mc->mc_dspace == 0);

mutex_destroy(&mc->mc_fastwrite_lock);
kmem_free(mc, sizeof (metaslab_class_t));
}

Expand Down Expand Up @@ -2213,9 +2211,6 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
if (psize >= metaslab_gang_bang && (ddi_get_lbolt() & 3) == 0)
return (SET_ERROR(ENOSPC));

if (flags & METASLAB_FASTWRITE)
mutex_enter(&mc->mc_fastwrite_lock);

/*
* Start at the rotor and loop through all mgs until we find something.
* Note that there's no locking on mc_rotor or mc_aliquot because
Expand Down Expand Up @@ -2400,7 +2395,6 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
if (flags & METASLAB_FASTWRITE) {
atomic_add_64(&vd->vdev_pending_fastwrite,
psize);
mutex_exit(&mc->mc_fastwrite_lock);
}

return (0);
Expand All @@ -2424,9 +2418,6 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, uint64_t psize,

bzero(&dva[d], sizeof (dva_t));

if (flags & METASLAB_FASTWRITE)
mutex_exit(&mc->mc_fastwrite_lock);

return (SET_ERROR(ENOSPC));
}

Expand Down

0 comments on commit 5dab5fa

Please sign in to comment.