Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 28 Jun 2019 19:57:42 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r349517 - head/sys/dev/cxgbe/tom
Message-ID:  <201906281957.x5SJvgNI080084@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Fri Jun 28 19:57:42 2019
New Revision: 349517
URL: https://svnweb.freebsd.org/changeset/base/349517

Log:
  cxgbe/t4_tom: Tweaks to some of the AIO related CTRs.
  
  Reviewed by:	jhb@
  MFC after:	1 week
  Sponsored by:	Chelsio Communications

Modified:
  head/sys/dev/cxgbe/tom/t4_cpl_io.c
  head/sys/dev/cxgbe/tom/t4_ddp.c

Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_cpl_io.c	Fri Jun 28 19:49:47 2019	(r349516)
+++ head/sys/dev/cxgbe/tom/t4_cpl_io.c	Fri Jun 28 19:57:42 2019	(r349517)
@@ -724,8 +724,8 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep
 	    ("%s: ulp_mode %u for toep %p", __func__, toep->ulp_mode, toep));
 
 #ifdef VERBOSE_TRACES
-	CTR4(KTR_CXGBE, "%s: tid %d toep flags %#x tp flags %#x drop %d",
-	    __func__, toep->tid, toep->flags, tp->t_flags);
+	CTR5(KTR_CXGBE, "%s: tid %d toep flags %#x tp flags %#x drop %d",
+	    __func__, toep->tid, toep->flags, tp->t_flags, drop);
 #endif
 	if (__predict_false(toep->flags & TPF_ABORT_SHUTDOWN))
 		return;
@@ -1244,8 +1244,10 @@ do_peer_close(struct sge_iq *iq, const struct rss_head
 	INP_WLOCK(inp);
 	tp = intotcpcb(inp);
 
-	CTR5(KTR_CXGBE, "%s: tid %u (%s), toep_flags 0x%x, inp %p", __func__,
-	    tid, tp ? tcpstates[tp->t_state] : "no tp", toep->flags, inp);
+	CTR6(KTR_CXGBE,
+	    "%s: tid %u (%s), toep_flags 0x%x, ddp_flags 0x%x, inp %p",
+	    __func__, tid, tp ? tcpstates[tp->t_state] : "no tp", toep->flags,
+	    toep->ddp.flags, inp);
 
 	if (toep->flags & TPF_ABORT_SHUTDOWN)
 		goto done;
@@ -2227,7 +2229,7 @@ t4_aiotx_queue_toep(struct socket *so, struct toepcb *
 	SOCKBUF_LOCK_ASSERT(&toep->inp->inp_socket->so_snd);
 #ifdef VERBOSE_TRACES
 	CTR3(KTR_CXGBE, "%s: queueing aiotx task for tid %d, active = %s",
-	    __func__, toep->tid, toep->aiotx_task_active ? "true" : "false");
+	    __func__, toep->tid, toep->aiotx_so != NULL ? "true" : "false");
 #endif
 	if (toep->aiotx_so != NULL)
 		return;
@@ -2283,7 +2285,7 @@ t4_aio_queue_aiotx(struct socket *so, struct kaiocb *j
 
 	SOCKBUF_LOCK(&so->so_snd);
 #ifdef VERBOSE_TRACES
-	CTR2(KTR_CXGBE, "%s: queueing %p", __func__, job);
+	CTR3(KTR_CXGBE, "%s: queueing %p for tid %u", __func__, job, toep->tid);
 #endif
 	if (!aio_set_cancel_function(job, t4_aiotx_cancel))
 		panic("new job was cancelled");

Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_ddp.c	Fri Jun 28 19:49:47 2019	(r349516)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c	Fri Jun 28 19:57:42 2019	(r349517)
@@ -263,8 +263,8 @@ complete_ddp_buffer(struct toepcb *toep, struct ddp_bu
 		} else
 			toep->ddp.active_id ^= 1;
 #ifdef VERBOSE_TRACES
-		CTR2(KTR_CXGBE, "%s: ddp_active_id = %d", __func__,
-		    toep->ddp.active_id);
+		CTR3(KTR_CXGBE, "%s: tid %u, ddp_active_id = %d", __func__,
+		    toep->tid, toep->ddp.active_id);
 #endif
 	} else {
 		KASSERT(toep->ddp.active_count != 0 &&
@@ -534,8 +534,8 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report
 	tp->rcv_wnd -= len;
 #endif
 #ifdef VERBOSE_TRACES
-	CTR4(KTR_CXGBE, "%s: DDP[%d] placed %d bytes (%#x)", __func__, db_idx,
-	    len, report);
+	CTR5(KTR_CXGBE, "%s: tid %u, DDP[%d] placed %d bytes (%#x)", __func__,
+	    toep->tid, db_idx, len, report);
 #endif
 
 	/* receive buffer autosize */
@@ -574,8 +574,9 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report
 	} else {
 		copied = job->aio_received;
 #ifdef VERBOSE_TRACES
-		CTR4(KTR_CXGBE, "%s: completing %p (copied %ld, placed %d)",
-		    __func__, job, copied, len);
+		CTR5(KTR_CXGBE,
+		    "%s: tid %u, completing %p (copied %ld, placed %d)",
+		    __func__, toep->tid, job, copied, len);
 #endif
 		aio_complete(job, copied + len, 0);
 		t4_rcvd(&toep->td->tod, tp);
@@ -1792,8 +1793,9 @@ sbcopy:
 	}
 
 #ifdef VERBOSE_TRACES
-	CTR5(KTR_CXGBE, "%s: scheduling %p for DDP[%d] (flags %#lx/%#lx)",
-	    __func__, job, db_idx, ddp_flags, ddp_flags_mask);
+	CTR6(KTR_CXGBE,
+	    "%s: tid %u, scheduling %p for DDP[%d] (flags %#lx/%#lx)", __func__,
+	    toep->tid, job, db_idx, ddp_flags, ddp_flags_mask);
 #endif
 	/* Give the chip the go-ahead. */
 	t4_wrq_tx(sc, wr);
@@ -1919,7 +1921,7 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job
 	 */
 
 #ifdef VERBOSE_TRACES
-	CTR2(KTR_CXGBE, "%s: queueing %p", __func__, job);
+	CTR3(KTR_CXGBE, "%s: queueing %p for tid %u", __func__, job, toep->tid);
 #endif
 	if (!aio_set_cancel_function(job, t4_aio_cancel_queued))
 		panic("new job was cancelled");

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