Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 12 Mar 2015 06:25:42 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r279900 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei
Message-ID:  <201503120625.t2C6PglQ096338@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Thu Mar 12 06:25:41 2015
New Revision: 279900
URL: https://svnweb.freebsd.org/changeset/base/279900

Log:
  Messages logged via CTR should not be terminated with \n.

Modified:
  projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
  projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.c

Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c	Thu Mar 12 03:57:19 2015	(r279899)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c	Thu Mar 12 06:25:41 2015	(r279900)
@@ -414,14 +414,14 @@ cxgbei_task_reserve_itt(struct icl_conn 
 	if ((scmd->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
 		tdata->nsge = cxgbei_map_sg(tdata->sgl, scmd);
 		if (tdata->nsge == 0) {
-			CTR1(KTR_CXGBE, "%s: map_sg failed\n", __func__);
+			CTR1(KTR_CXGBE, "%s: map_sg failed", __func__);
 			return 0;
 		}
 		sge = tdata->sgl;
 
 		tdata->sc_ddp_tag = *itt;
 
-		CTR3(KTR_CXGBE, "%s: *itt:0x%x sc_ddp_tag:0x%x\n",
+		CTR3(KTR_CXGBE, "%s: *itt:0x%x sc_ddp_tag:0x%x",
 				__func__, *itt, tdata->sc_ddp_tag);
 		if (cxgbei_ulp2_sw_tag_usable(&ci->tag_format,
 							tdata->sc_ddp_tag)) {
@@ -429,7 +429,7 @@ cxgbei_task_reserve_itt(struct icl_conn 
 			    sge, tdata->nsge, &tdata->sc_ddp_tag);
 		} else {
 			CTR3(KTR_CXGBE,
-				"%s: itt:0x%x sc_ddp_tag:0x%x not usable\n",
+				"%s: itt:0x%x sc_ddp_tag:0x%x not usable",
 				__func__, *itt, tdata->sc_ddp_tag);
 		}
 	}
@@ -461,7 +461,7 @@ cxgbei_task_reserve_ttt(struct icl_conn 
 		goto out;
 	tdata->nsge = cxgbei_map_sg_tgt(tdata->sgl, io);
 	if (tdata->nsge == 0) {
-		CTR1(KTR_CXGBE, "%s: map_sg failed\n", __func__);
+		CTR1(KTR_CXGBE, "%s: map_sg failed", __func__);
 		return 0;
 	}
 	sge = tdata->sgl;
@@ -471,7 +471,7 @@ cxgbei_task_reserve_ttt(struct icl_conn 
 		err = t4_sk_ddp_tag_reserve(ci, isock, xferlen, sge,
 		    tdata->nsge, &tdata->sc_ddp_tag);
 	} else {
-		CTR2(KTR_CXGBE, "%s: sc_ddp_tag:0x%x not usable\n",
+		CTR2(KTR_CXGBE, "%s: sc_ddp_tag:0x%x not usable",
 				__func__, tdata->sc_ddp_tag);
 	}
 out:
@@ -589,7 +589,7 @@ process_rx_iscsi_hdr(struct toepcb *toep
 		/* we only update tp->rcv_nxt once per pdu */
 		if (cb->seq != tp->rcv_nxt) {
 			CTR3(KTR_CXGBE,
-			"tid 0x%x, CPL_ISCSI_HDR, BAD seq got 0x%x exp 0x%x.\n",
+			"tid 0x%x, CPL_ISCSI_HDR, BAD seq got 0x%x exp 0x%x.",
 			toep->tid, cb->seq, tp->rcv_nxt);
 			goto err_out1;
 		}
@@ -606,7 +606,7 @@ process_rx_iscsi_hdr(struct toepcb *toep
 
 		tp->rcv_nxt += lcb->ulp.iscsi.pdulen;
 		if (tp->rcv_wnd <= lcb->ulp.iscsi.pdulen)
-			CTR3(KTR_CXGBE, "%s: Neg rcv_wnd:0x%lx pdulen:0x%x\n",
+			CTR3(KTR_CXGBE, "%s: Neg rcv_wnd:0x%lx pdulen:0x%x",
 				__func__, tp->rcv_wnd, lcb->ulp.iscsi.pdulen);
 			tp->rcv_wnd -= lcb->ulp.iscsi.pdulen;
 			tp->t_rcvtime = ticks;
@@ -673,7 +673,7 @@ iscsi_conn_receive_pdu(struct iscsi_sock
 	if (cb->flags & SBUF_ULP_FLAG_DATA_RCVD) {
 		m = mbufq_first(&isock->iscsi_rcvq);
 		if (m == NULL) {
-			CTR1(KTR_CXGBE, "%s:No Data\n", __func__);
+			CTR1(KTR_CXGBE, "%s:No Data", __func__);
 			goto err_out;
 		}
 		mbufq_dequeue(&isock->iscsi_rcvq);
@@ -715,7 +715,7 @@ process_rx_data_ddp(struct toepcb *toep,
 	}
 	lcb = find_ulp_mbuf_cb(isock->mbuf_ulp_lhdr);
 	if (lcb == NULL) {
-		CTR2(KTR_CXGBE, "%s: mtag NULL lmbuf :%p\n", __func__, lmbuf);
+		CTR2(KTR_CXGBE, "%s: mtag NULL lmbuf :%p", __func__, lmbuf);
 		mtx_unlock(&isock->iscsi_rcvq_lock);
 		return;
 	}
@@ -723,9 +723,9 @@ process_rx_data_ddp(struct toepcb *toep,
 	isock->mbuf_ulp_lhdr = NULL;
 
 	if (ntohs(cpl->len) != lcb->ulp.iscsi.pdulen) {
-		CTR3(KTR_CXGBE, "tid 0x%x, RX_DATA_DDP pdulen %u != %u.\n",
+		CTR3(KTR_CXGBE, "tid 0x%x, RX_DATA_DDP pdulen %u != %u.",
 			toep->tid, ntohs(cpl->len), lcb->ulp.iscsi.pdulen);
-		CTR4(KTR_CXGBE, "%s: lmbuf:%p lcb:%p lcb->flags:0x%x\n",
+		CTR4(KTR_CXGBE, "%s: lmbuf:%p lcb:%p lcb->flags:0x%x",
 			__func__, lmbuf, lcb, lcb->flags);
 	}
 

Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.c	Thu Mar 12 03:57:19 2015	(r279899)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.c	Thu Mar 12 06:25:41 2015	(r279900)
@@ -208,7 +208,7 @@ cxgbei_ulp2_ddp_make_gl_from_iscsi_sgvec
 	int i = 1, j = 0;
 
 	if (xferlen <= DDP_THRESHOLD) {
-		CTR2(KTR_CXGBE, "xfer %u < threshold %u, no ddp.\n",
+		CTR2(KTR_CXGBE, "xfer %u < threshold %u, no ddp.",
 			xferlen, DDP_THRESHOLD);
 		return NULL;
 	}
@@ -224,7 +224,7 @@ cxgbei_ulp2_ddp_make_gl_from_iscsi_sgvec
 	gl->offset = sgoffset;
 	gl->pages[0] = sgpage;
 	CTR6(KTR_CXGBE,
-		"%s: xferlen:0x%x len:0x%x off:0x%x sg_addr:%p npages:%d\n",
+		"%s: xferlen:0x%x len:0x%x off:0x%x sg_addr:%p npages:%d",
 		__func__, xferlen, gl->length, gl->offset, sg->sg_addr, npages);
 
 	for (i = 1, sg = sg_next(sg); i < sgcnt; i++, sg = sg_next(sg)) {
@@ -323,13 +323,13 @@ cxgbei_ulp2_ddp_tag_reserve(struct cxgbe
 		}
 	}
 	if (rc) {
-		CTR3(KTR_CXGBE, "xferlen %u, gl %u, npods %u NO DDP.\n",
+		CTR3(KTR_CXGBE, "xferlen %u, gl %u, npods %u NO DDP.",
 			      gl->length, gl->nelem, npods);
 		return (rc);
 	}
 
 	tag = cxgbei_ulp2_ddp_tag_base(idx, ci->colors, tformat, sw_tag);
-	CTR4(KTR_CXGBE, "%s: sw_tag:0x%x idx:0x%x tag:0x%x\n",
+	CTR4(KTR_CXGBE, "%s: sw_tag:0x%x idx:0x%x tag:0x%x",
 			__func__, sw_tag, idx, tag);
 
 	hdr.rsvd = 0;
@@ -367,7 +367,7 @@ cxgbei_ulp2_ddp_tag_release(struct cxgbe
 	MPASS(isock != NULL);
 
 	idx = (tag >> IPPOD_IDX_SHIFT) & ci->idx_mask;
-	CTR3(KTR_CXGBE, "tag:0x%x idx:0x%x nppods:0x%x\n",
+	CTR3(KTR_CXGBE, "tag:0x%x idx:0x%x nppods:0x%x",
 			tag, idx, ci->nppods);
 	if (idx < ci->nppods) {
 		struct cxgbei_ulp2_gather_list *gl = ci->gl_map[idx];
@@ -375,18 +375,18 @@ cxgbei_ulp2_ddp_tag_release(struct cxgbe
 
 		if (!gl || !gl->nelem) {
 			CTR4(KTR_CXGBE,
-				"release 0x%x, idx 0x%x, gl 0x%p, %u.\n",
+				"release 0x%x, idx 0x%x, gl 0x%p, %u.",
 				tag, idx, gl, gl ? gl->nelem : 0);
 			return;
 		}
 		npods = (gl->nelem + IPPOD_PAGES_MAX - 1) >> IPPOD_PAGES_SHIFT;
-		CTR3(KTR_CXGBE, "ddp tag 0x%x, release idx 0x%x, npods %u.\n",
+		CTR3(KTR_CXGBE, "ddp tag 0x%x, release idx 0x%x, npods %u.",
 			      tag, idx, npods);
 		t4_ddp_clear_map(ci, gl, tag, idx, npods, isock);
 		ddp_unmark_entries(ci, idx, npods);
 		cxgbei_ulp2_ddp_release_gl(ci, gl);
 	} else
-		CTR3(KTR_CXGBE, "ddp tag 0x%x, idx 0x%x > max 0x%x.\n",
+		CTR3(KTR_CXGBE, "ddp tag 0x%x, idx 0x%x > max 0x%x.",
 			      tag, idx, ci->nppods);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503120625.t2C6PglQ096338>