Skip to content

Commit 7fe50ac

Browse files
congwangdavem330
authored andcommitted
net: dump more useful information in netdev_rx_csum_fault()
Currently netdev_rx_csum_fault() only shows a device name, we need more information about the skb for debugging csum failures. Sample output: ens3: hw csum failure dev features: 0x0000000000014b89 skb len=84 data_len=0 pkt_type=0 gso_size=0 gso_type=0 nr_frags=0 ip_summed=0 csum=0 csum_complete_sw=0 csum_valid=0 csum_level=0 Note, I use pr_err() just to be consistent with the existing one. Signed-off-by: Cong Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ddc49ac commit 7fe50ac

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

include/linux/netdevice.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4343,9 +4343,10 @@ static inline bool can_checksum_protocol(netdev_features_t features,
43434343
}
43444344

43454345
#ifdef CONFIG_BUG
4346-
void netdev_rx_csum_fault(struct net_device *dev);
4346+
void netdev_rx_csum_fault(struct net_device *dev, struct sk_buff *skb);
43474347
#else
4348-
static inline void netdev_rx_csum_fault(struct net_device *dev)
4348+
static inline void netdev_rx_csum_fault(struct net_device *dev,
4349+
struct sk_buff *skb)
43494350
{
43504351
}
43514352
#endif

net/core/datagram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ int skb_copy_and_csum_datagram_msg(struct sk_buff *skb,
767767

768768
if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
769769
!skb->csum_complete_sw)
770-
netdev_rx_csum_fault(NULL);
770+
netdev_rx_csum_fault(NULL, skb);
771771
}
772772
return 0;
773773
fault:

net/core/dev.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3091,10 +3091,17 @@ EXPORT_SYMBOL(__skb_gso_segment);
30913091

30923092
/* Take action when hardware reception checksum errors are detected. */
30933093
#ifdef CONFIG_BUG
3094-
void netdev_rx_csum_fault(struct net_device *dev)
3094+
void netdev_rx_csum_fault(struct net_device *dev, struct sk_buff *skb)
30953095
{
30963096
if (net_ratelimit()) {
30973097
pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
3098+
if (dev)
3099+
pr_err("dev features: %pNF\n", &dev->features);
3100+
pr_err("skb len=%u data_len=%u pkt_type=%u gso_size=%u gso_type=%u nr_frags=%u ip_summed=%u csum=%x csum_complete_sw=%d csum_valid=%d csum_level=%u\n",
3101+
skb->len, skb->data_len, skb->pkt_type,
3102+
skb_shinfo(skb)->gso_size, skb_shinfo(skb)->gso_type,
3103+
skb_shinfo(skb)->nr_frags, skb->ip_summed, skb->csum,
3104+
skb->csum_complete_sw, skb->csum_valid, skb->csum_level);
30983105
dump_stack();
30993106
}
31003107
}
@@ -5781,7 +5788,7 @@ __sum16 __skb_gro_checksum_complete(struct sk_buff *skb)
57815788
if (likely(!sum)) {
57825789
if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
57835790
!skb->csum_complete_sw)
5784-
netdev_rx_csum_fault(skb->dev);
5791+
netdev_rx_csum_fault(skb->dev, skb);
57855792
}
57865793

57875794
NAPI_GRO_CB(skb)->csum = wsum;

net/core/skbuff.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2653,7 +2653,7 @@ __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
26532653
if (likely(!sum)) {
26542654
if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
26552655
!skb->csum_complete_sw)
2656-
netdev_rx_csum_fault(skb->dev);
2656+
netdev_rx_csum_fault(skb->dev, skb);
26572657
}
26582658
if (!skb_shared(skb))
26592659
skb->csum_valid = !sum;
@@ -2673,7 +2673,7 @@ __sum16 __skb_checksum_complete(struct sk_buff *skb)
26732673
if (likely(!sum)) {
26742674
if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
26752675
!skb->csum_complete_sw)
2676-
netdev_rx_csum_fault(skb->dev);
2676+
netdev_rx_csum_fault(skb->dev, skb);
26772677
}
26782678

26792679
if (!skb_shared(skb)) {

net/sunrpc/socklib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ int csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
175175
return -1;
176176
if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
177177
!skb->csum_complete_sw)
178-
netdev_rx_csum_fault(skb->dev);
178+
netdev_rx_csum_fault(skb->dev, skb);
179179
return 0;
180180
no_checksum:
181181
if (xdr_partial_copy_from_skb(xdr, 0, &desc, xdr_skb_read_bits) < 0)

0 commit comments

Comments
 (0)