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

bdev/error: move config scanning to vbdev_error_init

Browse Source 
vbdev_error_init holds config information and examine() uses it.

This patch is necessary to keep compatibility from the .INI config
file to the upcoming JSON config file (based on JSON-RPC).

Change-Id: I1601b7e0dad5f93662177c59536776afd974ff07
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/403913
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-03-15 01:26:00 +09:00 committed by Jim Harris
parent 19b8d9b10a
commit db828b10b4
1 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/bdev/error/vbdev_error.c
View File

@ -48,6 +48,14 @@
#include "vbdev_error.h" #include "vbdev_error.h"
struct spdk_vbdev_error_config {
char *base_bdev;
TAILQ_ENTRY(spdk_vbdev_error_config) tailq;
};
static TAILQ_HEAD(, spdk_vbdev_error_config) g_error_config
= TAILQ_HEAD_INITIALIZER(g_error_config);
struct vbdev_error_info { struct vbdev_error_info {
bool enabled; bool enabled;
uint32_t error_type; uint32_t error_type;
@ -69,13 +77,14 @@ static pthread_mutex_t g_vbdev_error_mutex = PTHREAD_MUTEX_INITIALIZER;
static SPDK_BDEV_PART_TAILQ g_error_disks = TAILQ_HEAD_INITIALIZER(g_error_disks); static SPDK_BDEV_PART_TAILQ g_error_disks = TAILQ_HEAD_INITIALIZER(g_error_disks);
static int vbdev_error_init(void); static int vbdev_error_init(void);
static void vbdev_error_fini(void);
static void vbdev_error_examine(struct spdk_bdev *bdev); static void vbdev_error_examine(struct spdk_bdev *bdev);
static struct spdk_bdev_module error_if = { static struct spdk_bdev_module error_if = {
.name = "error", .name = "error",
.module_init = vbdev_error_init, .module_init = vbdev_error_init,
.module_fini = NULL, .module_fini = vbdev_error_fini,
.examine = vbdev_error_examine, .examine = vbdev_error_examine,
}; };
@ -287,21 +296,15 @@ spdk_vbdev_error_create(struct spdk_bdev *base_bdev)
static int static int
vbdev_error_init(void) vbdev_error_init(void)
{
return 0;
}
static void
vbdev_error_examine(struct spdk_bdev *bdev)
{ {
struct spdk_conf_section *sp; struct spdk_conf_section *sp;
struct spdk_vbdev_error_config *cfg;
const char *base_bdev_name; const char *base_bdev_name;
int i; int i;
sp = spdk_conf_find_section(NULL, "BdevError"); sp = spdk_conf_find_section(NULL, "BdevError");
if (sp == NULL) { if (sp == NULL) {
spdk_bdev_module_examine_done(&error_if); return 0;
return;
} }
for (i = 0; ; i++) { for (i = 0; ; i++) {
@ -312,17 +315,57 @@ vbdev_error_examine(struct spdk_bdev *bdev)
base_bdev_name = spdk_conf_section_get_nmval(sp, "BdevError", i, 0); base_bdev_name = spdk_conf_section_get_nmval(sp, "BdevError", i, 0);
if (!base_bdev_name) { if (!base_bdev_name) {
SPDK_ERRLOG("ErrorInjection configuration missing bdev name\n"); SPDK_ERRLOG("ErrorInjection configuration missing bdev name\n");
break; return -EINVAL;
} }
if (strcmp(base_bdev_name, bdev->name) != 0) { cfg = calloc(1, sizeof(*cfg));
if (!cfg) {
SPDK_ERRLOG("calloc() failed for vbdev_error_config\n");
return -ENOMEM;
}
cfg->base_bdev = strdup(base_bdev_name);
if (!cfg->base_bdev) {
free(cfg);
SPDK_ERRLOG("strdup() failed for bdev name\n");
return -ENOMEM;
}
TAILQ_INSERT_TAIL(&g_error_config, cfg, tailq);
}
return 0;
}
static void
vbdev_error_fini(void)
{
struct spdk_vbdev_error_config *cfg;
while ((cfg = TAILQ_FIRST(&g_error_config))) {
TAILQ_REMOVE(&g_error_config, cfg, tailq);
free(cfg->base_bdev);
free(cfg);
}
}
static void
vbdev_error_examine(struct spdk_bdev *bdev)
{
struct spdk_vbdev_error_config *cfg;
int rc;
TAILQ_FOREACH(cfg, &g_error_config, tailq) {
if (strcmp(cfg->base_bdev, bdev->name) != 0) {
continue; continue;
} }
if (spdk_vbdev_error_create(bdev)) { rc = spdk_vbdev_error_create(bdev);
if (rc != 0) {
SPDK_ERRLOG("could not create error vbdev for bdev %s\n", bdev->name); SPDK_ERRLOG("could not create error vbdev for bdev %s\n", bdev->name);
break;
} }
break;
} }
spdk_bdev_module_examine_done(&error_if); spdk_bdev_module_examine_done(&error_if);