From d77d3179f04d2306a77b8de986152cafe0cc957b Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 29 Mar 2022 16:23:40 +0900 Subject: [PATCH] bdev/aio: Use bdev_open_ext() for rescan instead of bdev_get_by_name() Use spdk_bdev_open_ext() + spdk_bdev_desc_get_bdev() + spdk_bdev_close() instead of spdk_bdev_get_by_name(). Additionally, use bdev pointer instead of &fdisk->disk because it is more readable. Signed-off-by: Shuhei Matsumoto Change-Id: I924595268e6785592a6e777e90a8c245a0346719 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12070 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- module/bdev/aio/bdev_aio.c | 36 ++++++++++++++++++++++++---------- module/bdev/aio/bdev_aio.h | 2 +- module/bdev/aio/bdev_aio_rpc.c | 9 +-------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/module/bdev/aio/bdev_aio.c b/module/bdev/aio/bdev_aio.c index 1873f18cd..0b04cf052 100644 --- a/module/bdev/aio/bdev_aio.c +++ b/module/bdev/aio/bdev_aio.c @@ -820,36 +820,52 @@ error_return: return rc; } -int -bdev_aio_rescan(struct spdk_bdev *bdev) +static void +dummy_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, void *ctx) { +} + +int +bdev_aio_rescan(const char *name) +{ + struct spdk_bdev_desc *desc; + struct spdk_bdev *bdev; struct file_disk *fdisk; uint64_t disk_size, blockcnt; int rc; - if (!bdev || bdev->module != &aio_if) { - return -ENODEV; + rc = spdk_bdev_open_ext(name, false, dummy_bdev_event_cb, NULL, &desc); + if (rc != 0) { + return rc; + } + + bdev = spdk_bdev_desc_get_bdev(desc); + if (bdev->module != &aio_if) { + rc = -ENODEV; + goto exit; } fdisk = SPDK_CONTAINEROF(bdev, struct file_disk, disk); disk_size = spdk_fd_get_size(fdisk->fd); - blockcnt = disk_size / fdisk->disk.blocklen; + blockcnt = disk_size / bdev->blocklen; - if (fdisk->disk.blockcnt != blockcnt) { + if (bdev->blockcnt != blockcnt) { SPDK_NOTICELOG("AIO device is resized: bdev name %s, old block count %" PRIu64 ", new block count %" PRIu64 "\n", fdisk->filename, - fdisk->disk.blockcnt, + bdev->blockcnt, blockcnt); - rc = spdk_bdev_notify_blockcnt_change(&fdisk->disk, blockcnt); + rc = spdk_bdev_notify_blockcnt_change(bdev, blockcnt); if (rc != 0) { SPDK_ERRLOG("Could not change num blocks for aio bdev: name %s, errno: %d.\n", fdisk->filename, rc); - return rc; + goto exit; } } - return 0; +exit: + spdk_bdev_close(desc); + return rc; } struct delete_aio_bdev_ctx { diff --git a/module/bdev/aio/bdev_aio.h b/module/bdev/aio/bdev_aio.h index 13ebb08ce..73f74ef9d 100644 --- a/module/bdev/aio/bdev_aio.h +++ b/module/bdev/aio/bdev_aio.h @@ -41,7 +41,7 @@ typedef void (*delete_aio_bdev_complete)(void *cb_arg, int bdeverrno); int create_aio_bdev(const char *name, const char *filename, uint32_t block_size); -int bdev_aio_rescan(struct spdk_bdev *bdev); +int bdev_aio_rescan(const char *name); void bdev_aio_delete(const char *name, delete_aio_bdev_complete cb_fn, void *cb_arg); #endif /* SPDK_BDEV_AIO_H */ diff --git a/module/bdev/aio/bdev_aio_rpc.c b/module/bdev/aio/bdev_aio_rpc.c index a6c864edb..1d84b4893 100644 --- a/module/bdev/aio/bdev_aio_rpc.c +++ b/module/bdev/aio/bdev_aio_rpc.c @@ -124,7 +124,6 @@ rpc_bdev_aio_rescan(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_rescan_aio req = {NULL}; - struct spdk_bdev *bdev; int bdeverrno; if (spdk_json_decode_object(params, rpc_rescan_aio_decoders, @@ -135,13 +134,7 @@ rpc_bdev_aio_rescan(struct spdk_jsonrpc_request *request, goto cleanup; } - bdev = spdk_bdev_get_by_name(req.name); - if (bdev == NULL) { - spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV)); - goto cleanup; - } - - bdeverrno = bdev_aio_rescan(bdev); + bdeverrno = bdev_aio_rescan(req.name); spdk_jsonrpc_send_bool_response(request, bdeverrno); cleanup: