Date: Mon, 7 Jan 2008 21:12:34 GMT From: Steve Wise <swise@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 132736 for review Message-ID: <200801072112.m07LCYDi041857@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132736 Change 132736 by swise@swise:vic10:iwarp on 2008/01/07 21:12:19 get rid of uprintfs. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#3 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ #define PFX "krping: " static int debug = 1; -#define DEBUG_LOG if (debug) uprintf +#define DEBUG_LOG if (debug) printf MODULE_AUTHOR("Steve Wise"); MODULE_DESCRIPTION("RDMA ping server"); @@ -225,7 +225,7 @@ int ret; struct krping_cb *cb = cma_id->context; - DEBUG_LOG("cma_event type %d cma_id %p (%s)\n", event->event, cma_id, + DEBUG_LOG(PFX "cma_event type %d cma_id %p (%s)\n", event->event, cma_id, (cma_id == cb->cm_id) ? "parent" : "child"); mtx_lock_spin(&cb->lock); @@ -234,7 +234,7 @@ cb->state = ADDR_RESOLVED; ret = rdma_resolve_route(cma_id, 2000); if (ret) { - uprintf(PFX "rdma_resolve_route error %d\n", + DEBUG_LOG(PFX "rdma_resolve_route error %d\n", ret); wakeup(cb); } @@ -248,12 +248,12 @@ case RDMA_CM_EVENT_CONNECT_REQUEST: cb->state = CONNECT_REQUEST; cb->child_cm_id = cma_id; - DEBUG_LOG("child cma %p\n", cb->child_cm_id); + DEBUG_LOG(PFX "child cma %p\n", cb->child_cm_id); wakeup(cb); break; case RDMA_CM_EVENT_ESTABLISHED: - DEBUG_LOG("ESTABLISHED\n"); + DEBUG_LOG(PFX "ESTABLISHED\n"); if (!cb->server) { cb->state = CONNECTED; wakeup(cb); @@ -265,7 +265,7 @@ case RDMA_CM_EVENT_CONNECT_ERROR: case RDMA_CM_EVENT_UNREACHABLE: case RDMA_CM_EVENT_REJECTED: - uprintf(PFX "cma event %d, error %d\n", event->event, + DEBUG_LOG(PFX "cma event %d, error %d\n", event->event, event->status); cb->state = ERROR; wakeup(cb); @@ -282,7 +282,7 @@ break; default: - uprintf(PFX "oof bad type!\n"); + DEBUG_LOG(PFX "oof bad type!\n"); wakeup(cb); break; } @@ -293,7 +293,7 @@ static int server_recv(struct krping_cb *cb, struct ib_wc *wc) { if (wc->byte_len != sizeof(cb->recv_buf)) { - uprintf(PFX "Received bogus data, size %d\n", + DEBUG_LOG(PFX "Received bogus data, size %d\n", wc->byte_len); return -1; } @@ -301,7 +301,7 @@ cb->remote_rkey = ntohl(cb->recv_buf.rkey); cb->remote_addr = ntohll(cb->recv_buf.buf); cb->remote_len = ntohl(cb->recv_buf.size); - DEBUG_LOG("Received rkey %x addr %llx len %d from peer\n", + DEBUG_LOG(PFX "Received rkey %x addr %llx len %d from peer\n", cb->remote_rkey, (unsigned long long)cb->remote_addr, cb->remote_len); @@ -318,7 +318,7 @@ static int client_recv(struct krping_cb *cb, struct ib_wc *wc) { if (wc->byte_len != sizeof(cb->recv_buf)) { - uprintf(PFX "Received bogus data, size %d\n", + DEBUG_LOG(PFX "Received bogus data, size %d\n", wc->byte_len); return -1; } @@ -343,27 +343,27 @@ mtx_lock_spin(&cb->lock); BUG_ON(cb->cq != cq); if (cb->state == ERROR) { - uprintf(PFX "cq completion in ERROR state\n"); + DEBUG_LOG(PFX "cq completion in ERROR state\n"); mtx_unlock_spin(&cb->lock); return; } ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP); while ((ret = ib_poll_cq(cb->cq, 1, &wc)) == 1) { if (wc.status) { - uprintf(PFX "cq completion failed status %d\n", + DEBUG_LOG(PFX "cq completion failed status %d\n", wc.status); goto error; } switch (wc.opcode) { case IB_WC_SEND: - DEBUG_LOG("send completion\n"); + DEBUG_LOG(PFX "send completion\n"); cb->stats.send_bytes += cb->send_sgl.length; cb->stats.send_msgs++; break; case IB_WC_RDMA_WRITE: - DEBUG_LOG("rdma write completion\n"); + DEBUG_LOG(PFX "rdma write completion\n"); cb->stats.write_bytes += cb->rdma_sq_wr.sg_list->length; cb->stats.write_msgs++; cb->state = RDMA_WRITE_COMPLETE; @@ -371,7 +371,7 @@ break; case IB_WC_RDMA_READ: - DEBUG_LOG("rdma read completion\n"); + DEBUG_LOG(PFX "rdma read completion\n"); cb->stats.read_bytes += cb->rdma_sq_wr.sg_list->length; cb->stats.read_msgs++; cb->state = RDMA_READ_COMPLETE; @@ -379,19 +379,19 @@ break; case IB_WC_RECV: - DEBUG_LOG("recv completion\n"); + DEBUG_LOG(PFX "recv completion\n"); cb->stats.recv_bytes += sizeof(cb->recv_buf); cb->stats.recv_msgs++; ret = cb->server ? server_recv(cb, &wc) : client_recv(cb, &wc); if (ret) { - uprintf(PFX "recv wc error: %d\n", ret); + DEBUG_LOG(PFX "recv wc error: %d\n", ret); goto error; } ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr); if (ret) { - uprintf(PFX "post recv error: %d\n", + DEBUG_LOG(PFX "post recv error: %d\n", ret); goto error; } @@ -399,12 +399,12 @@ break; default: - DEBUG_LOG("unknown!!!!! completion\n"); + DEBUG_LOG(PFX "unknown!!!!! completion\n"); goto error; } } if (ret) { - uprintf(PFX "poll error %d\n", ret); + DEBUG_LOG(PFX "poll error %d\n", ret); goto error; } mtx_unlock_spin(&cb->lock); @@ -420,7 +420,7 @@ struct rdma_conn_param conn_param; int ret; - DEBUG_LOG("accepting client connection request\n"); + DEBUG_LOG(PFX "accepting client connection request\n"); memset(&conn_param, 0, sizeof conn_param); conn_param.responder_resources = 1; @@ -428,13 +428,13 @@ ret = rdma_accept(cb->child_cm_id, &conn_param); if (ret) { - uprintf(PFX "rdma_accept error: %d\n", ret); + DEBUG_LOG(PFX "rdma_accept error: %d\n", ret); return ret; } krping_wait(cb, CONNECTED); if (cb->state == ERROR) { - uprintf(PFX "wait for CONNECTED state %d\n", cb->state); + DEBUG_LOG(PFX "wait for CONNECTED state %d\n", cb->state); return -1; } return 0; @@ -474,13 +474,13 @@ { int ret; - DEBUG_LOG("krping_setup_buffers called on cb %p\n", cb); + DEBUG_LOG(PFX "krping_setup_buffers called on cb %p\n", cb); cb->dma_mr = ib_get_dma_mr(cb->pd, IB_ACCESS_LOCAL_WRITE| IB_ACCESS_REMOTE_READ| IB_ACCESS_REMOTE_WRITE); if (IS_ERR(cb->dma_mr)) { - uprintf(PFX "recv_buf reg_mr failed\n"); + DEBUG_LOG(PFX "recv_buf reg_mr failed\n"); return PTR_ERR(cb->dma_mr); } @@ -488,7 +488,7 @@ 4096, 1024*1024); if (!cb->rdma_buf) { - uprintf(PFX "rdma_buf malloc failed\n"); + DEBUG_LOG(PFX "rdma_buf malloc failed\n"); ret = -ENOMEM; goto err1; } @@ -497,14 +497,14 @@ cb->start_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK, 0, (1L<<22), 4096, 1024*1024); if (!cb->start_buf) { - uprintf(PFX "start_buf malloc failed\n"); + DEBUG_LOG(PFX "start_buf malloc failed\n"); ret = -ENOMEM; goto err2; } } krping_setup_wr(cb); - DEBUG_LOG("allocated & registered buffers...\n"); + DEBUG_LOG(PFX "allocated & registered buffers...\n"); return 0; err2: contigfree(cb->rdma_buf, cb->size, M_DEVBUF); @@ -515,7 +515,7 @@ static void krping_free_buffers(struct krping_cb *cb) { - DEBUG_LOG("krping_free_buffers called on cb %p\n", cb); + DEBUG_LOG(PFX "krping_free_buffers called on cb %p\n", cb); #if 0 dma_unmap_single(cb->pd->device->dma_device, @@ -577,32 +577,32 @@ int ret; cb->pd = ib_alloc_pd(cm_id->device); if (IS_ERR(cb->pd)) { - uprintf(PFX "ib_alloc_pd failed\n"); + DEBUG_LOG(PFX "ib_alloc_pd failed\n"); return PTR_ERR(cb->pd); } - DEBUG_LOG("created pd %p\n", cb->pd); + DEBUG_LOG(PFX "created pd %p\n", cb->pd); cb->cq = ib_create_cq(cm_id->device, krping_cq_event_handler, NULL, cb, RPING_SQ_DEPTH * 2, 0); if (IS_ERR(cb->cq)) { - uprintf(PFX "ib_create_cq failed\n"); + DEBUG_LOG(PFX "ib_create_cq failed\n"); ret = PTR_ERR(cb->cq); goto err1; } - DEBUG_LOG("created cq %p\n", cb->cq); + DEBUG_LOG(PFX "created cq %p\n", cb->cq); ret = ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP); if (ret) { - uprintf(PFX "ib_create_cq failed\n"); + DEBUG_LOG(PFX "ib_create_cq failed\n"); goto err2; } ret = krping_create_qp(cb); if (ret) { - uprintf(PFX "krping_create_qp failed: %d\n", ret); + DEBUG_LOG(PFX "krping_create_qp failed: %d\n", ret); goto err2; } - DEBUG_LOG("created qp %p\n", cb->qp); + DEBUG_LOG(PFX "created qp %p\n", cb->qp); return 0; err2: ib_destroy_cq(cb->cq); @@ -620,7 +620,7 @@ info->rkey = htonl(mr->rkey); info->size = htonl(cb->size); - DEBUG_LOG("RDMA addr %llx rkey %x len %d\n", + DEBUG_LOG(PFX "RDMA addr %llx rkey %x len %d\n", (unsigned long long)buf, mr->rkey, cb->size); } @@ -633,12 +633,12 @@ /* Wait for client's Start STAG/TO/Len */ krping_wait(cb, RDMA_READ_ADV); if (cb->state != RDMA_READ_ADV) { - uprintf(PFX "wait for RDMA_READ_ADV state %d\n", + DEBUG_LOG(PFX "wait for RDMA_READ_ADV state %d\n", cb->state); break; } - DEBUG_LOG("server received sink adv\n"); + DEBUG_LOG(PFX "server received sink adv\n"); /* Issue RDMA Read. */ cb->rdma_sq_wr.opcode = IB_WR_RDMA_READ; @@ -648,78 +648,78 @@ ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } - DEBUG_LOG("server posted rdma read req \n"); + DEBUG_LOG(PFX "server posted rdma read req \n"); /* Wait for read completion */ krping_wait(cb, RDMA_READ_COMPLETE); if (cb->state != RDMA_READ_COMPLETE) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_READ_COMPLETE state %d\n", cb->state); break; } - DEBUG_LOG("server received read complete\n"); + DEBUG_LOG(PFX "server received read complete\n"); /* Display data in recv buf */ if (cb->verbose) - uprintf("server ping data: %s\n", cb->rdma_buf); + DEBUG_LOG("server ping data: %s\n", cb->rdma_buf); /* Tell client to continue */ ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } - DEBUG_LOG("server posted go ahead\n"); + DEBUG_LOG(PFX "server posted go ahead\n"); /* Wait for client's RDMA STAG/TO/Len */ krping_wait(cb, RDMA_WRITE_ADV); if (cb->state != RDMA_WRITE_ADV) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_ADV state %d\n", cb->state); break; } - DEBUG_LOG("server received sink adv\n"); + DEBUG_LOG(PFX "server received sink adv\n"); /* RDMA Write echo data */ cb->rdma_sq_wr.opcode = IB_WR_RDMA_WRITE; cb->rdma_sq_wr.wr.rdma.rkey = cb->remote_rkey; cb->rdma_sq_wr.wr.rdma.remote_addr = cb->remote_addr; cb->rdma_sq_wr.sg_list->length = strlen(cb->rdma_buf) + 1; - DEBUG_LOG("rdma write from lkey %x laddr %llx len %d\n", + DEBUG_LOG(PFX "rdma write from lkey %x laddr %llx len %d\n", cb->rdma_sq_wr.sg_list->lkey, (unsigned long long)cb->rdma_sq_wr.sg_list->addr, cb->rdma_sq_wr.sg_list->length); ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } /* Wait for completion */ krping_wait(cb, RDMA_WRITE_COMPLETE); if (cb->state != RDMA_WRITE_COMPLETE) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_COMPLETE state %d\n", cb->state); break; } - DEBUG_LOG("server rdma write complete \n"); + DEBUG_LOG(PFX "server rdma write complete \n"); cb->state = CONNECTED; /* Tell client to begin again */ ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } - DEBUG_LOG("server posted go ahead\n"); + DEBUG_LOG(PFX "server posted go ahead\n"); } } @@ -735,21 +735,21 @@ ret = rdma_bind_addr(cb->cm_id, (struct sockaddr *) &sin); if (ret) { - uprintf(PFX "rdma_bind_addr error %d\n", ret); + DEBUG_LOG(PFX "rdma_bind_addr error %d\n", ret); return ret; } - DEBUG_LOG("rdma_bind_addr successful\n"); + DEBUG_LOG(PFX "rdma_bind_addr successful\n"); - DEBUG_LOG("rdma_listen\n"); + DEBUG_LOG(PFX "rdma_listen\n"); ret = rdma_listen(cb->cm_id, 3); if (ret) { - uprintf(PFX "rdma_listen failed: %d\n", ret); + DEBUG_LOG(PFX "rdma_listen failed: %d\n", ret); return ret; } krping_wait(cb, CONNECT_REQUEST); if (cb->state != CONNECT_REQUEST) { - uprintf(PFX "wait for CONNECT_REQUEST state %d\n", + DEBUG_LOG(PFX "wait for CONNECT_REQUEST state %d\n", cb->state); return -1; } @@ -768,25 +768,25 @@ ret = krping_setup_qp(cb, cb->child_cm_id); if (ret) { - uprintf(PFX "setup_qp failed: %d\n", ret); + DEBUG_LOG(PFX "setup_qp failed: %d\n", ret); return; } ret = krping_setup_buffers(cb); if (ret) { - uprintf(PFX "krping_setup_buffers failed: %d\n", ret); + DEBUG_LOG(PFX "krping_setup_buffers failed: %d\n", ret); goto err1; } ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr); if (ret) { - uprintf(PFX "ib_post_recv failed: %d\n", ret); + DEBUG_LOG(PFX "ib_post_recv failed: %d\n", ret); goto err2; } ret = krping_accept(cb); if (ret) { - uprintf(PFX "connect error %d\n", ret); + DEBUG_LOG(PFX "connect error %d\n", ret); goto err2; } @@ -825,14 +825,14 @@ krping_format_send(cb, cb->start_addr, cb->dma_mr); ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } /* Wait for server to ACK */ krping_wait(cb, RDMA_WRITE_ADV); if (cb->state != RDMA_WRITE_ADV) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_ADV state %d\n", cb->state); break; @@ -841,14 +841,14 @@ krping_format_send(cb, cb->rdma_addr, cb->dma_mr); ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } /* Wait for the server to say the RDMA Write is complete. */ krping_wait(cb, RDMA_WRITE_COMPLETE); if (cb->state != RDMA_WRITE_COMPLETE) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_COMPLETE state %d\n", cb->state); break; @@ -856,12 +856,12 @@ if (cb->validate) if (memcmp(cb->start_buf, cb->rdma_buf, cb->size)) { - uprintf(PFX "data mismatch!\n"); + DEBUG_LOG(PFX "data mismatch!\n"); break; } if (cb->verbose) - uprintf("ping data: %s\n", cb->rdma_buf); + DEBUG_LOG("ping data: %s\n", cb->rdma_buf); } } @@ -877,17 +877,17 @@ ret = rdma_connect(cb->cm_id, &conn_param); if (ret) { - uprintf(PFX "rdma_connect error %d\n", ret); + DEBUG_LOG(PFX "rdma_connect error %d\n", ret); return ret; } krping_wait(cb, CONNECTED); if (cb->state == ERROR) { - uprintf(PFX "wait for CONNECTED state %d\n", cb->state); + DEBUG_LOG(PFX "wait for CONNECTED state %d\n", cb->state); return -1; } - DEBUG_LOG("rdma_connect successful\n"); + DEBUG_LOG(PFX "rdma_connect successful\n"); return 0; } @@ -904,19 +904,19 @@ ret = rdma_resolve_addr(cb->cm_id, NULL, (struct sockaddr *) &sin, 2000); if (ret) { - uprintf(PFX "rdma_resolve_addr error %d\n", ret); + DEBUG_LOG(PFX "rdma_resolve_addr error %d\n", ret); return ret; } krping_wait(cb, ROUTE_RESOLVED); if (cb->state != ROUTE_RESOLVED) { - uprintf(PFX + DEBUG_LOG(PFX "addr/route resolution did not resolve: state %d\n", cb->state); return -EINTR; } - DEBUG_LOG("rdma_resolve_addr - rdma_resolve_route successful\n"); + DEBUG_LOG(PFX "rdma_resolve_addr - rdma_resolve_route successful\n"); return 0; } @@ -931,25 +931,25 @@ ret = krping_setup_qp(cb, cb->cm_id); if (ret) { - uprintf(PFX "setup_qp failed: %d\n", ret); + DEBUG_LOG(PFX "setup_qp failed: %d\n", ret); return; } ret = krping_setup_buffers(cb); if (ret) { - uprintf(PFX "krping_setup_buffers failed: %d\n", ret); + DEBUG_LOG(PFX "krping_setup_buffers failed: %d\n", ret); goto err1; } ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr); if (ret) { - uprintf(PFX "ib_post_recv failed: %d\n", ret); + DEBUG_LOG(PFX "ib_post_recv failed: %d\n", ret); goto err2; } ret = krping_connect_client(cb); if (ret) { - uprintf(PFX "connect error %d\n", ret); + DEBUG_LOG(PFX "connect error %d\n", ret); goto err2; } @@ -988,57 +988,57 @@ switch (op) { case 'a': cb->addr_str = optarg; - DEBUG_LOG("ipaddr (%s)\n", optarg); + DEBUG_LOG(PFX "ipaddr (%s)\n", optarg); if (!inet_aton(optarg, &cb->addr)) { - uprintf(PFX "bad addr string %s\n", optarg); + DEBUG_LOG(PFX "bad addr string %s\n", optarg); ret = -EINVAL; } break; case 'p': cb->port = htons(optint); - DEBUG_LOG("port %d\n", (int)optint); + DEBUG_LOG(PFX "port %d\n", (int)optint); break; case 's': cb->server = 1; - DEBUG_LOG("server\n"); + DEBUG_LOG(PFX "server\n"); break; case 'c': cb->server = 0; - DEBUG_LOG("client\n"); + DEBUG_LOG(PFX "client\n"); break; case 'S': cb->size = optint; if ((cb->size < 1) || (cb->size > RPING_BUFSIZE)) { - uprintf(PFX "Invalid size %d " + DEBUG_LOG(PFX "Invalid size %d " "(valid range is 1 to %d)\n", cb->size, RPING_BUFSIZE); ret = EINVAL; } else - DEBUG_LOG("size %d\n", (int)optint); + DEBUG_LOG(PFX "size %d\n", (int)optint); break; case 'C': cb->count = optint; if (cb->count < 0) { - uprintf(PFX "Invalid count %d\n", + DEBUG_LOG(PFX "Invalid count %d\n", cb->count); ret = EINVAL; } else - DEBUG_LOG("count %d\n", (int) cb->count); + DEBUG_LOG(PFX "count %d\n", (int) cb->count); break; case 'v': cb->verbose++; - DEBUG_LOG("verbose\n"); + DEBUG_LOG(PFX "verbose\n"); break; case 'V': cb->validate++; - DEBUG_LOG("validate data\n"); + DEBUG_LOG(PFX "validate data\n"); break; case 'd': debug++; break; default: - uprintf(PFX "unknown opt %s\n", optarg); + DEBUG_LOG(PFX "unknown opt %s\n", optarg); ret = -EINVAL; break; } @@ -1047,7 +1047,7 @@ goto out; if (cb->server == -1) { - uprintf(PFX "must be either client or server\n"); + DEBUG_LOG(PFX "must be either client or server\n"); ret = EINVAL; goto out; } @@ -1055,15 +1055,15 @@ cb->cm_id = rdma_create_id(krping_cma_event_handler, cb, RDMA_PS_TCP); if (IS_ERR(cb->cm_id)) { ret = PTR_ERR(cb->cm_id); - uprintf(PFX "rdma_create_id error %d\n", ret); + DEBUG_LOG(PFX "rdma_create_id error %d\n", ret); goto out; } - DEBUG_LOG("created cm_id %p\n", cb->cm_id); + DEBUG_LOG(PFX "created cm_id %p\n", cb->cm_id); if (cb->server) krping_run_server(cb); else krping_run_client(cb); - DEBUG_LOG("destroy cm_id %p\n", cb->cm_id); + DEBUG_LOG(PFX "destroy cm_id %p\n", cb->cm_id); rdma_destroy_id(cb->cm_id); out: mtx_lock(&krping_mutex);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801072112.m07LCYDi041857>