Skip to content

Commit 698a895

Browse files
Yunsheng Lindavem330
authored andcommitted
net: hns3: add trace event support for HNS3 driver
This adds trace support for HNS3 driver. It also declares some events which could be used to trace the events when a TX/RX BD is processed, and other events which are related to the processing of sk_buff, such as TSO, GRO. Signed-off-by: Yunsheng Lin <[email protected]> Signed-off-by: Huazhong Tan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent df2c2ba commit 698a895

File tree

4 files changed

+172
-2
lines changed

4 files changed

+172
-2
lines changed

drivers/net/ethernet/hisilicon/hns3/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Makefile for the HISILICON network device drivers.
44
#
55

6+
ccflags-y += -I$(srctree)/$(src)
7+
68
obj-$(CONFIG_HNS3) += hns3pf/
79
obj-$(CONFIG_HNS3) += hns3vf/
810

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424

2525
#include "hnae3.h"
2626
#include "hns3_enet.h"
27+
/* All hns3 tracepoints are defined by the include below, which
28+
* must be included exactly once across the whole kernel with
29+
* CREATE_TRACE_POINTS defined
30+
*/
31+
#define CREATE_TRACE_POINTS
32+
#include "hns3_trace.h"
2733

2834
#define hns3_set_field(origin, shift, val) ((origin) |= ((val) << (shift)))
2935
#define hns3_tx_bd_count(S) DIV_ROUND_UP(S, HNS3_MAX_BD_SIZE)
@@ -734,6 +740,8 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen,
734740
/* get MSS for TSO */
735741
*mss = skb_shinfo(skb)->gso_size;
736742

743+
trace_hns3_tso(skb);
744+
737745
return 0;
738746
}
739747

@@ -1138,6 +1146,7 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,
11381146
desc->tx.bdtp_fe_sc_vld_ra_ri =
11391147
cpu_to_le16(BIT(HNS3_TXD_VLD_B));
11401148

1149+
trace_hns3_tx_desc(ring, ring->next_to_use);
11411150
ring_ptr_move_fw(ring, next_to_use);
11421151
return HNS3_LIKELY_BD_NUM;
11431152
}
@@ -1161,6 +1170,7 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,
11611170
desc->tx.bdtp_fe_sc_vld_ra_ri =
11621171
cpu_to_le16(BIT(HNS3_TXD_VLD_B));
11631172

1173+
trace_hns3_tx_desc(ring, ring->next_to_use);
11641174
/* move ring pointer to next */
11651175
ring_ptr_move_fw(ring, next_to_use);
11661176

@@ -1286,6 +1296,14 @@ static bool hns3_skb_need_linearized(struct sk_buff *skb, unsigned int *bd_size,
12861296
return false;
12871297
}
12881298

1299+
void hns3_shinfo_pack(struct skb_shared_info *shinfo, __u32 *size)
1300+
{
1301+
int i = 0;
1302+
1303+
for (i = 0; i < MAX_SKB_FRAGS; i++)
1304+
size[i] = skb_frag_size(&shinfo->frags[i]);
1305+
}
1306+
12891307
static int hns3_nic_maybe_stop_tx(struct hns3_enet_ring *ring,
12901308
struct net_device *netdev,
12911309
struct sk_buff *skb)
@@ -1297,17 +1315,21 @@ static int hns3_nic_maybe_stop_tx(struct hns3_enet_ring *ring,
12971315
bd_num = hns3_tx_bd_num(skb, bd_size);
12981316
if (unlikely(bd_num > HNS3_MAX_NON_TSO_BD_NUM)) {
12991317
if (bd_num <= HNS3_MAX_TSO_BD_NUM && skb_is_gso(skb) &&
1300-
!hns3_skb_need_linearized(skb, bd_size, bd_num))
1318+
!hns3_skb_need_linearized(skb, bd_size, bd_num)) {
1319+
trace_hns3_over_8bd(skb);
13011320
goto out;
1321+
}
13021322

13031323
if (__skb_linearize(skb))
13041324
return -ENOMEM;
13051325

13061326
bd_num = hns3_tx_bd_count(skb->len);
13071327
if ((skb_is_gso(skb) && bd_num > HNS3_MAX_TSO_BD_NUM) ||
13081328
(!skb_is_gso(skb) &&
1309-
bd_num > HNS3_MAX_NON_TSO_BD_NUM))
1329+
bd_num > HNS3_MAX_NON_TSO_BD_NUM)) {
1330+
trace_hns3_over_8bd(skb);
13101331
return -ENOMEM;
1332+
}
13111333

