ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module/raid: fix async module stopping

Browse Source 
If the module stop handler is asynchronous we must wait until it
finishes before unregistering the io_device.

Change-Id: I149b716d9f4b0c1680b3e43b395fc9ec5b90d70c
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14717
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Artur Paszkiewicz 2022-09-27 16:08:08 +02:00 committed by Tomasz Zawadzki
parent a51649faf6
commit 9cf1ab5b1c
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/bdev/raid/bdev_raid.c
View File

@ -277,6 +277,14 @@ raid_bdev_io_device_unregister_cb(void *io_device)
} }
} }
void
raid_bdev_module_stop_done(struct raid_bdev *raid_bdev)
{
if (raid_bdev->state != RAID_BDEV_STATE_CONFIGURING) {
spdk_io_device_unregister(raid_bdev, raid_bdev_io_device_unregister_cb);
}
}
/* /*
* brief: * brief:
* raid_bdev_destruct is the destruct function table pointer for raid bdev * raid_bdev_destruct is the destruct function table pointer for raid bdev
@ -313,10 +321,12 @@ raid_bdev_destruct(void *ctxt)
} }
if (raid_bdev->module->stop != NULL) { if (raid_bdev->module->stop != NULL) {
raid_bdev->module->stop(raid_bdev); if (raid_bdev->module->stop(raid_bdev) == false) {
return 1;
}
} }
spdk_io_device_unregister(raid_bdev, raid_bdev_io_device_unregister_cb); raid_bdev_module_stop_done(raid_bdev);
return 1; return 1;
} }

7
module/bdev/raid/bdev_raid.h
View File

@ -262,8 +262,12 @@ struct raid_bdev_module {
/* /*
* Called when the raid is stopping, right before changing the state to * Called when the raid is stopping, right before changing the state to
* offline and unregistering the bdev. Optional. * offline and unregistering the bdev. Optional.
*
* The function should return false if it is asynchronous. Then, after
* the async operation has completed and the module is fully stopped
* raid_bdev_module_stop_done() must be called.
*/ */
void (*stop)(struct raid_bdev *raid_bdev); bool (*stop)(struct raid_bdev *raid_bdev);
/* Handler for R/W requests */ /* Handler for R/W requests */
void (*submit_rw_request)(struct raid_bdev_io *raid_io); void (*submit_rw_request)(struct raid_bdev_io *raid_io);
@ -297,5 +301,6 @@ bool raid_bdev_io_complete_part(struct raid_bdev_io *raid_io, uint64_t completed
void raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev, void raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev,
struct spdk_io_channel *ch, spdk_bdev_io_wait_cb cb_fn); struct spdk_io_channel *ch, spdk_bdev_io_wait_cb cb_fn);
void raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status); void raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status);
void raid_bdev_module_stop_done(struct raid_bdev *raid_bdev);
#endif /* SPDK_BDEV_RAID_INTERNAL_H */ #endif /* SPDK_BDEV_RAID_INTERNAL_H */

4
module/bdev/raid/concat.c
View File

@ -300,12 +300,14 @@ concat_start(struct raid_bdev *raid_bdev)
return 0; return 0;
} }
static void static bool
concat_stop(struct raid_bdev *raid_bdev) concat_stop(struct raid_bdev *raid_bdev)
{ {
struct concat_block_range *block_range = raid_bdev->module_private; struct concat_block_range *block_range = raid_bdev->module_private;
free(block_range); free(block_range);
return true;
} }
static struct raid_bdev_module g_concat_module = { static struct raid_bdev_module g_concat_module = {

6
module/bdev/raid/raid5f.c
View File

@ -671,15 +671,19 @@ raid5f_io_device_unregister_done(void *io_device)
{ {
struct raid5f_info *r5f_info = io_device; struct raid5f_info *r5f_info = io_device;
raid_bdev_module_stop_done(r5f_info->raid_bdev);
free(r5f_info); free(r5f_info);
} }
static void static bool
raid5f_stop(struct raid_bdev *raid_bdev) raid5f_stop(struct raid_bdev *raid_bdev)
{ {
struct raid5f_info *r5f_info = raid_bdev->module_private; struct raid5f_info *r5f_info = raid_bdev->module_private;
spdk_io_device_unregister(r5f_info, raid5f_io_device_unregister_done); spdk_io_device_unregister(r5f_info, raid5f_io_device_unregister_done);
return false;
} }
static struct spdk_io_channel * static struct spdk_io_channel *

1
test/unit/lib/bdev/raid/raid5f.c/raid5f_ut.c
View File

@ -13,6 +13,7 @@
DEFINE_STUB_V(raid_bdev_module_list_add, (struct raid_bdev_module *raid_module)); DEFINE_STUB_V(raid_bdev_module_list_add, (struct raid_bdev_module *raid_module));
DEFINE_STUB(spdk_bdev_get_buf_align, size_t, (const struct spdk_bdev *bdev), 0); DEFINE_STUB(spdk_bdev_get_buf_align, size_t, (const struct spdk_bdev *bdev), 0);
DEFINE_STUB_V(raid_bdev_module_stop_done, (struct raid_bdev *raid_bdev));
struct spdk_bdev_desc { struct spdk_bdev_desc {
struct spdk_bdev *bdev; struct spdk_bdev *bdev;