diff mbox series

[for-rc,or,next,1/2] IB/hfi1: Indicate DMA wait when txq is queued for wakeup

Message ID 20210706172345.49902.10221.stgit@awfm-01.cornelisnetworks.com (mailing list archive)
State Changes Requested
Delegated to: Jason Gunthorpe
Headers show
Series Second attempt at two small fixups | expand

Commit Message

Dennis Dalessandro July 6, 2021, 5:23 p.m. UTC 
From: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>

There is no counter for dmawait in AIP, which hampers debugging
performance issues.

Add the counter increment when the txq is queued.

Fixes: d99dc602e2a5 ("IB/hfi1: Add functions to transmit datagram ipoib packets")
Fixes: c4cf5688ea69 ("IB/hfi1: Indicate DMA wait when txq is queued for wakeup")
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
---
 drivers/infiniband/hw/hfi1/ipoib_tx.c |    3 +++
 1 file changed, 3 insertions(+)

Comments

Jason Gunthorpe July 12, 2021, 5:42 p.m. UTC | #1 
On Tue, Jul 06, 2021 at 01:23:45PM -0400, Dennis Dalessandro wrote:
> From: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
> 
> There is no counter for dmawait in AIP, which hampers debugging
> performance issues.
> 
> Add the counter increment when the txq is queued.
> 
> Fixes: d99dc602e2a5 ("IB/hfi1: Add functions to transmit datagram ipoib packets")
> Fixes: c4cf5688ea69 ("IB/hfi1: Indicate DMA wait when txq is queued for wakeup")

Neither of these fixes lines are correct, please resend it with
correct fixes lines.

This commit message is not quite good enough to justfy adding a
counter increment to rc, can you explain how this is an existing
counter and it is a bug that this single case was not incremented?

Jason
Dennis Dalessandro July 12, 2021, 7:33 p.m. UTC | #2 
On 7/12/21 1:42 PM, Jason Gunthorpe wrote:
> On Tue, Jul 06, 2021 at 01:23:45PM -0400, Dennis Dalessandro wrote:
>> From: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
>>
>> There is no counter for dmawait in AIP, which hampers debugging
>> performance issues.
>>
>> Add the counter increment when the txq is queued.
>>
>> Fixes: d99dc602e2a5 ("IB/hfi1: Add functions to transmit datagram ipoib packets")
>> Fixes: c4cf5688ea69 ("IB/hfi1: Indicate DMA wait when txq is queued for wakeup")
> 
> Neither of these fixes lines are correct, please resend it with
> correct fixes lines.

I believe the thinking is these are fixes that should have had the counter in
the first place.

> This commit message is not quite good enough to justfy adding a
> counter increment to rc, can you explain how this is an existing
> counter and it is a bug that this single case was not incremented?

Yeah, agree. Fine to go to for-next instead.

I don't know why zero-day builds threw up on this commit. Seems unrelated.

-Denny
Jason Gunthorpe July 13, 2021, midnight UTC | #3 
On Mon, Jul 12, 2021 at 03:33:37PM -0400, Dennis Dalessandro wrote:
> On 7/12/21 1:42 PM, Jason Gunthorpe wrote:
> > On Tue, Jul 06, 2021 at 01:23:45PM -0400, Dennis Dalessandro wrote:
> >> From: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
> >>
> >> There is no counter for dmawait in AIP, which hampers debugging
> >> performance issues.
> >>
> >> Add the counter increment when the txq is queued.
> >>
> >> Fixes: d99dc602e2a5 ("IB/hfi1: Add functions to transmit datagram ipoib packets")
> >> Fixes: c4cf5688ea69 ("IB/hfi1: Indicate DMA wait when txq is queued for wakeup")
> > 
> > Neither of these fixes lines are correct, please resend it with
> > correct fixes lines.
> 
> I believe the thinking is these are fixes that should have had the counter in
> the first place.

$ git describe --contains c4cf5688ea69
Could not get sha1 for c4cf5688ea69. Skipping.

Jason
Marciniszyn, Mike July 14, 2021, 3:45 p.m. UTC | #4 
> >
> > Fixes: d99dc602e2a5 ("IB/hfi1: Add functions to transmit datagram
> > ipoib packets")
> > Fixes: c4cf5688ea69 ("IB/hfi1: Indicate DMA wait when txq is queued
> > for wakeup")
> 
> Neither of these fixes lines are correct, please resend it with correct fixes
> lines.

d99dc602e2a5 is ok and is clearly there and adds the file itself:

commit d99dc602e2a55a99940ba9506a7126dfa54d54ea
Author: Gary Leshner <Gary.S.Leshner@intel.com>
Date:   Mon May 11 12:05:48 2020 -0400

    IB/hfi1: Add functions to transmit datagram ipoib packets

The second one is just the patch itself.   Not sure what happened there, but Denny is going to resubmit.

Mike
diff mbox series

Patch

diff --git a/drivers/infiniband/hw/hfi1/ipoib_tx.c b/drivers/infiniband/hw/hfi1/ipoib_tx.c
index 993f983..e74ddbe 100644
--- a/drivers/infiniband/hw/hfi1/ipoib_tx.c
+++ b/drivers/infiniband/hw/hfi1/ipoib_tx.c
@@ -644,10 +644,13 @@  static int hfi1_ipoib_sdma_sleep(struct sdma_engine *sde,
 			/* came from non-list submit */
 			list_add_tail(&txreq->list, &txq->tx_list);
 		if (list_empty(&txq->wait.list)) {
+			struct hfi1_ibport *ibp = &sde->ppd->ibport_data;
+
 			if (!atomic_xchg(&txq->no_desc, 1)) {
 				trace_hfi1_txq_queued(txq);
 				hfi1_ipoib_stop_txq(txq);
 			}
+			ibp->rvp.n_dmawait++;
 			iowait_queue(pkts_sent, wait->iow, &sde->dmawait);
 		}