Skip to content

Commit 5f14e4e

Browse files
ssanchez11dledford
ssanchez11
authored and
dledford
committed
IB/rdmavt, IB/hfi1: Fix timer migration regressions
RC timeout counter isn't getting incremented. Increment counter and add the trace for it. Fixes: 87c23b4ab018 ("IB/rdmavt: Adding timer logic to rdmavt") Reviewed-by: Brian Welty <[email protected]> Reviewed-by: Mike Marciniszyn <[email protected]> Signed-off-by: Sebastian Sanchez <[email protected]> Signed-off-by: Dennis Dalessandro <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent 5e6e942 commit 5f14e4e

File tree

4 files changed

+117
-8
lines changed

4 files changed

+117
-8
lines changed

‎drivers/infiniband/hw/hfi1/trace_rc.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright(c) 2015, 2016 Intel Corporation.
2+
* Copyright(c) 2015, 2016, 2017 Intel Corporation.
33
*
44
* This file is provided under a dual BSD/GPLv2 license. When using or
55
* redistributing this file, you may do so under either license.
@@ -104,11 +104,6 @@ DEFINE_EVENT(hfi1_rc_template, hfi1_ack,
104104
TP_ARGS(qp, psn)
105105
);
106106

107-
DEFINE_EVENT(hfi1_rc_template, hfi1_timeout,
108-
TP_PROTO(struct rvt_qp *qp, u32 psn),
109-
TP_ARGS(qp, psn)
110-
);
111-
112107
DEFINE_EVENT(hfi1_rc_template, hfi1_rcv_error,
113108
TP_PROTO(struct rvt_qp *qp, u32 psn),
114109
TP_ARGS(qp, psn)

‎drivers/infiniband/sw/rdmavt/qp.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright(c) 2016 Intel Corporation.
2+
* Copyright(c) 2016, 2017 Intel Corporation.
33
*
44
* This file is provided under a dual BSD/GPLv2 license. When using or
55
* redistributing this file, you may do so under either license.
@@ -2052,8 +2052,12 @@ static void rvt_rc_timeout(unsigned long arg)
20522052
spin_lock_irqsave(&qp->r_lock, flags);
20532053
spin_lock(&qp->s_lock);
20542054
if (qp->s_flags & RVT_S_TIMER) {
2055+
struct rvt_ibport *rvp = rdi->ports[qp->port_num - 1];
2056+
20552057
qp->s_flags &= ~RVT_S_TIMER;
2058+
rvp->n_rc_timeouts++;
20562059
del_timer(&qp->s_timer);
2060+
trace_rvt_rc_timeout(qp, qp->s_last_psn + 1);
20572061
if (rdi->driver_f.notify_restart_rc)
20582062
rdi->driver_f.notify_restart_rc(qp,
20592063
qp->s_last_psn + 1,

‎drivers/infiniband/sw/rdmavt/trace.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright(c) 2016 Intel Corporation.
2+
* Copyright(c) 2016, 2017 Intel Corporation.
33
*
44
* This file is provided under a dual BSD/GPLv2 license. When using or
55
* redistributing this file, you may do so under either license.
@@ -53,3 +53,4 @@
5353
#include "trace_tx.h"
5454
#include "trace_mr.h"
5555
#include "trace_cq.h"
56+
#include "trace_rc.h"

‎drivers/infiniband/sw/rdmavt/trace_rc.h

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
/*
2+
* Copyright(c) 2017 Intel Corporation.
3+
*
4+
* This file is provided under a dual BSD/GPLv2 license. When using or
5+
* redistributing this file, you may do so under either license.
6+
*
7+
* GPL LICENSE SUMMARY
8+
*
9+
* This program is free software; you can redistribute it and/or modify
10+
* it under the terms of version 2 of the GNU General Public License as
11+
* published by the Free Software Foundation.
12+
*
13+
* This program is distributed in the hope that it will be useful, but
14+
* WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
* General Public License for more details.
17+
*
18+
* BSD LICENSE
19+
*
20+
* Redistribution and use in source and binary forms, with or without
21+
* modification, are permitted provided that the following conditions
22+
* are met:
23+
*
24+
* - Redistributions of source code must retain the above copyright
25+
* notice, this list of conditions and the following disclaimer.
26+
* - Redistributions in binary form must reproduce the above copyright
27+
* notice, this list of conditions and the following disclaimer in
28+
* the documentation and/or other materials provided with the
29+
* distribution.
30+
* - Neither the name of Intel Corporation nor the names of its
31+
* contributors may be used to endorse or promote products derived
32+
* from this software without specific prior written permission.
33+
*
34+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
35+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
36+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
37+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
38+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
39+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
40+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
41+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
42+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
43+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
44+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
45+
*
46+
*/
47+
#if !defined(__RVT_TRACE_RC_H) || defined(TRACE_HEADER_MULTI_READ)
48+
#define __RVT_TRACE_RC_H
49+
50+
#include <linux/tracepoint.h>
51+
#include <linux/trace_seq.h>
52+
53+
#include <rdma/ib_verbs.h>
54+
#include <rdma/rdma_vt.h>
55+
56+
#undef TRACE_SYSTEM
57+
#define TRACE_SYSTEM rvt_rc
58+
59+
DECLARE_EVENT_CLASS(rvt_rc_template,
60+
TP_PROTO(struct rvt_qp *qp, u32 psn),
61+
TP_ARGS(qp, psn),
62+
TP_STRUCT__entry(
63+
RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
64+
__field(u32, qpn)
65+
__field(u32, s_flags)
66+
__field(u32, psn)
67+
__field(u32, s_psn)
68+
__field(u32, s_next_psn)
69+
__field(u32, s_sending_psn)
70+
__field(u32, s_sending_hpsn)
71+
__field(u32, r_psn)
72+
),
73+
TP_fast_assign(
74+
RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
75+
__entry->qpn = qp->ibqp.qp_num;
76+
__entry->s_flags = qp->s_flags;
77+
__entry->psn = psn;
78+
__entry->s_psn = qp->s_psn;
79+
__entry->s_next_psn = qp->s_next_psn;
80+
__entry->s_sending_psn = qp->s_sending_psn;
81+
__entry->s_sending_hpsn = qp->s_sending_hpsn;
82+
__entry->r_psn = qp->r_psn;
83+
),
84+
TP_printk(
85+
"[%s] qpn 0x%x s_flags 0x%x psn 0x%x s_psn 0x%x s_next_psn 0x%x s_sending_psn 0x%x sending_hpsn 0x%x r_psn 0x%x",
86+
__get_str(dev),
87+
__entry->qpn,
88+
__entry->s_flags,
89+
__entry->psn,
90+
__entry->s_psn,
91+
__entry->s_next_psn,
92+
__entry->s_sending_psn,
93+
__entry->s_sending_hpsn,
94+
__entry->r_psn
95+
)
96+
);
97+
98+
DEFINE_EVENT(rvt_rc_template, rvt_rc_timeout,
99+
TP_PROTO(struct rvt_qp *qp, u32 psn),
100+
TP_ARGS(qp, psn)
101+
);
102+
103+
#endif /* __RVT_TRACE_RC_H */
104+
105+
#undef TRACE_INCLUDE_PATH
106+
#undef TRACE_INCLUDE_FILE
107+
#define TRACE_INCLUDE_PATH .
108+
#define TRACE_INCLUDE_FILE trace_rc
109+
#include <trace/define_trace.h>

0 commit comments

Comments
 (0)