nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

dm snapshot: use mutex instead of rw_semaphore

Browse source 
The rw_semaphore is acquired for read only in two places, neither is
performance-critical.  So replace it with a mutex -- which is more
efficient.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mikulas Patocka 2017-11-23 16:15:43 -05:00 committed by Mike Snitzer
parent 7690e25302
commit ae1093be5a
1 changed files with 43 additions and 41 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

84
drivers/md/dm-snap.c
View file

@ -47,7 +47,7 @@ struct dm_exception_table {
}; };
struct dm_snapshot { struct dm_snapshot {
struct rw_semaphore lock; struct mutex lock;
struct dm_dev *origin; struct dm_dev *origin;
struct dm_dev *cow; struct dm_dev *cow;
@ -439,9 +439,9 @@ static int __find_snapshots_sharing_cow(struct dm_snapshot *snap,
if (!bdev_equal(s->cow->bdev, snap->cow->bdev)) if (!bdev_equal(s->cow->bdev, snap->cow->bdev))
continue; continue;
down_read(&s->lock); mutex_lock(&s->lock);
active = s->active; active = s->active;
up_read(&s->lock); mutex_unlock(&s->lock);
if (active) { if (active) {
if (snap_src) if (snap_src)
@ -909,7 +909,7 @@ static int remove_single_exception_chunk(struct dm_snapshot *s)
int r; int r;
chunk_t old_chunk = s->first_merging_chunk + s->num_merging_chunks - 1; chunk_t old_chunk = s->first_merging_chunk + s->num_merging_chunks - 1;
down_write(&s->lock); mutex_lock(&s->lock);
/* /*
* Process chunks (and associated exceptions) in reverse order * Process chunks (and associated exceptions) in reverse order
@ -924,7 +924,7 @@ static int remove_single_exception_chunk(struct dm_snapshot *s)
b = __release_queued_bios_after_merge(s); b = __release_queued_bios_after_merge(s);
out: out:
up_write(&s->lock); mutex_unlock(&s->lock);
if (b) if (b)
flush_bios(b); flush_bios(b);
@ -983,9 +983,9 @@ static void snapshot_merge_next_chunks(struct dm_snapshot *s)
if (linear_chunks < 0) { if (linear_chunks < 0) {
DMERR("Read error in exception store: " DMERR("Read error in exception store: "
"shutting down merge"); "shutting down merge");
down_write(&s->lock); mutex_lock(&s->lock);
s->merge_failed = 1; s->merge_failed = 1;
up_write(&s->lock); mutex_unlock(&s->lock);
} }
goto shut; goto shut;
} }
@ -1026,10 +1026,10 @@ static void snapshot_merge_next_chunks(struct dm_snapshot *s)
previous_count = read_pending_exceptions_done_count(); previous_count = read_pending_exceptions_done_count();
} }
down_write(&s->lock); mutex_lock(&s->lock);
s->first_merging_chunk = old_chunk; s->first_merging_chunk = old_chunk;
s->num_merging_chunks = linear_chunks; s->num_merging_chunks = linear_chunks;
up_write(&s->lock); mutex_unlock(&s->lock);
/* Wait until writes to all 'linear_chunks' drain */ /* Wait until writes to all 'linear_chunks' drain */
for (i = 0; i < linear_chunks; i++) for (i = 0; i < linear_chunks; i++)
@ -1071,10 +1071,10 @@ static void merge_callback(int read_err, unsigned long write_err, void *context)
return; return;
shut: shut:
down_write(&s->lock); mutex_lock(&s->lock);
s->merge_failed = 1; s->merge_failed = 1;
b = __release_queued_bios_after_merge(s); b = __release_queued_bios_after_merge(s);
up_write(&s->lock); mutex_unlock(&s->lock);
error_bios(b); error_bios(b);
merge_shutdown(s); merge_shutdown(s);
@ -1173,7 +1173,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
s->exception_start_sequence = 0; s->exception_start_sequence = 0;
s->exception_complete_sequence = 0; s->exception_complete_sequence = 0;
INIT_LIST_HEAD(&s->out_of_order_list); INIT_LIST_HEAD(&s->out_of_order_list);
init_rwsem(&s->lock); mutex_init(&s->lock);
INIT_LIST_HEAD(&s->list); INIT_LIST_HEAD(&s->list);
spin_lock_init(&s->pe_lock); spin_lock_init(&s->pe_lock);
s->state_bits = 0; s->state_bits = 0;
@ -1338,9 +1338,9 @@ static void snapshot_dtr(struct dm_target *ti)
/* Check whether exception handover must be cancelled */ /* Check whether exception handover must be cancelled */
(void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL); (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
if (snap_src && snap_dest && (s == snap_src)) { if (snap_src && snap_dest && (s == snap_src)) {
down_write(&snap_dest->lock); mutex_lock(&snap_dest->lock);
snap_dest->valid = 0; snap_dest->valid = 0;
up_write(&snap_dest->lock); mutex_unlock(&snap_dest->lock);
DMERR("Cancelling snapshot handover."); DMERR("Cancelling snapshot handover.");
} }
up_read(&_origins_lock); up_read(&_origins_lock);
@ -1371,6 +1371,8 @@ static void snapshot_dtr(struct dm_target *ti)
dm_exception_store_destroy(s->store); dm_exception_store_destroy(s->store);
mutex_destroy(&s->lock);
dm_put_device(ti, s->cow); dm_put_device(ti, s->cow);
dm_put_device(ti, s->origin); dm_put_device(ti, s->origin);
@ -1458,7 +1460,7 @@ static void pending_complete(void *context, int success)
if (!success) { if (!success) {
/* Read/write error - snapshot is unusable */ /* Read/write error - snapshot is unusable */
down_write(&s->lock); mutex_lock(&s->lock);
__invalidate_snapshot(s, -EIO); __invalidate_snapshot(s, -EIO);
error = 1; error = 1;
goto out; goto out;
@ -1466,14 +1468,14 @@ static void pending_complete(void *context, int success)
e = alloc_completed_exception(GFP_NOIO); e = alloc_completed_exception(GFP_NOIO);
if (!e) { if (!e) {
down_write(&s->lock); mutex_lock(&s->lock);
__invalidate_snapshot(s, -ENOMEM); __invalidate_snapshot(s, -ENOMEM);
error = 1; error = 1;
goto out; goto out;
} }
*e = pe->e; *e = pe->e;
down_write(&s->lock); mutex_lock(&s->lock);
if (!s->valid) { if (!s->valid) {
free_completed_exception(e); free_completed_exception(e);
error = 1; error = 1;
@ -1498,7 +1500,7 @@ static void pending_complete(void *context, int success)
full_bio->bi_end_io = pe->full_bio_end_io; full_bio->bi_end_io = pe->full_bio_end_io;
increment_pending_exceptions_done_count(); increment_pending_exceptions_done_count();
up_write(&s->lock); mutex_unlock(&s->lock);
/* Submit any pending write bios */ /* Submit any pending write bios */
if (error) { if (error) {
@ -1694,7 +1696,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)
/* FIXME: should only take write lock if we need /* FIXME: should only take write lock if we need
* to copy an exception */ * to copy an exception */
down_write(&s->lock); mutex_lock(&s->lock);
if (!s->valid || (unlikely(s->snapshot_overflowed) && if (!s->valid || (unlikely(s->snapshot_overflowed) &&
bio_data_dir(bio) == WRITE)) { bio_data_dir(bio) == WRITE)) {
@ -1717,9 +1719,9 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)
if (bio_data_dir(bio) == WRITE) { if (bio_data_dir(bio) == WRITE) {
pe = __lookup_pending_exception(s, chunk); pe = __lookup_pending_exception(s, chunk);
if (!pe) { if (!pe) {
up_write(&s->lock); mutex_unlock(&s->lock);
pe = alloc_pending_exception(s); pe = alloc_pending_exception(s);
down_write(&s->lock); mutex_lock(&s->lock);
if (!s->valid || s->snapshot_overflowed) { if (!s->valid || s->snapshot_overflowed) {
free_pending_exception(pe); free_pending_exception(pe);
@ -1754,7 +1756,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)
bio->bi_iter.bi_size == bio->bi_iter.bi_size ==
(s->store->chunk_size << SECTOR_SHIFT)) { (s->store->chunk_size << SECTOR_SHIFT)) {
pe->started = 1; pe->started = 1;
up_write(&s->lock); mutex_unlock(&s->lock);
start_full_bio(pe, bio); start_full_bio(pe, bio);
goto out; goto out;
} }
@ -1764,7 +1766,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)
if (!pe->started) { if (!pe->started) {
/* this is protected by snap->lock */ /* this is protected by snap->lock */
pe->started = 1; pe->started = 1;
up_write(&s->lock); mutex_unlock(&s->lock);
start_copy(pe); start_copy(pe);
goto out; goto out;
} }
@ -1774,7 +1776,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)
} }
out_unlock: out_unlock:
up_write(&s->lock); mutex_unlock(&s->lock);
out: out:
return r; return r;
} }
@ -1810,7 +1812,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio)
chunk = sector_to_chunk(s->store, bio->bi_iter.bi_sector); chunk = sector_to_chunk(s->store, bio->bi_iter.bi_sector);
down_write(&s->lock); mutex_lock(&s->lock);
/* Full merging snapshots are redirected to the origin */ /* Full merging snapshots are redirected to the origin */
if (!s->valid) if (!s->valid)
@ -1841,12 +1843,12 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio)
bio_set_dev(bio, s->origin->bdev); bio_set_dev(bio, s->origin->bdev);
if (bio_data_dir(bio) == WRITE) { if (bio_data_dir(bio) == WRITE) {
up_write(&s->lock); mutex_unlock(&s->lock);
return do_origin(s->origin, bio); return do_origin(s->origin, bio);
} }
out_unlock: out_unlock:
up_write(&s->lock); mutex_unlock(&s->lock);
return r; return r;
} }
@ -1878,7 +1880,7 @@ static int snapshot_preresume(struct dm_target *ti)
down_read(&_origins_lock); down_read(&_origins_lock);
(void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL); (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
if (snap_src && snap_dest) { if (snap_src && snap_dest) {
down_read(&snap_src->lock); mutex_lock(&snap_src->lock);
if (s == snap_src) { if (s == snap_src) {
DMERR("Unable to resume snapshot source until " DMERR("Unable to resume snapshot source until "
"handover completes."); "handover completes.");
@ -1888,7 +1890,7 @@ static int snapshot_preresume(struct dm_target *ti)
"source is suspended."); "source is suspended.");
r = -EINVAL; r = -EINVAL;
} }
up_read(&snap_src->lock); mutex_unlock(&snap_src->lock);
} }
up_read(&_origins_lock); up_read(&_origins_lock);
@ -1934,11 +1936,11 @@ static void snapshot_resume(struct dm_target *ti)
(void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL); (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
if (snap_src && snap_dest) { if (snap_src && snap_dest) {
down_write(&snap_src->lock); mutex_lock(&snap_src->lock);
down_write_nested(&snap_dest->lock, SINGLE_DEPTH_NESTING); mutex_lock_nested(&snap_dest->lock, SINGLE_DEPTH_NESTING);
__handover_exceptions(snap_src, snap_dest); __handover_exceptions(snap_src, snap_dest);
up_write(&snap_dest->lock); mutex_unlock(&snap_dest->lock);
up_write(&snap_src->lock); mutex_unlock(&snap_src->lock);
} }
up_read(&_origins_lock); up_read(&_origins_lock);
@ -1953,9 +1955,9 @@ static void snapshot_resume(struct dm_target *ti)
/* Now we have correct chunk size, reregister */ /* Now we have correct chunk size, reregister */
reregister_snapshot(s); reregister_snapshot(s);
down_write(&s->lock); mutex_lock(&s->lock);
s->active = 1; s->active = 1;
up_write(&s->lock); mutex_unlock(&s->lock);
} }
static uint32_t get_origin_minimum_chunksize(struct block_device *bdev) static uint32_t get_origin_minimum_chunksize(struct block_device *bdev)
@ -1995,7 +1997,7 @@ static void snapshot_status(struct dm_target *ti, status_type_t type,
switch (type) { switch (type) {
case STATUSTYPE_INFO: case STATUSTYPE_INFO:
down_write(&snap->lock); mutex_lock(&snap->lock);
if (!snap->valid) if (!snap->valid)
DMEMIT("Invalid"); DMEMIT("Invalid");
@ -2020,7 +2022,7 @@ static void snapshot_status(struct dm_target *ti, status_type_t type,
DMEMIT("Unknown"); DMEMIT("Unknown");
} }
up_write(&snap->lock); mutex_unlock(&snap->lock);
break; break;
@ -2086,7 +2088,7 @@ static int __origin_write(struct list_head *snapshots, sector_t sector,
if (dm_target_is_snapshot_merge(snap->ti)) if (dm_target_is_snapshot_merge(snap->ti))
continue; continue;
down_write(&snap->lock); mutex_lock(&snap->lock);
/* Only deal with valid and active snapshots */ /* Only deal with valid and active snapshots */
if (!snap->valid || !snap->active) if (!snap->valid || !snap->active)
@ -2113,9 +2115,9 @@ static int __origin_write(struct list_head *snapshots, sector_t sector,
pe = __lookup_pending_exception(snap, chunk); pe = __lookup_pending_exception(snap, chunk);
if (!pe) { if (!pe) {
up_write(&snap->lock); mutex_unlock(&snap->lock);
pe = alloc_pending_exception(snap); pe = alloc_pending_exception(snap);
down_write(&snap->lock); mutex_lock(&snap->lock);
if (!snap->valid) { if (!snap->valid) {
free_pending_exception(pe); free_pending_exception(pe);
@ -2158,7 +2160,7 @@ static int __origin_write(struct list_head *snapshots, sector_t sector,
} }
next_snapshot: next_snapshot:
up_write(&snap->lock); mutex_unlock(&snap->lock);
if (pe_to_start_now) { if (pe_to_start_now) {
start_copy(pe_to_start_now); start_copy(pe_to_start_now);