13121334
u64_stats_update_begin(&ring->syncp);
13131335
ring->stats.tx_copy++;
@@ -1448,6 +1470,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
14481470
(ring->desc_num - 1);
14491471
ring->desc[pre_ntu].tx.bdtp_fe_sc_vld_ra_ri |=
14501472
cpu_to_le16(BIT(HNS3_TXD_FE_B));
1473+
trace_hns3_tx_desc(ring, pre_ntu);
14511474

14521475
/* Complete translate all packets */
14531476
dev_queue = netdev_get_tx_queue(netdev, ring->queue_index);
@@ -2700,6 +2723,9 @@ static int hns3_gro_complete(struct sk_buff *skb, u32 l234info)
27002723
skb->csum_start = (unsigned char *)th - skb->head;
27012724
skb->csum_offset = offsetof(struct tcphdr, check);
27022725
skb->ip_summed = CHECKSUM_PARTIAL;
2726+
2727+
trace_hns3_gro(skb);
2728+
27032729
return 0;
27042730
}
27052731

@@ -2836,6 +2862,7 @@ static int hns3_alloc_skb(struct hns3_enet_ring *ring, unsigned int length,
28362862
return -ENOMEM;
28372863
}
28382864

2865+
trace_hns3_rx_desc(ring);
28392866
prefetchw(skb->data);
28402867

28412868
ring->pending_buf = 1;
@@ -2910,6 +2937,7 @@ static int hns3_add_frag(struct hns3_enet_ring *ring)
29102937
}
29112938

