From 9e41af75cd9f229ddce39e93380dcd5274ffe7aa Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 8 Aug 2011 14:15:44 -0700 Subject: [RHEL6 qemu-kvm PATCH 2/7] block: add discard support RH-Author: Markus Armbruster Message-id: <1312812947-8303-3-git-send-email-armbru@redhat.com> Patchwork-id: 31082 O-Subject: [RHEL6 PATCH qemu-kvm 2/5] block: add discard support Bugzilla: 711354 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Paolo Bonzini RH-Acked-by: Amit Shah From: Christoph Hellwig Add a new bdrv_discard method to free blocks in a mapping image, and a new drive property to set the granularity for these discard. If no discard granularity support is set discard support is disabled. Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf (cherry picked from commit bb8bf76fb1c4afa116a7f11fee559b3cca671a4a) Signed-off-by: Markus Armbruster --- block.c | 11 +++++++++++ block.h | 1 + block/raw.c | 6 ++++++ block_int.h | 7 ++++++- 4 files changed, 24 insertions(+), 1 deletions(-) Signed-off-by: Eduardo Habkost --- block.c | 11 +++++++++++ block.h | 1 + block/raw.c | 6 ++++++ block_int.h | 7 ++++++- 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 8839254..24678cf 100644 --- a/block.c +++ b/block.c @@ -1467,6 +1467,17 @@ int bdrv_has_zero_init(BlockDriverState *bs) return 1; } +int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) +{ + if (!bs->drv) { + return -ENOMEDIUM; + } + if (!bs->drv->bdrv_discard) { + return 0; + } + return bs->drv->bdrv_discard(bs, sector_num, nb_sectors); +} + /* * Returns true iff the specified sector is present in the disk image. Drivers * not implementing the functionality are assumed to not support backing files, diff --git a/block.h b/block.h index 54c5527..9e0d942 100644 --- a/block.h +++ b/block.h @@ -150,6 +150,7 @@ int bdrv_flush(BlockDriverState *bs); void bdrv_flush_all(void); void bdrv_close_all(void); +int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); int bdrv_has_zero_init(BlockDriverState *bs); int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum); diff --git a/block/raw.c b/block/raw.c index 1980deb..b0f72d6 100644 --- a/block/raw.c +++ b/block/raw.c @@ -65,6 +65,11 @@ static int raw_probe(const uint8_t *buf, int buf_size, const char *filename) return 1; /* everything can be opened as raw image */ } +static int raw_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) +{ + return bdrv_discard(bs->file, sector_num, nb_sectors); +} + static int raw_is_inserted(BlockDriverState *bs) { return bdrv_is_inserted(bs->file); @@ -130,6 +135,7 @@ static BlockDriver bdrv_raw = { .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, .bdrv_aio_flush = raw_aio_flush, + .bdrv_discard = raw_discard, .bdrv_is_inserted = raw_is_inserted, .bdrv_eject = raw_eject, diff --git a/block_int.h b/block_int.h index dee19aa..25bc818 100644 --- a/block_int.h +++ b/block_int.h @@ -73,6 +73,8 @@ struct BlockDriver { BlockDriverCompletionFunc *cb, void *opaque); BlockDriverAIOCB *(*bdrv_aio_flush)(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque); + int (*bdrv_discard)(BlockDriverState *bs, int64_t sector_num, + int nb_sectors); int (*bdrv_aio_multiwrite)(BlockDriverState *bs, BlockRequest *reqs, int num_reqs); @@ -228,6 +230,7 @@ typedef struct BlockConf { uint16_t min_io_size; uint32_t opt_io_size; int32_t bootindex; + uint32_t discard_granularity; } BlockConf; static inline unsigned int get_physical_block_exp(BlockConf *conf) @@ -251,6 +254,8 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) _conf.physical_block_size, 512), \ DEFINE_PROP_UINT16("min_io_size", _state, _conf.min_io_size, 0), \ DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0), \ - DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1) \ + DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1), \ + DEFINE_PROP_UINT32("discard_granularity", _state, \ + _conf.discard_granularity, 0) #endif /* BLOCK_INT_H */ -- 1.7.3.2