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

nbd: add set interrupt mode to poller

Browse Source 
Change-Id: I76561561b245f42795fa9eb28967cd486163c589
Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5790
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Liu Xiaodong 2021-01-02 16:52:46 -05:00 committed by Tomasz Zawadzki
parent db8ac562b3
commit 5a7d428d0f
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/nbd/nbd.c
View File

@ -105,6 +105,7 @@ struct spdk_nbd_disk {
int spdk_sp_fd; int spdk_sp_fd;
struct spdk_poller *nbd_poller; struct spdk_poller *nbd_poller;
struct spdk_interrupt *intr; struct spdk_interrupt *intr;
bool interrupt_mode;
uint32_t buf_align; uint32_t buf_align;
struct spdk_poller *retry_poller; struct spdk_poller *retry_poller;
@ -507,7 +508,7 @@ nbd_io_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)
/* When there begins to have executed_io, enable socket writable notice in order to /* When there begins to have executed_io, enable socket writable notice in order to
* get it processed in nbd_io_xmit * get it processed in nbd_io_xmit
*/ */
if (nbd->intr && TAILQ_EMPTY(&nbd->executed_io_list)) { if (nbd->interrupt_mode && TAILQ_EMPTY(&nbd->executed_io_list)) {
spdk_interrupt_set_event_types(nbd->intr, SPDK_INTERRUPT_EVENT_IN | SPDK_INTERRUPT_EVENT_OUT); spdk_interrupt_set_event_types(nbd->intr, SPDK_INTERRUPT_EVENT_IN | SPDK_INTERRUPT_EVENT_OUT);
} }
@ -587,7 +588,7 @@ nbd_submit_bdev_io(struct spdk_nbd_disk *nbd, struct nbd_io *io)
rc = spdk_bdev_abort(desc, ch, io, nbd_io_done, io); rc = spdk_bdev_abort(desc, ch, io, nbd_io_done, io);
/* when there begins to have executed_io to send, enable socket writable notice */ /* when there begins to have executed_io to send, enable socket writable notice */
if (nbd->intr && TAILQ_EMPTY(&nbd->executed_io_list)) { if (nbd->interrupt_mode && TAILQ_EMPTY(&nbd->executed_io_list)) {
spdk_interrupt_set_event_types(nbd->intr, SPDK_INTERRUPT_EVENT_IN | SPDK_INTERRUPT_EVENT_OUT); spdk_interrupt_set_event_types(nbd->intr, SPDK_INTERRUPT_EVENT_IN | SPDK_INTERRUPT_EVENT_OUT);
} }
@ -842,7 +843,7 @@ nbd_io_xmit(struct spdk_nbd_disk *nbd)
} }
/* When there begins to have no executed_io, disable socket writable notice */ /* When there begins to have no executed_io, disable socket writable notice */
if (nbd->intr) { if (nbd->interrupt_mode) {
spdk_interrupt_set_event_types(nbd->intr, SPDK_INTERRUPT_EVENT_IN); spdk_interrupt_set_event_types(nbd->intr, SPDK_INTERRUPT_EVENT_IN);
} }
@ -943,6 +944,14 @@ struct spdk_nbd_start_ctx {
void *cb_arg; void *cb_arg;
}; };
static void
nbd_poller_set_interrupt_mode(struct spdk_poller *poller, void *cb_arg, bool interrupt_mode)
{
struct spdk_nbd_disk *nbd = cb_arg;
nbd->interrupt_mode = interrupt_mode;
}
static void static void
nbd_start_complete(struct spdk_nbd_start_ctx *ctx) nbd_start_complete(struct spdk_nbd_start_ctx *ctx)
{ {
@ -1017,10 +1026,11 @@ nbd_start_complete(struct spdk_nbd_start_ctx *ctx)
if (spdk_interrupt_mode_is_enabled()) { if (spdk_interrupt_mode_is_enabled()) {
ctx->nbd->intr = SPDK_INTERRUPT_REGISTER(ctx->nbd->spdk_sp_fd, nbd_poll, ctx->nbd); ctx->nbd->intr = SPDK_INTERRUPT_REGISTER(ctx->nbd->spdk_sp_fd, nbd_poll, ctx->nbd);
} else {
ctx->nbd->nbd_poller = SPDK_POLLER_REGISTER(nbd_poll, ctx->nbd, 0);
} }
ctx->nbd->nbd_poller = SPDK_POLLER_REGISTER(nbd_poll, ctx->nbd, 0);
spdk_poller_register_interrupt(ctx->nbd->nbd_poller, nbd_poller_set_interrupt_mode, ctx->nbd);
if (ctx->cb_fn) { if (ctx->cb_fn) {
ctx->cb_fn(ctx->cb_arg, ctx->nbd, 0); ctx->cb_fn(ctx->cb_arg, ctx->nbd, 0);
} }