d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgbe/t4_tom: Tweaks to some of the AIO related CTRs.

Browse Source 
Reviewed by:	jhb@
MFC after:	1 week
Sponsored by:	Chelsio Communications
This commit is contained in:
Navdeep Parhar 2019-06-28 19:57:42 +00:00
parent 773123546b
commit 8674e626c6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349517
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/cxgbe/tom/t4_cpl_io.c
View File

@ -724,8 +724,8 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
("%s: ulp_mode %u for toep %p", __func__, toep->ulp_mode, toep)); ("%s: ulp_mode %u for toep %p", __func__, toep->ulp_mode, toep));
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR4(KTR_CXGBE, "%s: tid %d toep flags %#x tp flags %#x drop %d", CTR5(KTR_CXGBE, "%s: tid %d toep flags %#x tp flags %#x drop %d",
__func__, toep->tid, toep->flags, tp->t_flags); __func__, toep->tid, toep->flags, tp->t_flags, drop);
#endif #endif
if (__predict_false(toep->flags & TPF_ABORT_SHUTDOWN)) if (__predict_false(toep->flags & TPF_ABORT_SHUTDOWN))
return; return;
@ -1244,8 +1244,10 @@ do_peer_close(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
INP_WLOCK(inp); INP_WLOCK(inp);
tp = intotcpcb(inp); tp = intotcpcb(inp);
CTR5(KTR_CXGBE, "%s: tid %u (%s), toep_flags 0x%x, inp %p", __func__, CTR6(KTR_CXGBE,
tid, tp ? tcpstates[tp->t_state] : "no tp", toep->flags, inp); "%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) if (toep->flags & TPF_ABORT_SHUTDOWN)
goto done; goto done;
@ -2227,7 +2229,7 @@ t4_aiotx_queue_toep(struct socket *so, struct toepcb *toep)
SOCKBUF_LOCK_ASSERT(&toep->inp->inp_socket->so_snd); SOCKBUF_LOCK_ASSERT(&toep->inp->inp_socket->so_snd);
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR3(KTR_CXGBE, "%s: queueing aiotx task for tid %d, active = %s", 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 #endif
if (toep->aiotx_so != NULL) if (toep->aiotx_so != NULL)
return; return;
@ -2283,7 +2285,7 @@ t4_aio_queue_aiotx(struct socket *so, struct kaiocb *job)
SOCKBUF_LOCK(&so->so_snd); SOCKBUF_LOCK(&so->so_snd);
#ifdef VERBOSE_TRACES #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 #endif
if (!aio_set_cancel_function(job, t4_aiotx_cancel)) if (!aio_set_cancel_function(job, t4_aiotx_cancel))
panic("new job was cancelled"); panic("new job was cancelled");

20
sys/dev/cxgbe/tom/t4_ddp.c
View File

@ -263,8 +263,8 @@ complete_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db,
} else } else
toep->ddp.active_id ^= 1; toep->ddp.active_id ^= 1;
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR2(KTR_CXGBE, "%s: ddp_active_id = %d", __func__, CTR3(KTR_CXGBE, "%s: tid %u, ddp_active_id = %d", __func__,
toep->ddp.active_id); toep->tid, toep->ddp.active_id);
#endif #endif
} else { } else {
KASSERT(toep->ddp.active_count != 0 && KASSERT(toep->ddp.active_count != 0 &&
@ -534,8 +534,8 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len)
tp->rcv_wnd -= len; tp->rcv_wnd -= len;
#endif #endif
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR4(KTR_CXGBE, "%s: DDP[%d] placed %d bytes (%#x)", __func__, db_idx, CTR5(KTR_CXGBE, "%s: tid %u, DDP[%d] placed %d bytes (%#x)", __func__,
len, report); toep->tid, db_idx, len, report);
#endif #endif
/* receive buffer autosize */ /* receive buffer autosize */
@ -574,8 +574,9 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len)
} else { } else {
copied = job->aio_received; copied = job->aio_received;
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR4(KTR_CXGBE, "%s: completing %p (copied %ld, placed %d)", CTR5(KTR_CXGBE,
__func__, job, copied, len); "%s: tid %u, completing %p (copied %ld, placed %d)",
__func__, toep->tid, job, copied, len);
#endif #endif
aio_complete(job, copied + len, 0); aio_complete(job, copied + len, 0);
t4_rcvd(&toep->td->tod, tp); t4_rcvd(&toep->td->tod, tp);
@ -1792,8 +1793,9 @@ aio_ddp_requeue(struct toepcb *toep)
} }
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR5(KTR_CXGBE, "%s: scheduling %p for DDP[%d] (flags %#lx/%#lx)", CTR6(KTR_CXGBE,
__func__, job, db_idx, ddp_flags, ddp_flags_mask); "%s: tid %u, scheduling %p for DDP[%d] (flags %#lx/%#lx)", __func__,
toep->tid, job, db_idx, ddp_flags, ddp_flags_mask);
#endif #endif
/* Give the chip the go-ahead. */ /* Give the chip the go-ahead. */
t4_wrq_tx(sc, wr); t4_wrq_tx(sc, wr);
@ -1919,7 +1921,7 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job)
*/ */
#ifdef VERBOSE_TRACES #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 #endif
if (!aio_set_cancel_function(job, t4_aio_cancel_queued)) if (!aio_set_cancel_function(job, t4_aio_cancel_queued))
panic("new job was cancelled"); panic("new job was cancelled");