projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modify RDMA engine to print strerror messages.
[fio.git]
/
engines
/
rdma.c
diff --git
a/engines/rdma.c
b/engines/rdma.c
index 7eb0051aa6cefdabcb904441436647b521e3eca3..7fbfad99fa3fa28d3ed9a30d8d31202542144a91 100644
(file)
--- a/
engines/rdma.c
+++ b/
engines/rdma.c
@@
-41,6
+41,7
@@
#include "../fio.h"
#include "../hash.h"
#include "../fio.h"
#include "../hash.h"
+#include "../optgroup.h"
#include <rdma/rdma_cma.h>
#include <infiniband/arch.h>
#include <rdma/rdma_cma.h>
#include <infiniband/arch.h>
@@
-115,7
+116,7
@@
static struct fio_option options[] = {
},
{ .ival = "recv",
.oval = FIO_RDMA_CHA_RECV,
},
{ .ival = "recv",
.oval = FIO_RDMA_CHA_RECV,
- .help = "Posted Rec
ie
ve",
+ .help = "Posted Rec
ei
ve",
},
},
.category = FIO_OPT_C_ENGINE,
},
},
.category = FIO_OPT_C_ENGINE,
@@
-414,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;
}
@@
-423,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;
}
@@
-437,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;
}
@@
-458,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;
@@
-489,14
+490,14
@@
static int fio_rdmaio_setup_control_msg_buffers(struct thread_data *td)
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;
}
@@
-730,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;
}
@@
-758,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;
}
}
@@
-766,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;
}
@@
-865,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;
}
@@
-880,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;
}
@@
-917,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;
}
@@
-931,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;
}
@@
-964,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;
}
@@
-1083,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;
}
@@
-1109,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;
}
@@
-1237,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;
}
@@
-1294,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;
}