2006-10-03 Roland Dreier <rdreier@cisco.com>
+ * src/cmd.c (ibv_cmd_get_context_v2, ibv_cmd_get_context)
+ (ibv_cmd_query_device, ibv_cmd_query_port, ibv_cmd_alloc_pd)
+ (ibv_cmd_reg_mr, ibv_cmd_create_cq_v2, ibv_cmd_create_cq)
+ (ibv_cmd_poll_cq, ibv_cmd_resize_cq, ibv_cmd_destroy_cq)
+ (ibv_cmd_create_srq, ibv_cmd_create_qp, ibv_cmd_post_send)
+ (ibv_cmd_post_recv, ibv_cmd_post_srq_recv, ibv_cmd_create_ah)
+ (ibv_cmd_destroy_qp): Annotate so that Valgrind knows responses
+ are defined after write() succeeds. The kernel writes into the
+ response structure directly, so without these, Valgrind thinks
+ that response structures are undefined memory.
+
+ * src/ibverbs.h: Add wrapper for VALGRIND_MAKE_MEM_DEFINED so that
+ it can be used in .c files without worrying about whether Valgrind
+ is installed or enabled.
+
+ * configure.in: Add support for Valgrind annotation (enabled with
+ --with-valgrind option to configure).
+
+ * src/cmd.c (ibv_cmd_query_port, ibv_cmd_create_cq,
+ ibv_cmd_modify_qp): Set reserved fields to 0 to avoid future
+ problems and also to make Valgrind a little quieter.
+
* src/init.c (init_drivers): Set node_type and transport_type
values of device being created.
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
context->async_fd = resp->async_fd;
context->num_comp_vectors = 1;
t->channel.fd = cq_fd;
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
context->async_fd = resp->async_fd;
context->num_comp_vectors = resp->num_comp_vectors;
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
memset(device_attr->fw_ver, 0, sizeof device_attr->fw_ver);
*raw_fw_ver = resp.fw_ver;
device_attr->node_guid = resp.node_guid;
IBV_INIT_CMD_RESP(cmd, cmd_size, QUERY_PORT, &resp, sizeof resp);
cmd->port_num = port_num;
+ memset(cmd->reserved, 0, sizeof cmd->reserved);
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
port_attr->state = resp.state;
port_attr->max_mtu = resp.max_mtu;
port_attr->active_mtu = resp.active_mtu;
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
pd->handle = resp->pd_handle;
return 0;
if (write(pd->context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
mr->handle = resp.mr_handle;
mr->lkey = resp.lkey;
mr->rkey = resp.rkey;
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, sizeof resp_size);
+
cq->handle = resp->cq_handle;
cq->cqe = resp->cqe;
if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
cq->handle = resp->cq_handle;
cq->cqe = resp->cqe;
goto out;
}
+ VALGRIND_MAKE_MEM_DEFINED(resp, rsize);
+
for (i = 0; i < resp->count; i++) {
wc[i].wr_id = resp->wc[i].wr_id;
wc[i].status = resp->wc[i].status;
if (write(cq->context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
cq->cqe = resp->cqe;
return 0;
if (write(cq->context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
pthread_mutex_lock(&cq->mutex);
while (cq->comp_events_completed != resp.comp_events_reported ||
cq->async_events_completed != resp.async_events_reported)
if (write(pd->context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
srq->handle = resp->srq_handle;
if (abi_ver > 5) {
cmd->sq_sig_all = attr->sq_sig_all;
cmd->qp_type = attr->qp_type;
cmd->is_srq = !!attr->srq;
+ cmd->reserved = 0;
if (write(pd->context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
+
qp->handle = resp->qp_handle;
qp->qp_num = resp->qpn;
cmd->alt_dest.is_global = attr->alt_ah_attr.is_global;
cmd->alt_dest.port_num = attr->alt_ah_attr.port_num;
+ cmd->reserved[0] = cmd->reserved[1] = 0;
+
if (write(qp->context->cmd_fd, cmd, cmd_size) != cmd_size)
return errno;
if (write(ibqp->context->cmd_fd, cmd, cmd_size) != cmd_size)
ret = errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
wr_count = resp.bad_wr;
if (wr_count) {
i = wr;
if (write(ibqp->context->cmd_fd, cmd, cmd_size) != cmd_size)
ret = errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
wr_count = resp.bad_wr;
if (wr_count) {
i = wr;
if (write(srq->context->cmd_fd, cmd, cmd_size) != cmd_size)
ret = errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
wr_count = resp.bad_wr;
if (wr_count) {
i = wr;
if (write(pd->context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
ah->handle = resp.handle;
return 0;
if (write(qp->context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)
return errno;
+ VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
+
pthread_mutex_lock(&qp->mutex);
while (qp->events_completed != resp.events_reported)
pthread_cond_wait(&qp->cond, &qp->mutex);