Commit e6d05312 authored by cunyinch's avatar cunyinch Committed by Daniel Verkamp
Browse files

bdev/error: Make the injected errors as vector. 



Change-Id: If031def897260ba6bf9a5f985a6cc3e72819b658
Signed-off-by: default avatarcunyinch <cunyin.chang@intel.com>
Reviewed-on: https://review.gerrithub.io/366554


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent f2b26eb1

lib/bdev/error/vbdev_error.c

+44 −19
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "spdk/stdinc.h"

#include "spdk/rpc.h"

#include "spdk/conf.h"

#include "spdk/util.h"

#include "spdk/endian.h"

#include "spdk/nvme_spec.h"

#include "spdk/string.h"
@@ -47,13 +48,18 @@ 


#include "vbdev_error.h"



struct vbdev_error_info {

	bool				enabled;

	uint32_t			error_type;

	uint32_t			error_num;

};



/* Context for each error bdev */

struct vbdev_error_disk {

	struct spdk_bdev		disk;

	struct spdk_bdev		*base_bdev;

	uint32_t			io_type_mask;

	uint32_t			error_type;

	uint32_t			error_num;

	struct vbdev_error_info		error_vector[SPDK_BDEV_IO_TYPE_RESET];



	TAILQ_ENTRY(vbdev_error_disk)	tailq;

	TAILQ_HEAD(, spdk_bdev_io)	pending_ios;

};
@@ -63,10 +69,11 @@ static TAILQ_HEAD(, vbdev_error_disk) g_vbdev_error_disks = TAILQ_HEAD_INITIALIZ 
			g_vbdev_error_disks);



int

spdk_vbdev_inject_error(char *name, uint32_t io_type_mask, uint32_t error_type, uint32_t error_num)

spdk_vbdev_inject_error(char *name, uint32_t io_type, uint32_t error_type, uint32_t error_num)

{

	struct spdk_bdev *bdev;

	struct vbdev_error_disk *error_disk;

	uint32_t i;



	pthread_mutex_lock(&g_vbdev_error_mutex);

	bdev = spdk_bdev_get_by_name(name);
@@ -87,11 +94,22 @@ spdk_vbdev_inject_error(char *name, uint32_t io_type_mask, uint32_t error_type, 
		pthread_mutex_unlock(&g_vbdev_error_mutex);

		return -1;

	}

	error_disk->io_type_mask = io_type_mask;

	error_disk->error_num = error_num;

	error_disk->error_type = error_type;

	if (io_type_mask == 0) {

		error_disk->error_num = 0;



	if (0xffffffff == io_type) {

		for (i = 0; i < SPDK_COUNTOF(error_disk->error_vector); i++) {

			error_disk->error_vector[i].enabled = true;

			error_disk->error_vector[i].error_type = error_type;

			error_disk->error_vector[i].error_num = error_num;

		}

	} else if (0 == io_type) {

		for (i = 0; i < SPDK_COUNTOF(error_disk->error_vector); i++) {

			error_disk->error_vector[i].enabled = false;

			error_disk->error_vector[i].error_num = 0;

		}

	} else {

		error_disk->error_vector[io_type].enabled = true;

		error_disk->error_vector[io_type].error_type = error_type;

		error_disk->error_vector[io_type].error_num = error_num;

	}

	pthread_mutex_unlock(&g_vbdev_error_mutex);

	return 0;
@@ -109,11 +127,21 @@ vbdev_error_reset(struct vbdev_error_disk *error_disk, struct spdk_bdev_io *bdev 
	spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_SUCCESS);

}



static uint32_t

vbdev_error_get_error_type(struct vbdev_error_disk *error_disk, uint32_t io_type)

{

	if (error_disk->error_vector[io_type].enabled &&

	    error_disk->error_vector[io_type].error_num) {

		return error_disk->error_vector[io_type].error_type;

	}

	return 0;

}



static void

vbdev_error_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)

{

	struct vbdev_error_disk *error_disk = bdev_io->bdev->ctxt;

	uint32_t io_type_mask;

	uint32_t error_type;



	switch (bdev_io->type) {

	case SPDK_BDEV_IO_TYPE_READ:
@@ -123,7 +151,6 @@ vbdev_error_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev 
		break;

	case SPDK_BDEV_IO_TYPE_RESET:

		vbdev_error_reset(error_disk, bdev_io);

		error_disk->error_num = 0;

		return;

	default:

		SPDK_ERRLOG("Error Injection: unknown I/O type %d\n", bdev_io->type);
@@ -131,18 +158,16 @@ vbdev_error_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev 
		return;

	}



	io_type_mask = 1U << bdev_io->type;



	if (error_disk->error_num == 0 || !(error_disk->io_type_mask & io_type_mask)) {

	error_type = vbdev_error_get_error_type(error_disk, bdev_io->type);

	if (error_type == 0) {

		spdk_bdev_io_resubmit(bdev_io, error_disk->base_bdev);

		return;

	}



	if (error_disk->error_type == VBDEV_IO_FAILURE) {

		error_disk->error_num--;

	} else if (error_type == VBDEV_IO_FAILURE) {

		error_disk->error_vector[bdev_io->type].error_num--;

		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);

	} else {

	} else if (error_type == VBDEV_IO_PENDING) {

		TAILQ_INSERT_TAIL(&error_disk->pending_ios, bdev_io, module_link);

		error_disk->error_vector[bdev_io->type].error_num--;

	}

}

lib/bdev/error/vbdev_error.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ enum vbdev_error_type { 
};



int spdk_vbdev_error_create(struct spdk_bdev *base_bdev);

int spdk_vbdev_inject_error(char *name, uint32_t io_type_mask, uint32_t error_type,

int spdk_vbdev_inject_error(char *name, uint32_t io_type, uint32_t error_type,

			    uint32_t error_num);



#endif // SPDK_BLOCKDEV_ERROR_H

lib/bdev/error/vbdev_error_rpc.c

+5 −5
Original line number Diff line number Diff line
@@ -39,20 +39,20 @@ 
#include "spdk_internal/log.h"

#include "vbdev_error.h"



#define ERROR_BDEV_IO_TYPE_INVALID (1U << (SPDK_BDEV_IO_TYPE_RESET + 1))

#define ERROR_BDEV_IO_TYPE_INVALID (SPDK_BDEV_IO_TYPE_RESET + 1)

#define ERROR_BDEV_ERROR_TYPE_INVALID (VBDEV_IO_PENDING + 1)



static uint32_t

spdk_rpc_error_bdev_io_type_parse(char *name)

{

	if (strcmp(name, "read") == 0) {

		return 1U << SPDK_BDEV_IO_TYPE_READ;

		return SPDK_BDEV_IO_TYPE_READ;

	} else if (strcmp(name, "write") == 0) {

		return 1U << SPDK_BDEV_IO_TYPE_WRITE;

		return SPDK_BDEV_IO_TYPE_WRITE;

	} else if (strcmp(name, "flush") == 0) {

		return 1U << SPDK_BDEV_IO_TYPE_FLUSH;

		return SPDK_BDEV_IO_TYPE_FLUSH;

	} else if (strcmp(name, "unmap") == 0) {

		return 1U << SPDK_BDEV_IO_TYPE_UNMAP;

		return SPDK_BDEV_IO_TYPE_UNMAP;

	} else if (strcmp(name, "all") == 0) {

		return 0xffffffff;

	} else if (strcmp(name, "clear") == 0) {