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

blob_bdev: support read-only devices

Browse Source 
External snapshots, which will be introduced in a later commit, will
need read-only blob_bdev instances. This support is partially needed to
support underlying devices that are naturally read-only and partially to
provide an extra layer of protection against accidental writes.

Signed-off-by: Mike Gerdts <mgerdts@nvidia.com>
Change-Id: Ibcb28d00ad644a6053aa5f4de15471c2cd8e348a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14968
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Mike Gerdts 2022-09-20 09:53:06 -05:00 committed by Tomasz Zawadzki
parent 45e0a2a370
commit bd5a784719
3 changed files with 118 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/spdk/blob_bdev.h
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause /* SPDX-License-Identifier: BSD-3-Clause
* Copyright (C) 2017 Intel Corporation. * Copyright (C) 2017 Intel Corporation.
* All rights reserved. * All rights reserved.
* Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*/ */
/** \file /** \file
@ -21,6 +22,17 @@ struct spdk_bs_dev;
struct spdk_bdev; struct spdk_bdev;
struct spdk_bdev_module; struct spdk_bdev_module;
struct spdk_bdev_bs_dev_opts {
/**
* The size of this structure according to the caller of this library is used for ABI
* compatibility. The library uses this field to know how many fields in this structure are
* valid. And the library will populate any remaining fields with default values.
* New added fields should be put at the end of the struct.
*/
size_t opts_size;
};
SPDK_STATIC_ASSERT(sizeof(struct spdk_bdev_bs_dev_opts) == 8, "Incorrect size");
/** /**
* Create a blobstore block device from a bdev. * Create a blobstore block device from a bdev.
* *
@ -34,6 +46,23 @@ struct spdk_bdev_module;
int spdk_bdev_create_bs_dev_ext(const char *bdev_name, spdk_bdev_event_cb_t event_cb, int spdk_bdev_create_bs_dev_ext(const char *bdev_name, spdk_bdev_event_cb_t event_cb,
void *event_ctx, struct spdk_bs_dev **bs_dev); void *event_ctx, struct spdk_bs_dev **bs_dev);
/**
* Create a blobstore block device from a bdev.
*
* \param bdev_name The bdev to use.
* \param write If true, open device read-write, else open read-only.
* \param opts Additonal options; none currently supported.
* \param opts_size Size of structure referenced by opts.
* \param event_cb Called when the bdev triggers asynchronous event.
* \param event_ctx Argument passed to function event_cb.
* \param bs_dev Output parameter for a pointer to the blobstore block device.
* \return 0 if operation is successful, or suitable errno value otherwise.
*/
int spdk_bdev_create_bs_dev(const char *bdev_name, bool write,
struct spdk_bdev_bs_dev_opts *opts, size_t opts_size,
spdk_bdev_event_cb_t event_cb, void *event_ctx,
struct spdk_bs_dev **bs_dev);
/** /**
* Claim the bdev module for the given blobstore. * Claim the bdev module for the given blobstore.
* *

22
module/blob/bdev/blob_bdev.c
View File

@ -412,13 +412,20 @@ blob_bdev_init(struct blob_bdev *b, struct spdk_bdev_desc *desc)
} }
int int
spdk_bdev_create_bs_dev_ext(const char *bdev_name, spdk_bdev_event_cb_t event_cb, spdk_bdev_create_bs_dev(const char *bdev_name, bool write,
void *event_ctx, struct spdk_bs_dev **_bs_dev) struct spdk_bdev_bs_dev_opts *opts, size_t opts_size,
spdk_bdev_event_cb_t event_cb, void *event_ctx,
struct spdk_bs_dev **bs_dev)
{ {
struct blob_bdev *b; struct blob_bdev *b;
struct spdk_bdev_desc *desc; struct spdk_bdev_desc *desc;
int rc; int rc;
if (opts != NULL && opts_size != sizeof(*opts)) {
SPDK_ERRLOG("bdev name '%s': unsupported options\n", bdev_name);
return -EINVAL;
}
b = calloc(1, sizeof(*b)); b = calloc(1, sizeof(*b));
if (b == NULL) { if (b == NULL) {
@ -426,7 +433,7 @@ spdk_bdev_create_bs_dev_ext(const char *bdev_name, spdk_bdev_event_cb_t event_cb
return -ENOMEM; return -ENOMEM;
} }
rc = spdk_bdev_open_ext(bdev_name, true, event_cb, event_ctx, &desc); rc = spdk_bdev_open_ext(bdev_name, write, event_cb, event_ctx, &desc);
if (rc != 0) { if (rc != 0) {
free(b); free(b);
return rc; return rc;
@ -434,7 +441,14 @@ spdk_bdev_create_bs_dev_ext(const char *bdev_name, spdk_bdev_event_cb_t event_cb
blob_bdev_init(b, desc); blob_bdev_init(b, desc);
*_bs_dev = &b->bs_dev; *bs_dev = &b->bs_dev;
return 0; return 0;
} }
int
spdk_bdev_create_bs_dev_ext(const char *bdev_name, spdk_bdev_event_cb_t event_cb,
void *event_ctx, struct spdk_bs_dev **bs_dev)
{
return spdk_bdev_create_bs_dev(bdev_name, true, NULL, 0, event_cb, event_ctx, bs_dev);
}

71
test/unit/lib/blob/blob_bdev.c/blob_bdev_ut.c
View File

@ -190,6 +190,75 @@ create_bs_dev(void)
blob_bdev = (struct blob_bdev *)bs_dev; blob_bdev = (struct blob_bdev *)bs_dev;
CU_ASSERT(blob_bdev->desc != NULL); CU_ASSERT(blob_bdev->desc != NULL);
CU_ASSERT(blob_bdev->desc->write);
CU_ASSERT(blob_bdev->desc->bdev == g_bdev);
CU_ASSERT(blob_bdev->desc->claim_type == SPDK_BDEV_CLAIM_NONE);
CU_ASSERT(bdev.claim_type == SPDK_BDEV_CLAIM_NONE);
bs_dev->destroy(bs_dev);
CU_ASSERT(bdev.open_cnt == 0);
g_bdev = NULL;
}
static void
create_bs_dev_ro(void)
{
struct spdk_bdev bdev;
struct spdk_bs_dev *bs_dev = NULL;
struct blob_bdev *blob_bdev;
struct spdk_bdev_bs_dev_opts opts = { 0 };
int rc;
/* opts with the wrong size returns -EINVAL */
rc = spdk_bdev_create_bs_dev("nope", false, &opts, sizeof(opts) + 8, NULL, NULL, &bs_dev);
CU_ASSERT(rc == -EINVAL);
/* opts with the right size is OK, but can still fail if the device doesn't exist. */
opts.opts_size = sizeof(opts);
rc = spdk_bdev_create_bs_dev("nope", false, &opts, sizeof(opts), NULL, NULL, &bs_dev);
CU_ASSERT(rc == -ENODEV);
init_bdev(&bdev, "bdev0", 16);
g_bdev = &bdev;
/* The normal way to create a read-only device */
rc = spdk_bdev_create_bs_dev("bdev0", false, NULL, 0, NULL, NULL, &bs_dev);
CU_ASSERT(rc == 0);
SPDK_CU_ASSERT_FATAL(bs_dev != NULL);
CU_ASSERT(bdev.open_cnt == 1);
blob_bdev = (struct blob_bdev *)bs_dev;
CU_ASSERT(blob_bdev->desc != NULL);
CU_ASSERT(!blob_bdev->desc->write);
CU_ASSERT(blob_bdev->desc->bdev == g_bdev);
CU_ASSERT(blob_bdev->desc->claim_type == SPDK_BDEV_CLAIM_NONE);
CU_ASSERT(bdev.claim_type == SPDK_BDEV_CLAIM_NONE);
bs_dev->destroy(bs_dev);
CU_ASSERT(bdev.open_cnt == 0);
g_bdev = NULL;
}
static void
create_bs_dev_rw(void)
{
struct spdk_bdev bdev;
struct spdk_bs_dev *bs_dev = NULL;
struct blob_bdev *blob_bdev;
int rc;
init_bdev(&bdev, "bdev0", 16);
g_bdev = &bdev;
/* This is equivalent to spdk_bdev_create_bs_dev_ext() */
rc = spdk_bdev_create_bs_dev("bdev0", true, NULL, 0, NULL, NULL, &bs_dev);
CU_ASSERT(rc == 0);
SPDK_CU_ASSERT_FATAL(bs_dev != NULL);
CU_ASSERT(bdev.open_cnt == 1);
blob_bdev = (struct blob_bdev *)bs_dev;
CU_ASSERT(blob_bdev->desc != NULL);
CU_ASSERT(blob_bdev->desc->write);
CU_ASSERT(blob_bdev->desc->bdev == g_bdev); CU_ASSERT(blob_bdev->desc->bdev == g_bdev);
CU_ASSERT(blob_bdev->desc->claim_type == SPDK_BDEV_CLAIM_NONE); CU_ASSERT(blob_bdev->desc->claim_type == SPDK_BDEV_CLAIM_NONE);
CU_ASSERT(bdev.claim_type == SPDK_BDEV_CLAIM_NONE); CU_ASSERT(bdev.claim_type == SPDK_BDEV_CLAIM_NONE);
@ -258,6 +327,8 @@ main(int argc, char **argv)
suite = CU_add_suite("blob_bdev", NULL, NULL); suite = CU_add_suite("blob_bdev", NULL, NULL);
CU_ADD_TEST(suite, create_bs_dev); CU_ADD_TEST(suite, create_bs_dev);
CU_ADD_TEST(suite, create_bs_dev_ro);
CU_ADD_TEST(suite, create_bs_dev_rw);
CU_ADD_TEST(suite, claim_bs_dev); CU_ADD_TEST(suite, claim_bs_dev);
CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_set_mode(CU_BRM_VERBOSE);