29122939
hns3_nic_reuse_page(skb, ring->frag_num++, ring, 0, desc_cb);
2940+
trace_hns3_rx_desc(ring);
29132941
ring_ptr_move_fw(ring, next_to_clean);
29142942
ring->pending_buf++;
29152943
} while (!(bd_base_info & BIT(HNS3_RXD_FE_B)));

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,4 +673,5 @@ void hns3_dbg_init(struct hnae3_handle *handle);
673673
void hns3_dbg_uninit(struct hnae3_handle *handle);
674674
void hns3_dbg_register_debugfs(const char *debugfs_dir_name);
675675
void hns3_dbg_unregister_debugfs(void);
676+
void hns3_shinfo_pack(struct skb_shared_info *shinfo, __u32 *size);
676677
#endif
Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
2+
/* Copyright (c) 2018-2019 Hisilicon Limited. */
3+
4+
/* This must be outside ifdef _HNS3_TRACE_H */
5+
#undef TRACE_SYSTEM
6+
#define TRACE_SYSTEM hns3
7+
8+
#if !defined(_HNS3_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
9+
#define _HNS3_TRACE_H_
10+
11+
#include <linux/tracepoint.h>
12+
13+
#define DESC_NR (sizeof(struct hns3_desc) / sizeof(u32))
14+
15+
DECLARE_EVENT_CLASS(hns3_skb_template,
16+
TP_PROTO(struct sk_buff *skb),
17+
TP_ARGS(skb),
18+
19+
TP_STRUCT__entry(
20+
__field(unsigned int, headlen)
21+
__field(unsigned int, len)
22+
__field(__u8, nr_frags)
23+
__field(__u8, ip_summed)
24+
__field(unsigned int, hdr_len)
25+
__field(unsigned short, gso_size)
26+
__field(unsigned short, gso_segs)
27+
__field(unsigned int, gso_type)
28+
__field(bool, fraglist)
29+
__array(__u32, size, MAX_SKB_FRAGS)
30+
),
31+
32+
TP_fast_assign(
33+
__entry->headlen = skb_headlen(skb);
34+
__entry->len = skb->len;
35+
__entry->nr_frags = skb_shinfo(skb)->nr_frags;
36+
__entry->gso_size = skb_shinfo(skb)->gso_size;
37+
__entry->gso_segs = skb_shinfo(skb)->gso_segs;
38+
__entry->gso_type = skb_shinfo(skb)->gso_type;
39+
__entry->hdr_len = skb->encapsulation ?
40+
skb_inner_transport_offset(skb) + inner_tcp_hdrlen(skb) :
41+
skb_transport_offset(skb) + tcp_hdrlen(skb);
42+
__entry->ip_summed = skb->ip_summed;
43+
__entry->fraglist = skb_has_frag_list(skb);
44+
hns3_shinfo_pack(skb_shinfo(skb), __entry->size);
45+
),
46+
47+
TP_printk(
48+
"len: %u, %u, %u, cs: %u, gso: %u, %u, %x, frag(%d %u): %s",
49+
__entry->headlen, __entry->len, __entry->hdr_len,
50+
__entry->ip_summed, __entry->gso_size, __entry->gso_segs,
51+
__entry->gso_type, __entry->fraglist, __entry->nr_frags,
52+
__print_array(__entry->size, MAX_SKB_FRAGS, sizeof(__u32))
53+
)
54+
);
55+
56+
DEFINE_EVENT(hns3_skb_template, hns3_over_8bd,
57+
TP_PROTO(struct sk_buff *skb),
58+
TP_ARGS(skb));
59+
60+
DEFINE_EVENT(hns3_skb_template, hns3_gro,
61+
TP_PROTO(struct sk_buff *skb),
62+
TP_ARGS(skb));
63+
64+
DEFINE_EVENT(hns3_skb_template, hns3_tso,
65+
TP_PROTO(struct sk_buff *skb),
66+
TP_ARGS(skb));
67+
68+
TRACE_EVENT(hns3_tx_desc,
69+
TP_PROTO(struct hns3_enet_ring *ring, int cur_ntu),
70+
TP_ARGS(ring, cur_ntu),
71+
72+
TP_STRUCT__entry(
73+
__field(int, index)
74+
__field(int, ntu)
75+
__field(int, ntc)
76+
__field(dma_addr_t, desc_dma)
77+
__array(u32, desc, DESC_NR)
78+
__string(devname, ring->tqp->handle->kinfo.netdev->name)
79+
),
80+
81+
TP_fast_assign(
82+
__entry->index = ring->tqp->tqp_index;
83+
__entry->ntu = ring->next_to_use;
84+
__entry->ntc = ring->next_to_clean;
85+
__entry->desc_dma = ring->desc_dma_addr,
86+
memcpy(__entry->desc, &ring->desc[cur_ntu],
87+
sizeof(struct hns3_desc));
88+
__assign_str(devname, ring->tqp->handle->kinfo.netdev->name);
89+
),
90+
91+
TP_printk(
92+
"%s-%d-%d/%d desc(%pad): %s",
93+
__get_str(devname), __entry->index, __entry->ntu,
94+
__entry->ntc, &__entry->desc_dma,
95+
__print_array(__entry->desc, DESC_NR, sizeof(u32))
96+
)
97+
);
98+
99+
TRACE_EVENT(hns3_rx_desc,
100+
TP_PROTO(struct hns3_enet_ring *ring),
101+
TP_ARGS(ring),
102+
103+
TP_STRUCT__entry(
104+
__field(int, index)
105+
__field(int, ntu)
106+
__field(int, ntc)
107+
__field(dma_addr_t, desc_dma)
108+
__field(dma_addr_t, buf_dma)
109+
__array(u32, desc, DESC_NR)
110+
__string(devname, ring->tqp->handle->kinfo.netdev->name)
111+
),
112+
113+
TP_fast_assign(
114+
__entry->index = ring->tqp->tqp_index;
115+
__entry->ntu = ring->next_to_use;
116+
__entry->ntc = ring->next_to_clean;
117+
__entry->desc_dma = ring->desc_dma_addr;
118+
__entry->buf_dma = ring->desc_cb[ring->next_to_clean].dma;
119+
memcpy(__entry->desc, &ring->desc[ring->next_to_clean],
120+
sizeof(struct hns3_desc));
121+
__assign_str(devname, ring->tqp->handle->kinfo.netdev->name);
122+
),
123+
124+
TP_printk(
125+
"%s-%d-%d/%d desc(%pad) buf(%pad): %s",
126+
__get_str(devname), __entry->index, __entry->ntu,
127+
__entry->ntc, &__entry->desc_dma, &__entry->buf_dma,
128+
__print_array(__entry->desc, DESC_NR, sizeof(u32))
129+
)
130+
);
131+
132+
#endif /* _HNS3_TRACE_H_ */
133+
134+
/* This must be outside ifdef _HNS3_TRACE_H */
135+
#undef TRACE_INCLUDE_PATH
136+
#define TRACE_INCLUDE_PATH .
137+
#undef TRACE_INCLUDE_FILE
138+
#define TRACE_INCLUDE_FILE hns3_trace
139+
#include <trace/define_trace.h>

0 commit comments

Comments
 (0)