#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#include "../optgroup.h"
#include <rdma/rdma_cma.h>
-#include <infiniband/arch.h>
#define FIO_RDMA_MAX_IO_DEPTH 512
struct thread_data *td;
unsigned int port;
enum rdma_io_mode verb;
+ char *bindname;
};
static int str_hostname_cb(void *data, const char *input)
.category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_RDMA,
},
+ {
+ .name = "bindname",
+ .lname = "rdma engine bindname",
+ .type = FIO_OPT_STR_STORE,
+ .off1 = offsetof(struct rdmaio_options, bindname),
+ .help = "Bind for RDMA IO engine",
+ .def = "",
+ .category = FIO_OPT_C_ENGINE,
+ .group = FIO_OPT_G_RDMA,
+ },
{
.name = "port",
.lname = "rdma engine port",
rd->rmt_nr = ntohl(rd->recv_buf.nr);
for (i = 0; i < rd->rmt_nr; i++) {
- rd->rmt_us[i].buf = ntohll(rd->recv_buf.rmt_us[i].buf);
+ rd->rmt_us[i].buf = be64_to_cpu(rd->recv_buf.rmt_us[i].buf);
rd->rmt_us[i].rkey = ntohl(rd->recv_buf.rmt_us[i].rkey);
rd->rmt_us[i].size = ntohl(rd->recv_buf.rmt_us[i].size);
return i;
}
-static int fio_rdmaio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_rdmaio_queue(struct thread_data *td,
+ struct io_u *io_u)
{
struct rdmaio_data *rd = td->io_ops_data;
unsigned int nr)
{
struct rdmaio_data *rd = td->io_ops_data;
- struct timeval now;
+ struct timespec now;
unsigned int i;
if (!fio_fill_issue_time(td))
return 0;
}
+static int aton(struct thread_data *td, const char *host,
+ struct sockaddr_in *addr)
+{
+ if (inet_aton(host, &addr->sin_addr) != 1) {
+ struct hostent *hent;
+
+ hent = gethostbyname(host);
+ if (!hent) {
+ td_verror(td, errno, "gethostbyname");
+ return 1;
+ }
+
+ memcpy(&addr->sin_addr, hent->h_addr, 4);
+ }
+ return 0;
+}
+
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_options *o = td->eo;
+ struct sockaddr_storage addrb;
struct ibv_recv_wr *bad_wr;
int err;
rd->addr.sin_family = AF_INET;
rd->addr.sin_port = htons(port);
- if (inet_aton(host, &rd->addr.sin_addr) != 1) {
- struct hostent *hent;
+ err = aton(td, host, &rd->addr);
+ if (err)
+ return err;
- hent = gethostbyname(host);
- if (!hent) {
- td_verror(td, errno, "gethostbyname");
- return 1;
- }
+ /* resolve route */
+ if (strcmp(o->bindname, "") != 0) {
+ addrb.ss_family = AF_INET;
+ err = aton(td, o->bindname, (struct sockaddr_in *)&addrb);
+ if (err)
+ return err;
+ err = rdma_resolve_addr(rd->cm_id, (struct sockaddr *)&addrb,
+ (struct sockaddr *)&rd->addr, 2000);
- memcpy(&rd->addr.sin_addr, hent->h_addr, 4);
+ } else {
+ err = rdma_resolve_addr(rd->cm_id, NULL,
+ (struct sockaddr *)&rd->addr, 2000);
}
- /* resolve route */
- err = rdma_resolve_addr(rd->cm_id, NULL, (struct sockaddr *)&rd->addr, 2000);
if (err != 0) {
log_err("fio: rdma_resolve_addr: %d\n", err);
return 1;
static int fio_rdmaio_setup_listen(struct thread_data *td, short port)
{
struct rdmaio_data *rd = td->io_ops_data;
+ struct rdmaio_options *o = td->eo;
struct ibv_recv_wr *bad_wr;
int state = td->runstate;
td_set_runstate(td, TD_SETTING_UP);
rd->addr.sin_family = AF_INET;
- rd->addr.sin_addr.s_addr = htonl(INADDR_ANY);
rd->addr.sin_port = htons(port);
+ if (strcmp(o->bindname, "") == 0)
+ rd->addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ else
+ rd->addr.sin_addr.s_addr = htonl(*o->bindname);
+
/* rdma_listen */
if (rdma_bind_addr(rd->cm_id, (struct sockaddr *)&rd->addr) != 0) {
log_err("fio: rdma_bind_addr fail: %m\n");
{
// The original RDMA engine had an ugly / seperator
// on the filename for it's options. This function
- // retains backwards compatibility with it.100
+ // retains backwards compatibility with it. Note we do not
+ // support setting the bindname option is this legacy mode.
struct rdmaio_options *o = td->eo;
char *modep, *portp;
}
rd->send_buf.rmt_us[i].buf =
- htonll((uint64_t) (unsigned long)io_u->buf);
+ cpu_to_be64((uint64_t) (unsigned long)io_u->buf);
rd->send_buf.rmt_us[i].rkey = htonl(io_u->mr->rkey);
rd->send_buf.rmt_us[i].size = htonl(max_bs);