Skip to content

Commit

Permalink
btrfs: preallocate device flush bio
Browse files Browse the repository at this point in the history
For devices that support flushing, we allocate a bio, submit, wait for
it and then free it. The bio allocation does not fail so ENOMEM is not a
problem but we still may unnecessarily stress the allocation subsystem.

Instead, we can allocate the bio at the same time we allocate the device
and reuse it each time we need to flush the barriers. The bio is reset
before each use. Reference counting is simplified to just device
allocation (get) and freeing (put).

The bio used to be submitted through the integrity checker which will
find out that bio has no data attached and call submit_bio.

Status of the bio in flight needs to be tracked separately in case the
device caches get switched off between write and wait.

Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
David Sterba committed Jun 21, 2017
1 parent fdb1388 commit e0ae999
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
25 changes: 7 additions & 18 deletions fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -3481,9 +3481,7 @@ static int write_dev_supers(struct btrfs_device *device,
*/
static void btrfs_end_empty_barrier(struct bio *bio)
{
if (bio->bi_private)
complete(bio->bi_private);
bio_put(bio);
complete(bio->bi_private);
}

/*
Expand All @@ -3493,26 +3491,20 @@ static void btrfs_end_empty_barrier(struct bio *bio)
static void write_dev_flush(struct btrfs_device *device)
{
struct request_queue *q = bdev_get_queue(device->bdev);
struct bio *bio;
struct bio *bio = device->flush_bio;

if (!test_bit(QUEUE_FLAG_WC, &q->queue_flags))
return;

/*
* one reference for us, and we leave it for the
* caller
*/
device->flush_bio = NULL;
bio = btrfs_io_bio_alloc(0);
bio_reset(bio);
bio->bi_end_io = btrfs_end_empty_barrier;
bio->bi_bdev = device->bdev;
bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;
init_completion(&device->flush_wait);
bio->bi_private = &device->flush_wait;
device->flush_bio = bio;

bio_get(bio);
btrfsic_submit_bio(bio);
submit_bio(bio);
device->flush_bio_sent = 1;
}

/*
Expand All @@ -3523,9 +3515,10 @@ static int wait_dev_flush(struct btrfs_device *device)
int ret = 0;
struct bio *bio = device->flush_bio;

if (!bio)
if (!device->flush_bio_sent)
return 0;

device->flush_bio_sent = 0;
wait_for_completion(&device->flush_wait);

if (bio->bi_error) {
Expand All @@ -3534,10 +3527,6 @@ static int wait_dev_flush(struct btrfs_device *device)
BTRFS_DEV_STAT_FLUSH_ERRS);
}

/* drop the reference from the wait == 0 run */
bio_put(bio);
device->flush_bio = NULL;

return ret;
}

Expand Down
12 changes: 12 additions & 0 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,17 @@ static struct btrfs_device *__alloc_device(void)
if (!dev)
return ERR_PTR(-ENOMEM);

/*
* Preallocate a bio that's always going to be used for flushing device
* barriers and matches the device lifespan
*/
dev->flush_bio = bio_alloc_bioset(GFP_KERNEL, 0, NULL);
if (!dev->flush_bio) {
kfree(dev);
return ERR_PTR(-ENOMEM);
}
bio_get(dev->flush_bio);

INIT_LIST_HEAD(&dev->dev_list);
INIT_LIST_HEAD(&dev->dev_alloc_list);
INIT_LIST_HEAD(&dev->resized_list);
Expand Down Expand Up @@ -838,6 +849,7 @@ static void __free_device(struct work_struct *work)

device = container_of(work, struct btrfs_device, rcu_work);
rcu_string_free(device->name);
bio_put(device->flush_bio);
kfree(device);
}

Expand Down
1 change: 1 addition & 0 deletions fs/btrfs/volumes.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ struct btrfs_device {
int can_discard;
int is_tgtdev_for_dev_replace;
int last_flush_error;
int flush_bio_sent;

#ifdef __BTRFS_NEED_DEVICE_DATA_ORDERED
seqcount_t data_seqcount;
Expand Down

0 comments on commit e0ae999

Please sign in to comment.