| Message ID | 20240123151924.373917-2-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Add HW check sum of load for RZ/G2L GbEthernet IP | expand |
On Tue, 23 Jan 2024 15:19:23 +0000 Biju Das wrote: > +static void ravb_rx_csum_gbeth(struct sk_buff *skb) > +{ > + __sum16 csum_ip_hdr, csum_proto; > + u8 *hw_csum; > + > + /* The hardware checksum status is contained in sizeof(__sum16) * 2 = 4 > + * bytes appended to packet data. First 2 bytes is ip header csum and > + * last 2 bytes is protocol csum. > + */ > + if (unlikely(skb->len < sizeof(__sum16) * 2)) > + return; > + > + hw_csum = skb_tail_pointer(skb) - sizeof(__sum16); > + csum_proto = csum_unfold((__force __sum16)get_unaligned_le16(hw_csum)); > + > + hw_csum -= sizeof(__sum16); > + csum_ip_hdr = csum_unfold((__force __sum16)get_unaligned_le16(hw_csum)); > + skb_trim(skb, skb->len - 2 * sizeof(__sum16)); > + > + /* TODO: IPV6 Rx csum */ > + if (skb->protocol == htons(ETH_P_IP) && csum_ip_hdr == TOE_RX_CSUM_OK && > + csum_proto == TOE_RX_CSUM_OK) > + /* Hardware validated our checksum */ > + skb->ip_summed = CHECKSUM_UNNECESSARY; > +} sparse does not seem to be onboard: drivers/net/ethernet/renesas/ravb_main.c:771:20: warning: incorrect type in assignment (different base types) drivers/net/ethernet/renesas/ravb_main.c:771:20: expected restricted __sum16 [usertype] csum_proto drivers/net/ethernet/renesas/ravb_main.c:771:20: got restricted __wsum drivers/net/ethernet/renesas/ravb_main.c:774:21: warning: incorrect type in assignment (different base types) drivers/net/ethernet/renesas/ravb_main.c:774:21: expected restricted __sum16 [usertype] csum_ip_hdr drivers/net/ethernet/renesas/ravb_main.c:774:21: got restricted __wsum
Hi Jakub Kicinski, Thanks for the feedback. > -----Original Message----- > From: Jakub Kicinski <kuba@kernel.org> > Sent: Wednesday, January 24, 2024 1:09 AM > Subject: Re: [PATCH net-next 1/2] ravb: Add Rx checksum offload support > > On Tue, 23 Jan 2024 15:19:23 +0000 Biju Das wrote: > > +static void ravb_rx_csum_gbeth(struct sk_buff *skb) { > > + __sum16 csum_ip_hdr, csum_proto; > > + u8 *hw_csum; > > + > > + /* The hardware checksum status is contained in sizeof(__sum16) * 2 > = 4 > > + * bytes appended to packet data. First 2 bytes is ip header csum > and > > + * last 2 bytes is protocol csum. > > + */ > > + if (unlikely(skb->len < sizeof(__sum16) * 2)) > > + return; > > + > > + hw_csum = skb_tail_pointer(skb) - sizeof(__sum16); > > + csum_proto = csum_unfold((__force > > +__sum16)get_unaligned_le16(hw_csum)); > > + > > + hw_csum -= sizeof(__sum16); > > + csum_ip_hdr = csum_unfold((__force > __sum16)get_unaligned_le16(hw_csum)); > > + skb_trim(skb, skb->len - 2 * sizeof(__sum16)); > > + > > + /* TODO: IPV6 Rx csum */ > > + if (skb->protocol == htons(ETH_P_IP) && csum_ip_hdr == > TOE_RX_CSUM_OK && > > + csum_proto == TOE_RX_CSUM_OK) > > + /* Hardware validated our checksum */ > > + skb->ip_summed = CHECKSUM_UNNECESSARY; } > > sparse does not seem to be onboard: > > drivers/net/ethernet/renesas/ravb_main.c:771:20: warning: incorrect type > in assignment (different base types) > drivers/net/ethernet/renesas/ravb_main.c:771:20: expected restricted > __sum16 [usertype] csum_proto > drivers/net/ethernet/renesas/ravb_main.c:771:20: got restricted __wsum > drivers/net/ethernet/renesas/ravb_main.c:774:21: warning: incorrect type > in assignment (different base types) > drivers/net/ethernet/renesas/ravb_main.c:774:21: expected restricted > __sum16 [usertype] csum_ip_hdr > drivers/net/ethernet/renesas/ravb_main.c:774:21: got restricted __wsum I have reproduced this issue and the warning is fixed by replacing __sum16->__wsum. I will send v2 with this fix. Cheers, Biju
On 1/24/24 11:31 AM, Biju Das wrote: [...] >> -----Original Message----- >> From: Jakub Kicinski <kuba@kernel.org> >> Sent: Wednesday, January 24, 2024 1:09 AM >> Subject: Re: [PATCH net-next 1/2] ravb: Add Rx checksum offload support >> >> On Tue, 23 Jan 2024 15:19:23 +0000 Biju Das wrote: >>> +static void ravb_rx_csum_gbeth(struct sk_buff *skb) { >>> + __sum16 csum_ip_hdr, csum_proto; >>> + u8 *hw_csum; >>> + >>> + /* The hardware checksum status is contained in sizeof(__sum16) * 2 >> = 4 >>> + * bytes appended to packet data. First 2 bytes is ip header csum >> and >>> + * last 2 bytes is protocol csum. >>> + */ >>> + if (unlikely(skb->len < sizeof(__sum16) * 2)) >>> + return; >>> + >>> + hw_csum = skb_tail_pointer(skb) - sizeof(__sum16); >>> + csum_proto = csum_unfold((__force >>> +__sum16)get_unaligned_le16(hw_csum)); >>> + >>> + hw_csum -= sizeof(__sum16); >>> + csum_ip_hdr = csum_unfold((__force >> __sum16)get_unaligned_le16(hw_csum)); >>> + skb_trim(skb, skb->len - 2 * sizeof(__sum16)); >>> + >>> + /* TODO: IPV6 Rx csum */ >>> + if (skb->protocol == htons(ETH_P_IP) && csum_ip_hdr == >> TOE_RX_CSUM_OK && >>> + csum_proto == TOE_RX_CSUM_OK) >>> + /* Hardware validated our checksum */ >>> + skb->ip_summed = CHECKSUM_UNNECESSARY; } >> >> sparse does not seem to be onboard: >> >> drivers/net/ethernet/renesas/ravb_main.c:771:20: warning: incorrect type >> in assignment (different base types) >> drivers/net/ethernet/renesas/ravb_main.c:771:20: expected restricted >> __sum16 [usertype] csum_proto >> drivers/net/ethernet/renesas/ravb_main.c:771:20: got restricted __wsum >> drivers/net/ethernet/renesas/ravb_main.c:774:21: warning: incorrect type >> in assignment (different base types) >> drivers/net/ethernet/renesas/ravb_main.c:774:21: expected restricted >> __sum16 [usertype] csum_ip_hdr >> drivers/net/ethernet/renesas/ravb_main.c:774:21: got restricted __wsum > > I have reproduced this issue and the warning is fixed by replacing > __sum16->__wsum. > > I will send v2 with this fix. You could have waited for my review... Dave, Jakub, please don't merge these patches before I have a chance to review them. I'm overwhelmed by reviews (both internal and public) ATM... :-/ > Cheers, > Biju MBR, Sergey
Hi Sergey Shtylyov, > -----Original Message----- > From: Sergey Shtylyov <s.shtylyov@omp.ru> > Sent: Wednesday, January 24, 2024 8:51 PM > Subject: Re: [PATCH net-next 1/2] ravb: Add Rx checksum offload support > > On 1/24/24 11:31 AM, Biju Das wrote: > [...] > > >> -----Original Message----- > >> From: Jakub Kicinski <kuba@kernel.org> > >> Sent: Wednesday, January 24, 2024 1:09 AM > >> Subject: Re: [PATCH net-next 1/2] ravb: Add Rx checksum offload > >> support > >> > >> On Tue, 23 Jan 2024 15:19:23 +0000 Biju Das wrote: > >>> +static void ravb_rx_csum_gbeth(struct sk_buff *skb) { > >>> + __sum16 csum_ip_hdr, csum_proto; > >>> + u8 *hw_csum; > >>> + > >>> + /* The hardware checksum status is contained in sizeof(__sum16) * > >>> +2 > >> = 4 > >>> + * bytes appended to packet data. First 2 bytes is ip header csum > >> and > >>> + * last 2 bytes is protocol csum. > >>> + */ > >>> + if (unlikely(skb->len < sizeof(__sum16) * 2)) > >>> + return; > >>> + > >>> + hw_csum = skb_tail_pointer(skb) - sizeof(__sum16); > >>> + csum_proto = csum_unfold((__force > >>> +__sum16)get_unaligned_le16(hw_csum)); > >>> + > >>> + hw_csum -= sizeof(__sum16); > >>> + csum_ip_hdr = csum_unfold((__force > >> __sum16)get_unaligned_le16(hw_csum)); > >>> + skb_trim(skb, skb->len - 2 * sizeof(__sum16)); > >>> + > >>> + /* TODO: IPV6 Rx csum */ > >>> + if (skb->protocol == htons(ETH_P_IP) && csum_ip_hdr == > >> TOE_RX_CSUM_OK && > >>> + csum_proto == TOE_RX_CSUM_OK) > >>> + /* Hardware validated our checksum */ > >>> + skb->ip_summed = CHECKSUM_UNNECESSARY; } > >> > >> sparse does not seem to be onboard: > >> > >> drivers/net/ethernet/renesas/ravb_main.c:771:20: warning: incorrect > >> type in assignment (different base types) > >> drivers/net/ethernet/renesas/ravb_main.c:771:20: expected restricted > >> __sum16 [usertype] csum_proto > >> drivers/net/ethernet/renesas/ravb_main.c:771:20: got restricted > __wsum > >> drivers/net/ethernet/renesas/ravb_main.c:774:21: warning: incorrect > >> type in assignment (different base types) > >> drivers/net/ethernet/renesas/ravb_main.c:774:21: expected restricted > >> __sum16 [usertype] csum_ip_hdr > >> drivers/net/ethernet/renesas/ravb_main.c:774:21: got restricted > __wsum > > > > I have reproduced this issue and the warning is fixed by replacing > > __sum16->__wsum. > > > > I will send v2 with this fix. > > You could have waited for my review... Please review the latest version v2[2] as it is fixing bot error. It is straight forward, and simpler patches should be fast to review. [2] https://lore.kernel.org/all/20240124102115.132154-1-biju.das.jz@bp.renesas.com/ Cheers, Biju > Dave, Jakub, please don't merge these patches before I have a chance to > review them. I'm overwhelmed by reviews (both internal and public) > ATM... :-/ > > > Cheers, > > Biju > > MBR, Sergey
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index e0f8276cffed..a2c494a85d12 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -44,6 +44,9 @@ #define RAVB_RXTSTAMP_TYPE_ALL 0x00000006 #define RAVB_RXTSTAMP_ENABLED 0x00000010 /* Enable RX timestamping */ +/* GbEthernet TOE hardware checksum values */ +#define TOE_RX_CSUM_OK 0x0000 + enum ravb_reg { /* AVB-DMAC registers */ CCC = 0x0000, @@ -206,6 +209,7 @@ enum ravb_reg { RFCR = 0x0760, MAFCR = 0x0778, CSR0 = 0x0800, /* RZ/G2L only */ + CSR2 = 0x0808, /* RZ/G2L only */ }; @@ -978,6 +982,21 @@ enum CSR0_BIT { CSR0_RPE = 0x00000020, }; +enum CSR2_BIT { + CSR2_RIP4 = 0x00000001, + CSR2_RTCP4 = 0x00000010, + CSR2_RUDP4 = 0x00000020, + CSR2_RICMP4 = 0x00000040, + CSR2_RTCP6 = 0x00100000, + CSR2_RUDP6 = 0x00200000, + CSR2_RICMP6 = 0x00400000, + CSR2_RHOP = 0x01000000, + CSR2_RROUT = 0x02000000, + CSR2_RAHD = 0x04000000, + CSR2_RDHD = 0x08000000, + CSR2_ALL = 0x0F700071, +}; + #define DBAT_ENTRY_NUM 22 #define RX_QUEUE_OFFSET 4 #define NUM_RX_QUEUE 2 diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 0e3731f50fc2..219eb9f0391c 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -522,6 +522,26 @@ static int ravb_ring_init(struct net_device *ndev, int q) return -ENOMEM; } +static void ravb_csum_offload_init_gbeth(struct net_device *ndev) +{ + bool rx_enable = ndev->features & NETIF_F_RXCSUM; + u32 csr0; + + if (!rx_enable) + return; + + csr0 = ravb_read(ndev, CSR0); + ravb_write(ndev, csr0 & ~(CSR0_RPE | CSR0_TPE), CSR0); + if (ravb_wait(ndev, CSR0, CSR0_RPE | CSR0_TPE, 0)) { + netdev_err(ndev, "Timeout Enabling HW CSUM failed\n"); + ndev->features &= ~NETIF_F_RXCSUM; + } else { + ravb_write(ndev, CSR2_ALL, CSR2); + } + + ravb_write(ndev, csr0, CSR0); +} + static void ravb_emac_init_gbeth(struct net_device *ndev) { struct ravb_private *priv = netdev_priv(ndev); @@ -543,6 +563,7 @@ static void ravb_emac_init_gbeth(struct net_device *ndev) ECMR_TE | ECMR_RE | ECMR_RCPT | ECMR_TXF | ECMR_RXF, ECMR); + ravb_csum_offload_init_gbeth(ndev); ravb_set_rate_gbeth(ndev); /* Set MAC address */ @@ -734,6 +755,32 @@ static void ravb_get_tx_tstamp(struct net_device *ndev) } } +static void ravb_rx_csum_gbeth(struct sk_buff *skb) +{ + __sum16 csum_ip_hdr, csum_proto; + u8 *hw_csum; + + /* The hardware checksum status is contained in sizeof(__sum16) * 2 = 4 + * bytes appended to packet data. First 2 bytes is ip header csum and + * last 2 bytes is protocol csum. + */ + if (unlikely(skb->len < sizeof(__sum16) * 2)) + return; + + hw_csum = skb_tail_pointer(skb) - sizeof(__sum16); + csum_proto = csum_unfold((__force __sum16)get_unaligned_le16(hw_csum)); + + hw_csum -= sizeof(__sum16); + csum_ip_hdr = csum_unfold((__force __sum16)get_unaligned_le16(hw_csum)); + skb_trim(skb, skb->len - 2 * sizeof(__sum16)); + + /* TODO: IPV6 Rx csum */ + if (skb->protocol == htons(ETH_P_IP) && csum_ip_hdr == TOE_RX_CSUM_OK && + csum_proto == TOE_RX_CSUM_OK) + /* Hardware validated our checksum */ + skb->ip_summed = CHECKSUM_UNNECESSARY; +} + static void ravb_rx_csum(struct sk_buff *skb) { u8 *hw_csum; @@ -819,6 +866,8 @@ static bool ravb_rx_gbeth(struct net_device *ndev, int *quota, int q) skb = ravb_get_skb_gbeth(ndev, entry, desc); skb_put(skb, pkt_len); skb->protocol = eth_type_trans(skb, ndev); + if (ndev->features & NETIF_F_RXCSUM) + ravb_rx_csum_gbeth(skb); napi_gro_receive(&priv->napi[q], skb); stats->rx_packets++; stats->rx_bytes += pkt_len; @@ -846,6 +895,8 @@ static bool ravb_rx_gbeth(struct net_device *ndev, int *quota, int q) dev_kfree_skb(skb); priv->rx_1st_skb->protocol = eth_type_trans(priv->rx_1st_skb, ndev); + if (ndev->features & NETIF_F_RXCSUM) + ravb_rx_csum_gbeth(skb); napi_gro_receive(&priv->napi[q], priv->rx_1st_skb); stats->rx_packets++; @@ -2337,8 +2388,32 @@ static void ravb_set_rx_csum(struct net_device *ndev, bool enable) static int ravb_set_features_gbeth(struct net_device *ndev, netdev_features_t features) { - /* Place holder */ - return 0; + netdev_features_t changed = ndev->features ^ features; + struct ravb_private *priv = netdev_priv(ndev); + unsigned long flags; + u32 csr0; + int ret; + + spin_lock_irqsave(&priv->lock, flags); + csr0 = ravb_read(ndev, CSR0); + ravb_write(ndev, csr0 & ~(CSR0_RPE | CSR0_TPE), CSR0); + ret = ravb_wait(ndev, CSR0, CSR0_RPE | CSR0_TPE, 0); + if (ret) + goto err_wait; + + if (changed & NETIF_F_RXCSUM) { + if (features & NETIF_F_RXCSUM) + ravb_write(ndev, CSR2_ALL, CSR2); + else + ravb_write(ndev, 0, CSR2); + } + + ndev->features = features; +err_wait: + ravb_write(ndev, csr0, CSR0); + spin_unlock_irqrestore(&priv->lock, flags); + + return ret; } static int ravb_set_features_rcar(struct net_device *ndev, @@ -2518,6 +2593,8 @@ static const struct ravb_hw_info gbeth_hw_info = { .emac_init = ravb_emac_init_gbeth, .gstrings_stats = ravb_gstrings_stats_gbeth, .gstrings_size = sizeof(ravb_gstrings_stats_gbeth), + .net_hw_features = NETIF_F_RXCSUM, + .net_features = NETIF_F_RXCSUM, .stats_len = ARRAY_SIZE(ravb_gstrings_stats_gbeth), .max_rx_len = ALIGN(GBETH_RX_BUFF_MAX, RAVB_ALIGN), .tccr_mask = TCCR_TSRQ0,
TOE has hw support for calculating IP header and TCP/UDP/ICMP checksum for both IPV4 and IPV6. Add Rx checksum offload supported by TOE for IPV4 and TCP/UDP protocols. For Rx, the result of checksum calculation is attached to last 4byte of ethernet frames. First 2bytes is result of IPV4 header checksum and next 2 bytes is TCP/UDP/ICMP. If frame does not have error "0000" attached to checksum calculation result. For unsupported frames "ffff" is attached to checksum calculation result. Cases like IPV6, IPV4 header is always set to "FFFF". We can test this functionality by the below commands ethtool -K eth0 rx on --> to turn on Rx checksum offload ethtool -K eth0 rx off --> to turn off Rx checksum offload Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/net/ethernet/renesas/ravb.h | 19 ++++++ drivers/net/ethernet/renesas/ravb_main.c | 81 +++++++++++++++++++++++- 2 files changed, 98 insertions(+), 2 deletions(-)