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

bdev/iscsi: Add reset function for iscsi initiator

Browse Source 
Change-Id: I77c2b81878ebcb18dd9efffa394c1d07f523f780
Signed-off-by: Chunyang Hui <Chunyang.hui@intel.com>
Reviewed-on: https://review.gerrithub.io/417797
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Chunyang Hui 2018-07-04 09:46:44 +08:00 committed by Jim Harris
parent 564db67415
commit 8658d568a6
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/bdev/iscsi/bdev_iscsi.c
View File

@ -42,6 +42,7 @@
#include "spdk/util.h" #include "spdk/util.h"
#include "spdk/rpc.h" #include "spdk/rpc.h"
#include "spdk/string.h" #include "spdk/string.h"
#include "spdk/iscsi_spec.h"
#include "spdk_internal/log.h" #include "spdk_internal/log.h"
#include "spdk/bdev_module.h" #include "spdk/bdev_module.h"
@ -342,6 +343,46 @@ bdev_iscsi_unmap(struct bdev_iscsi_lun *lun, struct bdev_iscsi_io *iscsi_io,
} }
} }
static void
bdev_iscsi_reset_cb(struct iscsi_context *context __attribute__((unused)), int status,
void *command_data, void *private_data)
{
uint32_t tmf_response;
struct bdev_iscsi_io *iscsi_io = private_data;
tmf_response = *(uint32_t *)command_data;
if (tmf_response == ISCSI_TASK_FUNC_RESP_COMPLETE) {
bdev_iscsi_io_complete(iscsi_io, SPDK_BDEV_IO_STATUS_SUCCESS);
} else {
bdev_iscsi_io_complete(iscsi_io, SPDK_BDEV_IO_STATUS_FAILED);
}
}
static void
_bdev_iscsi_reset(void *_bdev_io)
{
int rc;
struct spdk_bdev_io *bdev_io = _bdev_io;
struct bdev_iscsi_lun *lun = (struct bdev_iscsi_lun *)bdev_io->bdev->ctxt;
struct bdev_iscsi_io *iscsi_io = (struct bdev_iscsi_io *)bdev_io->driver_ctx;
struct iscsi_context *context = lun->context;
rc = iscsi_task_mgmt_lun_reset_async(context, 0,
bdev_iscsi_reset_cb, iscsi_io);
if (rc != 0) {
SPDK_ERRLOG("failed to do iscsi reset\n");
bdev_iscsi_io_complete(iscsi_io, SPDK_BDEV_IO_STATUS_FAILED);
return;
}
}
static void
bdev_iscsi_reset(struct spdk_bdev_io *bdev_io)
{
struct bdev_iscsi_lun *lun = (struct bdev_iscsi_lun *)bdev_io->bdev->ctxt;
spdk_thread_send_msg(lun->master_td, _bdev_iscsi_reset, bdev_io);
}
static int static int
bdev_iscsi_poll_lun(struct bdev_iscsi_lun *lun) bdev_iscsi_poll_lun(struct bdev_iscsi_lun *lun)
{ {
@ -426,6 +467,9 @@ static void _bdev_iscsi_submit_request(void *_bdev_io)
ISCSI_IMMEDIATE_DATA_NO, ISCSI_IMMEDIATE_DATA_NO,
bdev_io->u.bdev.offset_blocks); bdev_io->u.bdev.offset_blocks);
break; break;
case SPDK_BDEV_IO_TYPE_RESET:
bdev_iscsi_reset(bdev_io);
break;
case SPDK_BDEV_IO_TYPE_UNMAP: case SPDK_BDEV_IO_TYPE_UNMAP:
bdev_iscsi_unmap(lun, iscsi_io, bdev_iscsi_unmap(lun, iscsi_io,
bdev_io->u.bdev.offset_blocks, bdev_io->u.bdev.offset_blocks,
@ -460,6 +504,7 @@ bdev_iscsi_io_type_supported(void *ctx, enum spdk_bdev_io_type io_type)
case SPDK_BDEV_IO_TYPE_WRITE: case SPDK_BDEV_IO_TYPE_WRITE:
case SPDK_BDEV_IO_TYPE_FLUSH: case SPDK_BDEV_IO_TYPE_FLUSH:
case SPDK_BDEV_IO_TYPE_UNMAP: case SPDK_BDEV_IO_TYPE_UNMAP:
case SPDK_BDEV_IO_TYPE_RESET:
return true; return true;
default: default: