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

bdev: generic already claimed error message

Browse Source 
As new claim types are introduced, printing error messages about who
holds a claim will get more complicated. This refactors the error
message code into a function to prevent code duplication.

Signed-off-by: Mike Gerdts <mgerdts@nvidia.com>
Change-Id: Icdc5332214f3974e75baf11ba5ea02172c4275e1
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15287
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Mike Gerdts 2022-10-24 11:42:06 -05:00 committed by Tomasz Zawadzki
parent 120eb84454
commit 0d8235f388
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/bdev/bdev.c
View File

@ -61,6 +61,18 @@ int __itt_init_ittlib(const char *, __itt_group_id);
*/ */
#define SPDK_BDEV_MAX_CHILDREN_COPY_REQS (8) #define SPDK_BDEV_MAX_CHILDREN_COPY_REQS (8)
#define LOG_ALREADY_CLAIMED_ERROR(detail, bdev) \
log_already_claimed(SPDK_LOG_ERROR, __LINE__, __func__, detail, bdev)
#ifdef DEBUG
#define LOG_ALREADY_CLAIMED_DEBUG(detail, bdev) \
log_already_claimed(SPDK_LOG_DEBUG, __LINE__, __func__, detail, bdev)
#else
#define LOG_ALREADY_CLAIMED_DEBUG(detail, bdev) do {} while(0)
#endif
static void log_already_claimed(enum spdk_log_level level, const int line, const char *func,
const char *detail, struct spdk_bdev *bdev);
SPDK_LOG_DEPRECATION_REGISTER(bdev_register_examine_thread, SPDK_LOG_DEPRECATION_REGISTER(bdev_register_examine_thread,
"bdev register and examine on non-app thread", "SPDK 23.05", 0); "bdev register and examine on non-app thread", "SPDK 23.05", 0);
@ -7040,6 +7052,31 @@ bdev_start_qos(struct spdk_bdev *bdev)
return 0; return 0;
} }
static void
log_already_claimed(enum spdk_log_level level, const int line, const char *func, const char *detail,
struct spdk_bdev *bdev)
{
enum spdk_bdev_claim_type type;
const char *typename, *modname;
extern struct spdk_log_flag SPDK_LOG_bdev;
if (level >= SPDK_LOG_INFO && !SPDK_LOG_bdev.enabled) {
return;
}
type = bdev->internal.claim_type;
typename = "exclusive_write";
if (type == SPDK_BDEV_CLAIM_EXCL_WRITE) {
modname = bdev->internal.claim.v1.module->name;
spdk_log(level, __FILE__, line, func, "bdev %s %s: type %s by module %s\n",
bdev->name, detail, typename, modname);
return;
}
assert(false);
}
static int static int
bdev_open(struct spdk_bdev *bdev, bool write, struct spdk_bdev_desc *desc) bdev_open(struct spdk_bdev *bdev, bool write, struct spdk_bdev_desc *desc)
{ {
@ -7067,8 +7104,7 @@ bdev_open(struct spdk_bdev *bdev, bool write, struct spdk_bdev_desc *desc)
} }
if (write && bdev->internal.claim_type != SPDK_BDEV_CLAIM_NONE) { if (write && bdev->internal.claim_type != SPDK_BDEV_CLAIM_NONE) {
SPDK_ERRLOG("Could not open %s - %s module already claimed it\n", LOG_ALREADY_CLAIMED_ERROR("already claimed", bdev);
bdev->name, bdev->internal.claim.v1.module->name);
spdk_spin_unlock(&bdev->internal.spinlock); spdk_spin_unlock(&bdev->internal.spinlock);
return -EPERM; return -EPERM;
} }
@ -7296,8 +7332,7 @@ spdk_bdev_module_claim_bdev(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,
spdk_spin_lock(&bdev->internal.spinlock); spdk_spin_lock(&bdev->internal.spinlock);
if (bdev->internal.claim_type != SPDK_BDEV_CLAIM_NONE) { if (bdev->internal.claim_type != SPDK_BDEV_CLAIM_NONE) {
SPDK_ERRLOG("bdev %s already claimed by module %s\n", bdev->name, LOG_ALREADY_CLAIMED_ERROR("already claimed", bdev);
bdev->internal.claim.v1.module->name);
spdk_spin_unlock(&bdev->internal.spinlock); spdk_spin_unlock(&bdev->internal.spinlock);
return -EPERM; return -EPERM;
} }