projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: pass in right pointer to def thread options free
[fio.git]
/
engines
/
rdma.c
diff --git
a/engines/rdma.c
b/engines/rdma.c
index 87ba4658ceca94f6c6aec683cc4e56fc5d0c4d63..fbe8434406b72e37fd88cf20ca46114b0b001914 100644
(file)
--- a/
engines/rdma.c
+++ b/
engines/rdma.c
@@
-191,7
+191,7
@@
struct rdmaio_data {
static int client_recv(struct thread_data *td, struct ibv_wc *wc)
{
static int client_recv(struct thread_data *td, struct ibv_wc *wc)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
unsigned int max_bs;
if (wc->byte_len != sizeof(rd->recv_buf)) {
unsigned int max_bs;
if (wc->byte_len != sizeof(rd->recv_buf)) {
@@
-232,7
+232,7
@@
static int client_recv(struct thread_data *td, struct ibv_wc *wc)
static int server_recv(struct thread_data *td, struct ibv_wc *wc)
{
static int server_recv(struct thread_data *td, struct ibv_wc *wc)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
unsigned int max_bs;
if (wc->wr_id == FIO_RDMA_MAX_IO_DEPTH) {
unsigned int max_bs;
if (wc->wr_id == FIO_RDMA_MAX_IO_DEPTH) {
@@
-257,7
+257,7
@@
static int server_recv(struct thread_data *td, struct ibv_wc *wc)
static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
{
static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_wc wc;
struct rdma_io_u_data *r_io_u_d;
int ret;
struct ibv_wc wc;
struct rdma_io_u_data *r_io_u_d;
int ret;
@@
-368,7
+368,7
@@
static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
*/
static int rdma_poll_wait(struct thread_data *td, enum ibv_wc_opcode opcode)
{
*/
static int rdma_poll_wait(struct thread_data *td, enum ibv_wc_opcode opcode)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_cq *ev_cq;
void *ev_ctx;
int ret;
struct ibv_cq *ev_cq;
void *ev_ctx;
int ret;
@@
-405,7
+405,7
@@
again:
static int fio_rdmaio_setup_qp(struct thread_data *td)
{
static int fio_rdmaio_setup_qp(struct thread_data *td)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_qp_init_attr init_attr;
int qp_depth = td->o.iodepth * 2; /* 2 times of io depth */
struct ibv_qp_init_attr init_attr;
int qp_depth = td->o.iodepth * 2; /* 2 times of io depth */
@@
-415,7
+415,7
@@
static int fio_rdmaio_setup_qp(struct thread_data *td)
rd->pd = ibv_alloc_pd(rd->cm_id->verbs);
if (rd->pd == NULL) {
rd->pd = ibv_alloc_pd(rd->cm_id->verbs);
if (rd->pd == NULL) {
- log_err("fio: ibv_alloc_pd fail\n");
+ log_err("fio: ibv_alloc_pd fail
: %m
\n");
return 1;
}
return 1;
}
@@
-424,7
+424,7
@@
static int fio_rdmaio_setup_qp(struct thread_data *td)
else
rd->channel = ibv_create_comp_channel(rd->cm_id->verbs);
if (rd->channel == NULL) {
else
rd->channel = ibv_create_comp_channel(rd->cm_id->verbs);
if (rd->channel == NULL) {
- log_err("fio: ibv_create_comp_channel fail\n");
+ log_err("fio: ibv_create_comp_channel fail
: %m
\n");
goto err1;
}
goto err1;
}
@@
-438,12
+438,12
@@
static int fio_rdmaio_setup_qp(struct thread_data *td)
rd->cq = ibv_create_cq(rd->cm_id->verbs,
qp_depth, rd, rd->channel, 0);
if (rd->cq == NULL) {
rd->cq = ibv_create_cq(rd->cm_id->verbs,
qp_depth, rd, rd->channel, 0);
if (rd->cq == NULL) {
- log_err("fio: ibv_create_cq failed\n");
+ log_err("fio: ibv_create_cq failed
: %m
\n");
goto err2;
}
if (ibv_req_notify_cq(rd->cq, 0) != 0) {
goto err2;
}
if (ibv_req_notify_cq(rd->cq, 0) != 0) {
- log_err("fio: ibv_
create_cq failed
\n");
+ log_err("fio: ibv_
req_notify_cq failed: %m
\n");
goto err3;
}
goto err3;
}
@@
-459,13
+459,13
@@
static int fio_rdmaio_setup_qp(struct thread_data *td)
if (rd->is_client == 0) {
if (rdma_create_qp(rd->child_cm_id, rd->pd, &init_attr) != 0) {
if (rd->is_client == 0) {
if (rdma_create_qp(rd->child_cm_id, rd->pd, &init_attr) != 0) {
- log_err("fio: rdma_create_qp failed\n");
+ log_err("fio: rdma_create_qp failed
: %m
\n");
goto err3;
}
rd->qp = rd->child_cm_id->qp;
} else {
if (rdma_create_qp(rd->cm_id, rd->pd, &init_attr) != 0) {
goto err3;
}
rd->qp = rd->child_cm_id->qp;
} else {
if (rdma_create_qp(rd->cm_id, rd->pd, &init_attr) != 0) {
- log_err("fio: rdma_create_qp failed\n");
+ log_err("fio: rdma_create_qp failed
: %m
\n");
goto err3;
}
rd->qp = rd->cm_id->qp;
goto err3;
}
rd->qp = rd->cm_id->qp;
@@
-485,19
+485,19
@@
err1:
static int fio_rdmaio_setup_control_msg_buffers(struct thread_data *td)
{
static int fio_rdmaio_setup_control_msg_buffers(struct thread_data *td)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
rd->recv_mr = ibv_reg_mr(rd->pd, &rd->recv_buf, sizeof(rd->recv_buf),
IBV_ACCESS_LOCAL_WRITE);
if (rd->recv_mr == NULL) {
rd->recv_mr = ibv_reg_mr(rd->pd, &rd->recv_buf, sizeof(rd->recv_buf),
IBV_ACCESS_LOCAL_WRITE);
if (rd->recv_mr == NULL) {
- log_err("fio: recv_buf reg_mr failed\n");
+ log_err("fio: recv_buf reg_mr failed
: %m
\n");
return 1;
}
rd->send_mr = ibv_reg_mr(rd->pd, &rd->send_buf, sizeof(rd->send_buf),
0);
if (rd->send_mr == NULL) {
return 1;
}
rd->send_mr = ibv_reg_mr(rd->pd, &rd->send_buf, sizeof(rd->send_buf),
0);
if (rd->send_mr == NULL) {
- log_err("fio: send_buf reg_mr failed\n");
+ log_err("fio: send_buf reg_mr failed
: %m
\n");
ibv_dereg_mr(rd->recv_mr);
return 1;
}
ibv_dereg_mr(rd->recv_mr);
return 1;
}
@@
-529,7
+529,7
@@
static int get_next_channel_event(struct thread_data *td,
struct rdma_event_channel *channel,
enum rdma_cm_event_type wait_event)
{
struct rdma_event_channel *channel,
enum rdma_cm_event_type wait_event)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct rdma_cm_event *event;
int ret;
struct rdma_cm_event *event;
int ret;
@@
-561,7
+561,7
@@
static int get_next_channel_event(struct thread_data *td,
static int fio_rdmaio_prep(struct thread_data *td, struct io_u *io_u)
{
static int fio_rdmaio_prep(struct thread_data *td, struct io_u *io_u)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct rdma_io_u_data *r_io_u_d;
r_io_u_d = io_u->engine_data;
struct rdma_io_u_data *r_io_u_d;
r_io_u_d = io_u->engine_data;
@@
-604,7
+604,7
@@
static int fio_rdmaio_prep(struct thread_data *td, struct io_u *io_u)
static struct io_u *fio_rdmaio_event(struct thread_data *td, int event)
{
static struct io_u *fio_rdmaio_event(struct thread_data *td, int event)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct io_u *io_u;
int i;
struct io_u *io_u;
int i;
@@
-622,7
+622,7
@@
static struct io_u *fio_rdmaio_event(struct thread_data *td, int event)
static int fio_rdmaio_getevents(struct thread_data *td, unsigned int min,
unsigned int max, const struct timespec *t)
{
static int fio_rdmaio_getevents(struct thread_data *td, unsigned int min,
unsigned int max, const struct timespec *t)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
enum ibv_wc_opcode comp_opcode;
struct ibv_cq *ev_cq;
void *ev_ctx;
enum ibv_wc_opcode comp_opcode;
struct ibv_cq *ev_cq;
void *ev_ctx;
@@
-684,7
+684,7
@@
again:
static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
unsigned int nr)
{
static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
unsigned int nr)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_send_wr *bad_wr;
#if 0
enum ibv_wc_opcode comp_opcode;
struct ibv_send_wr *bad_wr;
#if 0
enum ibv_wc_opcode comp_opcode;
@@
-731,7
+731,7
@@
static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
}
if (ibv_post_send(rd->qp, &r_io_u_d->sq_wr, &bad_wr) != 0) {
}
if (ibv_post_send(rd->qp, &r_io_u_d->sq_wr, &bad_wr) != 0) {
- log_err("fio: ibv_post_send fail\n");
+ log_err("fio: ibv_post_send fail
: %m
\n");
return -1;
}
return -1;
}
@@
-747,7
+747,7
@@
static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
static int fio_rdmaio_recv(struct thread_data *td, struct io_u **io_us,
unsigned int nr)
{
static int fio_rdmaio_recv(struct thread_data *td, struct io_u **io_us,
unsigned int nr)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_recv_wr *bad_wr;
struct rdma_io_u_data *r_io_u_d;
int i;
struct ibv_recv_wr *bad_wr;
struct rdma_io_u_data *r_io_u_d;
int i;
@@
-759,7
+759,7
@@
static int fio_rdmaio_recv(struct thread_data *td, struct io_u **io_us,
r_io_u_d = io_us[i]->engine_data;
if (ibv_post_recv(rd->qp, &r_io_u_d->rq_wr, &bad_wr) !=
0) {
r_io_u_d = io_us[i]->engine_data;
if (ibv_post_recv(rd->qp, &r_io_u_d->rq_wr, &bad_wr) !=
0) {
- log_err("fio: ibv_post_recv fail\n");
+ log_err("fio: ibv_post_recv fail
: %m
\n");
return 1;
}
}
return 1;
}
}
@@
-767,7
+767,7
@@
static int fio_rdmaio_recv(struct thread_data *td, struct io_u **io_us,
|| (rd->rdma_protocol == FIO_RDMA_MEM_WRITE)) {
/* re-post the rq_wr */
if (ibv_post_recv(rd->qp, &rd->rq_wr, &bad_wr) != 0) {
|| (rd->rdma_protocol == FIO_RDMA_MEM_WRITE)) {
/* re-post the rq_wr */
if (ibv_post_recv(rd->qp, &rd->rq_wr, &bad_wr) != 0) {
- log_err("fio: ibv_post_recv fail\n");
+ log_err("fio: ibv_post_recv fail
: %m
\n");
return 1;
}
return 1;
}
@@
-783,7
+783,7
@@
static int fio_rdmaio_recv(struct thread_data *td, struct io_u **io_us,
static int fio_rdmaio_queue(struct thread_data *td, struct io_u *io_u)
{
static int fio_rdmaio_queue(struct thread_data *td, struct io_u *io_u)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
fio_ro_check(td, io_u);
fio_ro_check(td, io_u);
@@
-801,7
+801,7
@@
static int fio_rdmaio_queue(struct thread_data *td, struct io_u *io_u)
static void fio_rdmaio_queued(struct thread_data *td, struct io_u **io_us,
unsigned int nr)
{
static void fio_rdmaio_queued(struct thread_data *td, struct io_u **io_us,
unsigned int nr)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct timeval now;
unsigned int i;
struct timeval now;
unsigned int i;
@@
-824,7
+824,7
@@
static void fio_rdmaio_queued(struct thread_data *td, struct io_u **io_us,
static int fio_rdmaio_commit(struct thread_data *td)
{
static int fio_rdmaio_commit(struct thread_data *td)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct io_u **io_us;
int ret;
struct io_u **io_us;
int ret;
@@
-856,7
+856,7
@@
static int fio_rdmaio_commit(struct thread_data *td)
static int fio_rdmaio_connect(struct thread_data *td, struct fio_file *f)
{
static int fio_rdmaio_connect(struct thread_data *td, struct fio_file *f)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct rdma_conn_param conn_param;
struct ibv_send_wr *bad_wr;
struct rdma_conn_param conn_param;
struct ibv_send_wr *bad_wr;
@@
-866,7
+866,7
@@
static int fio_rdmaio_connect(struct thread_data *td, struct fio_file *f)
conn_param.retry_count = 10;
if (rdma_connect(rd->cm_id, &conn_param) != 0) {
conn_param.retry_count = 10;
if (rdma_connect(rd->cm_id, &conn_param) != 0) {
- log_err("fio: rdma_connect fail\n");
+ log_err("fio: rdma_connect fail
: %m
\n");
return 1;
}
return 1;
}
@@
-881,7
+881,7
@@
static int fio_rdmaio_connect(struct thread_data *td, struct fio_file *f)
rd->send_buf.nr = htonl(td->o.iodepth);
if (ibv_post_send(rd->qp, &rd->sq_wr, &bad_wr) != 0) {
rd->send_buf.nr = htonl(td->o.iodepth);
if (ibv_post_send(rd->qp, &rd->sq_wr, &bad_wr) != 0) {
- log_err("fio: ibv_post_send fail");
+ log_err("fio: ibv_post_send fail
: %m
");
return 1;
}
return 1;
}
@@
-907,7
+907,7
@@
static int fio_rdmaio_connect(struct thread_data *td, struct fio_file *f)
static int fio_rdmaio_accept(struct thread_data *td, struct fio_file *f)
{
static int fio_rdmaio_accept(struct thread_data *td, struct fio_file *f)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct rdma_conn_param conn_param;
struct ibv_send_wr *bad_wr;
int ret = 0;
struct rdma_conn_param conn_param;
struct ibv_send_wr *bad_wr;
int ret = 0;
@@
-918,7
+918,7
@@
static int fio_rdmaio_accept(struct thread_data *td, struct fio_file *f)
conn_param.initiator_depth = 1;
if (rdma_accept(rd->child_cm_id, &conn_param) != 0) {
conn_param.initiator_depth = 1;
if (rdma_accept(rd->child_cm_id, &conn_param) != 0) {
- log_err("fio: rdma_accept\n");
+ log_err("fio: rdma_accept
: %m
\n");
return 1;
}
return 1;
}
@@
-932,7
+932,7
@@
static int fio_rdmaio_accept(struct thread_data *td, struct fio_file *f)
ret = rdma_poll_wait(td, IBV_WC_RECV) < 0;
if (ibv_post_send(rd->qp, &rd->sq_wr, &bad_wr) != 0) {
ret = rdma_poll_wait(td, IBV_WC_RECV) < 0;
if (ibv_post_send(rd->qp, &rd->sq_wr, &bad_wr) != 0) {
- log_err("fio: ibv_post_send fail");
+ log_err("fio: ibv_post_send fail
: %m
");
return 1;
}
return 1;
}
@@
-952,7
+952,7
@@
static int fio_rdmaio_open_file(struct thread_data *td, struct fio_file *f)
static int fio_rdmaio_close_file(struct thread_data *td, struct fio_file *f)
{
static int fio_rdmaio_close_file(struct thread_data *td, struct fio_file *f)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_send_wr *bad_wr;
/* unregister rdma buffer */
struct ibv_send_wr *bad_wr;
/* unregister rdma buffer */
@@
-965,7
+965,7
@@
static int fio_rdmaio_close_file(struct thread_data *td, struct fio_file *f)
|| (rd->rdma_protocol ==
FIO_RDMA_MEM_READ))) {
if (ibv_post_send(rd->qp, &rd->sq_wr, &bad_wr) != 0) {
|| (rd->rdma_protocol ==
FIO_RDMA_MEM_READ))) {
if (ibv_post_send(rd->qp, &rd->sq_wr, &bad_wr) != 0) {
- log_err("fio: ibv_post_send fail");
+ log_err("fio: ibv_post_send fail
: %m
");
return 1;
}
return 1;
}
@@
-1008,7
+1008,7
@@
static int fio_rdmaio_close_file(struct thread_data *td, struct fio_file *f)
static int fio_rdmaio_setup_connect(struct thread_data *td, const char *host,
unsigned short port)
{
static int fio_rdmaio_setup_connect(struct thread_data *td, const char *host,
unsigned short port)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_recv_wr *bad_wr;
int err;
struct ibv_recv_wr *bad_wr;
int err;
@@
-1072,7
+1072,7
@@
static int fio_rdmaio_setup_connect(struct thread_data *td, const char *host,
static int fio_rdmaio_setup_listen(struct thread_data *td, short port)
{
static int fio_rdmaio_setup_listen(struct thread_data *td, short port)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct ibv_recv_wr *bad_wr;
int state = td->runstate;
struct ibv_recv_wr *bad_wr;
int state = td->runstate;
@@
-1084,12
+1084,12
@@
static int fio_rdmaio_setup_listen(struct thread_data *td, short port)
/* rdma_listen */
if (rdma_bind_addr(rd->cm_id, (struct sockaddr *)&rd->addr) != 0) {
/* rdma_listen */
if (rdma_bind_addr(rd->cm_id, (struct sockaddr *)&rd->addr) != 0) {
- log_err("fio: rdma_bind_addr fail\n");
+ log_err("fio: rdma_bind_addr fail
: %m
\n");
return 1;
}
if (rdma_listen(rd->cm_id, 3) != 0) {
return 1;
}
if (rdma_listen(rd->cm_id, 3) != 0) {
- log_err("fio: rdma_listen fail\n");
+ log_err("fio: rdma_listen fail
: %m
\n");
return 1;
}
return 1;
}
@@
-1110,7
+1110,7
@@
static int fio_rdmaio_setup_listen(struct thread_data *td, short port)
/* post recv buf */
if (ibv_post_recv(rd->qp, &rd->rq_wr, &bad_wr) != 0) {
/* post recv buf */
if (ibv_post_recv(rd->qp, &rd->rq_wr, &bad_wr) != 0) {
- log_err("fio: ibv_post_recv fail\n");
+ log_err("fio: ibv_post_recv fail
: %m
\n");
return 1;
}
return 1;
}
@@
-1207,7
+1207,7
@@
bad_host:
static int fio_rdmaio_init(struct thread_data *td)
{
static int fio_rdmaio_init(struct thread_data *td)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
struct rdmaio_options *o = td->eo;
unsigned int max_bs;
int ret, i;
struct rdmaio_options *o = td->eo;
unsigned int max_bs;
int ret, i;
@@
-1238,13
+1238,13
@@
static int fio_rdmaio_init(struct thread_data *td)
rd->cm_channel = rdma_create_event_channel();
if (!rd->cm_channel) {
rd->cm_channel = rdma_create_event_channel();
if (!rd->cm_channel) {
- log_err("fio: rdma_create_event_channel fail\n");
+ log_err("fio: rdma_create_event_channel fail
: %m
\n");
return 1;
}
ret = rdma_create_id(rd->cm_channel, &rd->cm_id, rd, RDMA_PS_TCP);
if (ret) {
return 1;
}
ret = rdma_create_id(rd->cm_channel, &rd->cm_id, rd, RDMA_PS_TCP);
if (ret) {
- log_err("fio: rdma_create_id fail\n");
+ log_err("fio: rdma_create_id fail
: %m
\n");
return 1;
}
return 1;
}
@@
-1295,7
+1295,7
@@
static int fio_rdmaio_init(struct thread_data *td)
IBV_ACCESS_REMOTE_READ |
IBV_ACCESS_REMOTE_WRITE);
if (io_u->mr == NULL) {
IBV_ACCESS_REMOTE_READ |
IBV_ACCESS_REMOTE_WRITE);
if (io_u->mr == NULL) {
- log_err("fio: ibv_reg_mr io_u failed\n");
+ log_err("fio: ibv_reg_mr io_u failed
: %m
\n");
return 1;
}
return 1;
}
@@
-1316,7
+1316,7
@@
static int fio_rdmaio_init(struct thread_data *td)
static void fio_rdmaio_cleanup(struct thread_data *td)
{
static void fio_rdmaio_cleanup(struct thread_data *td)
{
- struct rdmaio_data *rd = td->io_ops
->
data;
+ struct rdmaio_data *rd = td->io_ops
_
data;
if (rd)
free(rd);
if (rd)
free(rd);
@@
-1332,12
+1332,12
@@
static int fio_rdmaio_setup(struct thread_data *td)
td->o.open_files++;
}
td->o.open_files++;
}
- if (!td->io_ops
->
data) {
+ if (!td->io_ops
_
data) {
rd = malloc(sizeof(*rd));
memset(rd, 0, sizeof(*rd));
init_rand_seed(&rd->rand_state, (unsigned int) GOLDEN_RATIO_PRIME, 0);
rd = malloc(sizeof(*rd));
memset(rd, 0, sizeof(*rd));
init_rand_seed(&rd->rand_state, (unsigned int) GOLDEN_RATIO_PRIME, 0);
- td->io_ops
->
data = rd;
+ td->io_ops
_
data = rd;
}
return 0;
}
return 0;