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

nvmf: switch RDMA acceptor to spdk_poller

Browse Source 
Use the new timer-based poller functionality to replace rte_timer.

Change-Id: Ic40653306cc73b40139fe18e06bab29b35721a43
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-28 13:19:55 -07:00 committed by Ben Walker
parent c41ab41c17
commit e7a6744a88
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nvmf/rdma.c
View File

@ -43,7 +43,6 @@
#include <rte_config.h> #include <rte_config.h>
#include <rte_debug.h> #include <rte_debug.h>
#include <rte_cycles.h> #include <rte_cycles.h>
#include <rte_timer.h>
#include <rte_lcore.h> #include <rte_lcore.h>
#include <rte_malloc.h> #include <rte_malloc.h>
@ -53,11 +52,12 @@
#include "subsystem.h" #include "subsystem.h"
#include "transport.h" #include "transport.h"
#include "spdk/assert.h" #include "spdk/assert.h"
#include "spdk/event.h"
#include "spdk/log.h" #include "spdk/log.h"
#include "spdk/nvmf_spec.h" #include "spdk/nvmf_spec.h"
#include "spdk/trace.h" #include "spdk/trace.h"
#define ACCEPT_TIMEOUT (rte_get_timer_hz() >> 10) /* ~1ms */ #define ACCEPT_TIMEOUT_US 1000 /* 1ms */
/* /*
RDMA Connection Resouce Defaults RDMA Connection Resouce Defaults
@ -140,7 +140,7 @@ struct spdk_nvmf_rdma_session {
}; };
struct spdk_nvmf_rdma { struct spdk_nvmf_rdma {
struct rte_timer acceptor_timer; struct spdk_poller acceptor_poller;
struct rdma_event_channel *acceptor_event_channel; struct rdma_event_channel *acceptor_event_channel;
struct rdma_cm_id *acceptor_listen_id; struct rdma_cm_id *acceptor_listen_id;
@ -909,7 +909,7 @@ spdk_nvmf_request_prep_data(struct spdk_nvmf_request *req)
static int spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn); static int spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn);
static void static void
nvmf_rdma_accept(struct rte_timer *timer, void *arg) nvmf_rdma_accept(void *arg)
{ {
struct rdma_cm_event *event; struct rdma_cm_event *event;
int rc; int rc;
@ -1017,10 +1017,10 @@ spdk_nvmf_rdma_acceptor_start(void)
sin_port = ntohs(rdma_get_src_port(g_rdma.acceptor_listen_id)); sin_port = ntohs(rdma_get_src_port(g_rdma.acceptor_listen_id));
SPDK_NOTICELOG("*** NVMf Target Listening on port %d ***\n", sin_port); SPDK_NOTICELOG("*** NVMf Target Listening on port %d ***\n", sin_port);
rte_timer_init(&g_rdma.acceptor_timer); g_rdma.acceptor_poller.fn = nvmf_rdma_accept;
rte_timer_reset(&g_rdma.acceptor_timer, ACCEPT_TIMEOUT, PERIODICAL, g_rdma.acceptor_poller.arg = NULL;
rte_lcore_id(), nvmf_rdma_accept, NULL); spdk_poller_register(&g_rdma.acceptor_poller, rte_lcore_id(), NULL, ACCEPT_TIMEOUT_US);
return (rc); return rc;
listen_error: listen_error:
rdma_destroy_id(g_rdma.acceptor_listen_id); rdma_destroy_id(g_rdma.acceptor_listen_id);
@ -1033,7 +1033,7 @@ static void
spdk_nvmf_rdma_acceptor_stop(void) spdk_nvmf_rdma_acceptor_stop(void)
{ {
SPDK_TRACELOG(SPDK_TRACE_RDMA, "nvmf_acceptor_stop: shutdown\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "nvmf_acceptor_stop: shutdown\n");
rte_timer_stop_sync(&g_rdma.acceptor_timer); spdk_poller_unregister(&g_rdma.acceptor_poller, NULL);
} }
static int static int