| Message ID | 1619180343-3943-1-git-send-email-sharathv@codeaurora.org |
|---|---|
| Headers | show |
| Series | net: qualcomm: rmnet: Enable Mapv5 | expand |
On 4/23/21 7:19 AM, Sharath Chandra Vurukala wrote: > Adding Support for MAPv5 egress packets. > Based on the configuration Request HW for csum offload > by setting the csum_valid_required of Mapv5 packet. Please try to re-word this description. I'm not sure I understand what it means. I see what I think is a bug below. Please either fix or explain. > Acked-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> > Acked-by: Alex Elder <elder@linaro.org> I did not acknowledge this patch. > Signed-off-by: Sharath Chandra Vurukala <sharathv@codeaurora.org> > --- > drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 4 +- > .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 14 +++- > drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 8 +- > .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 93 ++++++++++++++++++++-- > drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 3 +- > include/uapi/linux/if_link.h | 1 + > 6 files changed, 109 insertions(+), 14 deletions(-) > > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h > index 8d8d469..8e64ca9 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h > @@ -1,5 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > -/* Copyright (c) 2013-2014, 2016-2018 The Linux Foundation. All rights reserved. > +/* Copyright (c) 2013-2014, 2016-2018, 2021 The Linux Foundation. > + * All rights reserved. > * > * RMNET Data configuration engine > */ > @@ -56,6 +57,7 @@ struct rmnet_priv_stats { > u64 csum_fragmented_pkt; > u64 csum_skipped; > u64 csum_sw; > + u64 csum_hw; Why is this new statistic type added? Would it be meaningful to use before--with only QMAPv4? Or is there something different about QMAPv5 (inline) checksum offload that makes this necessary or desirable? This is something new that ought to be at least mentioned in the description at the top. And for future reference, this could likely have been defined in a separate patch, before this one. > }; > > struct rmnet_priv { > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > index 706a225..51a2e94 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > @@ -133,7 +133,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, > struct rmnet_port *port, u8 mux_id, > struct net_device *orig_dev) > { > - int required_headroom, additional_header_len; > + int required_headroom, additional_header_len, csum_type = 0; > struct rmnet_map_header *map_header; > > additional_header_len = 0; > @@ -142,6 +142,10 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, > if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) { > additional_header_len = sizeof(struct rmnet_map_ul_csum_header); > required_headroom += additional_header_len; > + csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV4; > + } else if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) { > + additional_header_len = sizeof(struct rmnet_map_v5_csum_header); > + csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV5; > } Does additional_header_len need to be added to required_headroom, as it is for QMAPv4 above? If so, this is a bug and must be fixed. What I tested last week (and verified work for IPA v3.5.1 and IPA v4.2) looked like this: if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) { additional_header_len = sizeof(struct rmnet_map_ul_csum_header); csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV4; } else if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) { additional_header_len = sizeof(struct rmnet_map_v5_csum_header); csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV5; } required_headroom += additional_header_len; -Alex > if (skb_headroom(skb) < required_headroom) { > @@ -149,10 +153,12 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, > return -ENOMEM; > } > > - if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) > - rmnet_map_checksum_uplink_packet(skb, orig_dev); > + if (csum_type) > + rmnet_map_checksum_uplink_packet(skb, port, orig_dev, > + csum_type); > > - map_header = rmnet_map_add_map_header(skb, additional_header_len, 0); > + map_header = rmnet_map_add_map_header(skb, additional_header_len, > + port, 0); > if (!map_header) > return -ENOMEM; > > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > index 1a399bf..e5a0b38 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > @@ -43,11 +43,15 @@ enum rmnet_map_commands { > struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, > struct rmnet_port *port); > struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb, > - int hdrlen, int pad); > + int hdrlen, > + struct rmnet_port *port, > + int pad); > void rmnet_map_command(struct sk_buff *skb, struct rmnet_port *port); > int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 len); > void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, > - struct net_device *orig_dev); > + struct rmnet_port *port, > + struct net_device *orig_dev, > + int csum_type); > int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, u16 len); > > #endif /* _RMNET_MAP_H_ */ > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > index 43813cf..339d964 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > @@ -12,6 +12,7 @@ > #include "rmnet_config.h" > #include "rmnet_map.h" > #include "rmnet_private.h" > +#include <linux/bitfield.h> > > #define RMNET_MAP_DEAGGR_SPACING 64 > #define RMNET_MAP_DEAGGR_HEADROOM (RMNET_MAP_DEAGGR_SPACING / 2) > @@ -251,12 +252,69 @@ rmnet_map_ipv6_ul_csum_header(void *ip6hdr, > } > #endif > > +static void rmnet_map_v5_checksum_uplink_packet(struct sk_buff *skb, > + struct rmnet_port *port, > + struct net_device *orig_dev) > +{ > + struct rmnet_priv *priv = netdev_priv(orig_dev); > + struct rmnet_map_v5_csum_header *ul_header; > + > + if (!(port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5)) > + return; > + > + ul_header = skb_push(skb, sizeof(*ul_header)); > + memset(ul_header, 0, sizeof(*ul_header)); > + ul_header->header_info = RMNET_MAP_HEADER_TYPE_CSUM_OFFLOAD << > + MAPV5_HDRINFO_HDR_TYPE_SHIFT; > + > + if (skb->ip_summed == CHECKSUM_PARTIAL) { > + void *iph = (char *)ul_header + sizeof(*ul_header); > + __sum16 *check; > + void *trans; > + u8 proto; > + > + if (skb->protocol == htons(ETH_P_IP)) { > + u16 ip_len = ((struct iphdr *)iph)->ihl * 4; > + > + proto = ((struct iphdr *)iph)->protocol; > + trans = iph + ip_len; > + } else if (skb->protocol == htons(ETH_P_IPV6)) { > +#if IS_ENABLED(CONFIG_IPV6) > + u16 ip_len = sizeof(struct ipv6hdr); > + > + proto = ((struct ipv6hdr *)iph)->nexthdr; > + trans = iph + ip_len; > +#else > + priv->stats.csum_err_invalid_ip_version++; > + goto sw_csum; > +#endif /* CONFIG_IPV6 */ > + } else { > + priv->stats.csum_err_invalid_ip_version++; > + goto sw_csum; > + } > + > + check = rmnet_map_get_csum_field(proto, trans); > + if (check) { > + skb->ip_summed = CHECKSUM_NONE; > + /* Ask for checksum offloading */ > + ul_header->csum_info |= MAPV5_CSUMINFO_VALID_FLAG; > + priv->stats.csum_hw++; > + return; > + } > + } > + > +sw_csum: > + priv->stats.csum_sw++; > +} > + > /* Adds MAP header to front of skb->data > * Padding is calculated and set appropriately in MAP header. Mux ID is > * initialized to 0. > */ > struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb, > - int hdrlen, int pad) > + int hdrlen, > + struct rmnet_port *port, > + int pad) > { > struct rmnet_map_header *map_header; > u32 padding, map_datalen; > @@ -267,6 +325,10 @@ struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb, > skb_push(skb, sizeof(struct rmnet_map_header)); > memset(map_header, 0, sizeof(struct rmnet_map_header)); > > + /* Set next_hdr bit for csum offload packets */ > + if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) > + map_header->flags |= MAP_NEXT_HEADER_FLAG; > + > if (pad == RMNET_MAP_NO_PAD_BYTES) { > map_header->pkt_len = htons(map_datalen); > return map_header; > @@ -394,11 +456,8 @@ int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 len) > return 0; > } > > -/* Generates UL checksum meta info header for IPv4 and IPv6 over TCP and UDP > - * packets that are supported for UL checksum offload. > - */ > -void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, > - struct net_device *orig_dev) > +static void rmnet_map_v4_checksum_uplink_packet(struct sk_buff *skb, > + struct net_device *orig_dev) > { > struct rmnet_priv *priv = netdev_priv(orig_dev); > struct rmnet_map_ul_csum_header *ul_header; > @@ -417,10 +476,12 @@ void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, > > if (skb->protocol == htons(ETH_P_IP)) { > rmnet_map_ipv4_ul_csum_header(iphdr, ul_header, skb); > + priv->stats.csum_hw++; > return; > } else if (skb->protocol == htons(ETH_P_IPV6)) { > #if IS_ENABLED(CONFIG_IPV6) > rmnet_map_ipv6_ul_csum_header(iphdr, ul_header, skb); > + priv->stats.csum_hw++; > return; > #else > priv->stats.csum_err_invalid_ip_version++; > @@ -437,6 +498,26 @@ void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, > priv->stats.csum_sw++; > } > > +/* Generates UL checksum meta info header for IPv4 and IPv6 over TCP and UDP > + * packets that are supported for UL checksum offload. > + */ > +void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, > + struct rmnet_port *port, > + struct net_device *orig_dev, > + int csum_type) > +{ > + switch (csum_type) { > + case RMNET_FLAGS_EGRESS_MAP_CKSUMV4: > + rmnet_map_v4_checksum_uplink_packet(skb, orig_dev); > + break; > + case RMNET_FLAGS_EGRESS_MAP_CKSUMV5: > + rmnet_map_v5_checksum_uplink_packet(skb, port, orig_dev); > + break; > + default: > + break; > + } > +} > + > /* Process a MAPv5 packet header */ > int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, > u16 len) > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c > index 41fbd2c..bc6d6ac 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c > @@ -174,6 +174,7 @@ static const char rmnet_gstrings_stats[][ETH_GSTRING_LEN] = { > "Checksum skipped on ip fragment", > "Checksum skipped", > "Checksum computed in software", > + "Checksum computed in hardware", > }; > > static void rmnet_get_strings(struct net_device *dev, u32 stringset, u8 *buf) > @@ -354,4 +355,4 @@ int rmnet_vnd_update_dev_mtu(struct rmnet_port *port, > } > > return 0; > -} > \ No newline at end of file > +} > diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h > index 21529b3..1691f3a 100644 > --- a/include/uapi/linux/if_link.h > +++ b/include/uapi/linux/if_link.h > @@ -1236,6 +1236,7 @@ enum { > #define RMNET_FLAGS_INGRESS_MAP_CKSUMV4 (1U << 2) > #define RMNET_FLAGS_EGRESS_MAP_CKSUMV4 (1U << 3) > #define RMNET_FLAGS_INGRESS_MAP_CKSUMV5 (1U << 4) > +#define RMNET_FLAGS_EGRESS_MAP_CKSUMV5 (1U << 5) > > enum { > IFLA_RMNET_UNSPEC, >
On 2021-04-23 18:18, Alex Elder wrote: > On 4/23/21 7:19 AM, Sharath Chandra Vurukala wrote: >> Adding support for processing of MAPv5 downlink packets. >> It involves parsing the Mapv5 packet and checking the csum header >> to know whether the hardware has validated the checksum and is >> valid or not. >> >> Based on the checksum valid bit the corresponding stats are >> incremented and skb->ip_summed is marked either CHECKSUM_UNNECESSARY >> or left as CHEKSUM_NONE to let network stack revalidate the checksum >> and update the respective snmp stats. >> >> Current MAPV1 header has been modified, the reserved field in the >> Mapv1 header is now used for next header indication. >> >> Acked-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> >> Acked-by: Alex Elder <elder@linaro.org> > > I did not acknowledge this message. I did for patch 1 > only, which only updates the documentation. > > I have a few other minor things I recommend you fix. > > I don't see any bugs, but I'm not going to offer > "Reviewed-by" until you've had a chance to either > update your patch or explain why you won't. > Sorry Alex for Adding Acked-by on all the patches, will remove in the subsequent patch. >> Signed-off-by: Sharath Chandra Vurukala <sharathv@codeaurora.org> >> --- >> .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 17 ++++--- >> drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 3 +- >> .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 58 >> +++++++++++++++++++++- >> include/linux/if_rmnet.h | 27 +++++++++- >> include/uapi/linux/if_link.h | 1 + >> 5 files changed, 97 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> index 0be5ac7..706a225 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> @@ -1,5 +1,5 @@ >> // SPDX-License-Identifier: GPL-2.0-only >> -/* Copyright (c) 2013-2018, The Linux Foundation. All rights >> reserved. >> +/* Copyright (c) 2013-2018, 2021, The Linux Foundation. All rights >> reserved. >> * >> * RMNET Data ingress/egress handler >> */ >> @@ -82,11 +82,16 @@ __rmnet_map_ingress_handler(struct sk_buff *skb, >> skb->dev = ep->egress_dev; >> - /* Subtract MAP header */ >> - skb_pull(skb, sizeof(struct rmnet_map_header)); >> - rmnet_set_skb_proto(skb); >> - >> - if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) { >> + if ((port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV5) && >> + (map_header->flags & MAP_NEXT_HEADER_FLAG)) { >> + if (rmnet_map_process_next_hdr_packet(skb, len)) >> + goto free_skb; >> + skb_pull(skb, sizeof(*map_header)); >> + rmnet_set_skb_proto(skb); >> + } else if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) { >> + /* Subtract MAP header */ >> + skb_pull(skb, sizeof(*map_header)); >> + rmnet_set_skb_proto(skb); >> if (!rmnet_map_checksum_downlink_packet(skb, len + pad)) >> skb->ip_summed = CHECKSUM_UNNECESSARY; >> } >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> index 2aea153..1a399bf 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> @@ -1,5 +1,5 @@ >> /* SPDX-License-Identifier: GPL-2.0-only */ >> -/* Copyright (c) 2013-2018, The Linux Foundation. All rights >> reserved. >> +/* Copyright (c) 2013-2018, 2021, The Linux Foundation. All rights >> reserved. >> */ >> #ifndef _RMNET_MAP_H_ >> @@ -48,5 +48,6 @@ void rmnet_map_command(struct sk_buff *skb, struct >> rmnet_port *port); >> int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 >> len); >> void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, >> struct net_device *orig_dev); >> +int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, u16 len); >> #endif /* _RMNET_MAP_H_ */ >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> index 0ac2ff8..43813cf 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> @@ -1,5 +1,5 @@ >> // SPDX-License-Identifier: GPL-2.0-only >> -/* Copyright (c) 2013-2018, The Linux Foundation. All rights >> reserved. >> +/* Copyright (c) 2013-2018, 2021, The Linux Foundation. All rights >> reserved. >> * >> * RMNET Data MAP protocol >> */ >> @@ -8,6 +8,7 @@ >> #include <linux/ip.h> >> #include <linux/ipv6.h> >> #include <net/ip6_checksum.h> >> +#include <linux/bitfield.h> >> #include "rmnet_config.h" >> #include "rmnet_map.h" >> #include "rmnet_private.h" >> @@ -300,8 +301,11 @@ struct rmnet_map_header >> *rmnet_map_add_map_header(struct sk_buff *skb, >> struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, >> struct rmnet_port *port) >> { >> + struct rmnet_map_v5_csum_header *next_hdr = NULL; >> + unsigned char *data = skb->data; > > If you define the data variable to have (void *) type you can > get rid of some casts below, and it won't need to use a cast > when assigned here either. > I will correct this and the all the comments related to the "data" variable in the subsequent patch. >> struct rmnet_map_header *maph; >> struct sk_buff *skbn; >> + u8 nexthdr_type; >> u32 packet_len; >> if (skb->len == 0) >> @@ -312,6 +316,17 @@ struct sk_buff *rmnet_map_deaggregate(struct >> sk_buff *skb, >> if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) >> packet_len += sizeof(struct rmnet_map_dl_csum_trailer); > > This block should be surrounded by curly braces. If one block > in an if statement (or chain of them) has them, they all should. > Will correct this in the next patch. >> + else if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV5) { >> + if (!(maph->flags & MAP_CMD_FLAG)) { >> + packet_len += sizeof(struct rmnet_map_v5_csum_header); > > packet_len += sizeof(*next_hdr); > >> + if (maph->flags & MAP_NEXT_HEADER_FLAG) >> + next_hdr = (struct rmnet_map_v5_csum_header *) >> + (data + sizeof(*maph)); > > If data is a void pointer, this could be: > next_hdr = data + sizeof(*maph); > >> + else >> + /* Mapv5 data pkt without csum hdr is invalid */ >> + return NULL; >> + } >> + } >> if (((int)skb->len - (int)packet_len) < 0) >> return NULL; >> @@ -320,6 +335,13 @@ struct sk_buff *rmnet_map_deaggregate(struct >> sk_buff *skb, >> if (!maph->pkt_len) >> return NULL; >> + if (next_hdr) { >> + nexthdr_type = u8_get_bits(next_hdr->header_info, >> + MAPV5_HDRINFO_HDR_TYPE_FMASK); >> + if (nexthdr_type != RMNET_MAP_HEADER_TYPE_CSUM_OFFLOAD) >> + return NULL; >> + } >> + >> skbn = alloc_skb(packet_len + RMNET_MAP_DEAGGR_SPACING, >> GFP_ATOMIC); >> if (!skbn) >> return NULL; >> @@ -414,3 +436,37 @@ void rmnet_map_checksum_uplink_packet(struct >> sk_buff *skb, >> priv->stats.csum_sw++; >> } >> + >> +/* Process a MAPv5 packet header */ >> +int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, >> + u16 len) >> +{ >> + struct rmnet_priv *priv = netdev_priv(skb->dev); >> + struct rmnet_map_v5_csum_header *next_hdr; >> + u8 nexthdr_type; >> + int rc = 0; >> + >> + next_hdr = (struct rmnet_map_v5_csum_header *)(skb->data + >> + sizeof(struct rmnet_map_header)); >> + >> + nexthdr_type = u8_get_bits(next_hdr->header_info, >> + MAPV5_HDRINFO_HDR_TYPE_FMASK); >> + >> + if (nexthdr_type == RMNET_MAP_HEADER_TYPE_CSUM_OFFLOAD) { >> + if (unlikely(!(skb->dev->features & NETIF_F_RXCSUM))) { >> + priv->stats.csum_sw++; >> + } else if (next_hdr->csum_info & MAPV5_CSUMINFO_VALID_FLAG) { >> + priv->stats.csum_ok++; >> + skb->ip_summed = CHECKSUM_UNNECESSARY; >> + } else { >> + priv->stats.csum_valid_unset++; >> + } >> + >> + /* Pull csum v5 header */ >> + skb_pull(skb, sizeof(struct rmnet_map_v5_csum_header)); > > skb_pull(skb, sizeof(*next_hdr); > >> + } else { >> + return -EINVAL; >> + } >> + >> + return rc; >> +} >> diff --git a/include/linux/if_rmnet.h b/include/linux/if_rmnet.h >> index 4efb537..f82e37e 100644 >> --- a/include/linux/if_rmnet.h >> +++ b/include/linux/if_rmnet.h >> @@ -1,5 +1,5 @@ >> /* SPDX-License-Identifier: GPL-2.0-only >> - * Copyright (c) 2013-2019, The Linux Foundation. All rights >> reserved. >> + * Copyright (c) 2013-2019, 2021 The Linux Foundation. All rights >> reserved. >> */ >> #ifndef _LINUX_IF_RMNET_H_ >> @@ -14,8 +14,10 @@ struct rmnet_map_header { >> /* rmnet_map_header flags field: >> * PAD_LEN: number of pad bytes following packet data >> * CMD: 1 = packet contains a MAP command; 0 = packet contains data >> + * NEXT_HEADER 1 = packet contains V5 CSUM header 0 = no V5 CSUM >> header >> */ >> #define MAP_PAD_LEN_MASK GENMASK(5, 0) >> +#define MAP_NEXT_HEADER_FLAG BIT(6) >> #define MAP_CMD_FLAG BIT(7) >> struct rmnet_map_dl_csum_trailer { >> @@ -45,4 +47,27 @@ struct rmnet_map_ul_csum_header { >> #define MAP_CSUM_UL_UDP_FLAG BIT(14) >> #define MAP_CSUM_UL_ENABLED_FLAG BIT(15) >> +/* MAP CSUM headers */ >> +struct rmnet_map_v5_csum_header { >> + u8 header_info; >> + u8 csum_info; >> + __be16 reserved; >> +} __aligned(1); >> + >> +/* v5 header_info field >> + * NEXT_HEADER: Represents whether there is any other header >> + * HEADER TYPE: represents the type of this header >> + * >> + * csum_info field >> + * CSUM_VALID_OR_REQ: >> + * 1 = for UL, checksum computation is requested. >> + * 1 = for DL, validated the checksum and has found it valid >> + */ >> + >> +#define MAPV5_HDRINFO_NXT_HDR_FLAG BIT(0) >> +#define MAPV5_HDRINFO_HDR_TYPE_SHIFT 1 >> +#define MAPV5_HDRINFO_HDR_TYPE_FMASK GENMASK(7, >> MAPV5_HDRINFO_HDR_TYPE_SHIFT) >> +#define MAPV5_CSUMINFO_VALID_FLAG BIT(7) > > This is the only place you use MAPV5_HDRINFO_TYPE_SHIFT. > Defining and using it here immediately after its definition > subtracts, rather than adds value. Just do: > > #define MAPV5_HDRINFO_HDR_TYPE_FMASK GENMASK(7, 1) > > -Alex > The MAPV5_HDRINFO_HDR_TYPE_SHIFT is used in the uplink to set the header_type in the header_info field. Will use u8_encode_bits and get rid of this in next patch. >> +#define RMNET_MAP_HEADER_TYPE_CSUM_OFFLOAD 2 >> #endif /* !(_LINUX_IF_RMNET_H_) */ >> diff --git a/include/uapi/linux/if_link.h >> b/include/uapi/linux/if_link.h >> index 91c8dda..21529b3 100644 >> --- a/include/uapi/linux/if_link.h >> +++ b/include/uapi/linux/if_link.h >> @@ -1235,6 +1235,7 @@ enum { >> #define RMNET_FLAGS_INGRESS_MAP_COMMANDS (1U << 1) >> #define RMNET_FLAGS_INGRESS_MAP_CKSUMV4 (1U << 2) >> #define RMNET_FLAGS_EGRESS_MAP_CKSUMV4 (1U << 3) >> +#define RMNET_FLAGS_INGRESS_MAP_CKSUMV5 (1U << 4) >> enum { >> IFLA_RMNET_UNSPEC, >>
On 2021-04-23 18:18, Alex Elder wrote: > On 4/23/21 7:19 AM, Sharath Chandra Vurukala wrote: >> Adding Support for MAPv5 egress packets. >> Based on the configuration Request HW for csum offload >> by setting the csum_valid_required of Mapv5 packet. > > Please try to re-word this description. I'm not sure > I understand what it means. > > I see what I think is a bug below. Please either > fix or explain. > >> Acked-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> >> Acked-by: Alex Elder <elder@linaro.org> > > I did not acknowledge this patch. > I will rewrite the description with more details and clear wordings. Thanks. >> Signed-off-by: Sharath Chandra Vurukala <sharathv@codeaurora.org> >> --- >> drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 4 +- >> .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 14 +++- >> drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 8 +- >> .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 93 >> ++++++++++++++++++++-- >> drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 3 +- >> include/uapi/linux/if_link.h | 1 + >> 6 files changed, 109 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h >> index 8d8d469..8e64ca9 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h >> @@ -1,5 +1,6 @@ >> /* SPDX-License-Identifier: GPL-2.0-only */ >> -/* Copyright (c) 2013-2014, 2016-2018 The Linux Foundation. All >> rights reserved. >> +/* Copyright (c) 2013-2014, 2016-2018, 2021 The Linux Foundation. >> + * All rights reserved. >> * >> * RMNET Data configuration engine >> */ >> @@ -56,6 +57,7 @@ struct rmnet_priv_stats { >> u64 csum_fragmented_pkt; >> u64 csum_skipped; >> u64 csum_sw; >> + u64 csum_hw; > > Why is this new statistic type added? Would it be > meaningful to use before--with only QMAPv4? Or is > there something different about QMAPv5 (inline) checksum > offload that makes this necessary or desirable? > > This is something new that ought to be at least > mentioned in the description at the top. And for > future reference, this could likely have been > defined in a separate patch, before this one. > Will update the description with details about this stat. >> }; >> struct rmnet_priv { >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> index 706a225..51a2e94 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c >> @@ -133,7 +133,7 @@ static int rmnet_map_egress_handler(struct sk_buff >> *skb, >> struct rmnet_port *port, u8 mux_id, >> struct net_device *orig_dev) >> { >> - int required_headroom, additional_header_len; >> + int required_headroom, additional_header_len, csum_type = 0; >> struct rmnet_map_header *map_header; >> additional_header_len = 0; >> @@ -142,6 +142,10 @@ static int rmnet_map_egress_handler(struct >> sk_buff *skb, >> if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) { >> additional_header_len = sizeof(struct rmnet_map_ul_csum_header); >> required_headroom += additional_header_len; >> + csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV4; >> + } else if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) { >> + additional_header_len = sizeof(struct rmnet_map_v5_csum_header); >> + csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV5; >> } > > Does additional_header_len need to be added to required_headroom, > as it is for QMAPv4 above? > > If so, this is a bug and must be fixed. > > What I tested last week (and verified work for IPA v3.5.1 and > IPA v4.2) looked like this: > > if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) { > additional_header_len = sizeof(struct > rmnet_map_ul_csum_header); > csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV4; > } else if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) { > additional_header_len = sizeof(struct > rmnet_map_v5_csum_header); > csum_type = RMNET_FLAGS_EGRESS_MAP_CKSUMV5; > } > required_headroom += additional_header_len; > > -Alex > Thanks a lot in identifying the bug, I messed up with the patches before raising them for review. Will share the corrected version in subsequent patch. >> if (skb_headroom(skb) < required_headroom) { >> @@ -149,10 +153,12 @@ static int rmnet_map_egress_handler(struct >> sk_buff *skb, >> return -ENOMEM; >> } >> - if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) >> - rmnet_map_checksum_uplink_packet(skb, orig_dev); >> + if (csum_type) >> + rmnet_map_checksum_uplink_packet(skb, port, orig_dev, >> + csum_type); >> - map_header = rmnet_map_add_map_header(skb, additional_header_len, >> 0); >> + map_header = rmnet_map_add_map_header(skb, additional_header_len, >> + port, 0); >> if (!map_header) >> return -ENOMEM; >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> index 1a399bf..e5a0b38 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h >> @@ -43,11 +43,15 @@ enum rmnet_map_commands { >> struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, >> struct rmnet_port *port); >> struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff >> *skb, >> - int hdrlen, int pad); >> + int hdrlen, >> + struct rmnet_port *port, >> + int pad); >> void rmnet_map_command(struct sk_buff *skb, struct rmnet_port >> *port); >> int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 >> len); >> void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, >> - struct net_device *orig_dev); >> + struct rmnet_port *port, >> + struct net_device *orig_dev, >> + int csum_type); >> int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, u16 len); >> #endif /* _RMNET_MAP_H_ */ >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> index 43813cf..339d964 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c >> @@ -12,6 +12,7 @@ >> #include "rmnet_config.h" >> #include "rmnet_map.h" >> #include "rmnet_private.h" >> +#include <linux/bitfield.h> >> #define RMNET_MAP_DEAGGR_SPACING 64 >> #define RMNET_MAP_DEAGGR_HEADROOM (RMNET_MAP_DEAGGR_SPACING / 2) >> @@ -251,12 +252,69 @@ rmnet_map_ipv6_ul_csum_header(void *ip6hdr, >> } >> #endif >> +static void rmnet_map_v5_checksum_uplink_packet(struct sk_buff >> *skb, >> + struct rmnet_port *port, >> + struct net_device *orig_dev) >> +{ >> + struct rmnet_priv *priv = netdev_priv(orig_dev); >> + struct rmnet_map_v5_csum_header *ul_header; >> + >> + if (!(port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5)) >> + return; >> + >> + ul_header = skb_push(skb, sizeof(*ul_header)); >> + memset(ul_header, 0, sizeof(*ul_header)); >> + ul_header->header_info = RMNET_MAP_HEADER_TYPE_CSUM_OFFLOAD << >> + MAPV5_HDRINFO_HDR_TYPE_SHIFT; >> + >> + if (skb->ip_summed == CHECKSUM_PARTIAL) { >> + void *iph = (char *)ul_header + sizeof(*ul_header); >> + __sum16 *check; >> + void *trans; >> + u8 proto; >> + >> + if (skb->protocol == htons(ETH_P_IP)) { >> + u16 ip_len = ((struct iphdr *)iph)->ihl * 4; >> + >> + proto = ((struct iphdr *)iph)->protocol; >> + trans = iph + ip_len; >> + } else if (skb->protocol == htons(ETH_P_IPV6)) { >> +#if IS_ENABLED(CONFIG_IPV6) >> + u16 ip_len = sizeof(struct ipv6hdr); >> + >> + proto = ((struct ipv6hdr *)iph)->nexthdr; >> + trans = iph + ip_len; >> +#else >> + priv->stats.csum_err_invalid_ip_version++; >> + goto sw_csum; >> +#endif /* CONFIG_IPV6 */ >> + } else { >> + priv->stats.csum_err_invalid_ip_version++; >> + goto sw_csum; >> + } >> + >> + check = rmnet_map_get_csum_field(proto, trans); >> + if (check) { >> + skb->ip_summed = CHECKSUM_NONE; >> + /* Ask for checksum offloading */ >> + ul_header->csum_info |= MAPV5_CSUMINFO_VALID_FLAG; >> + priv->stats.csum_hw++; >> + return; >> + } >> + } >> + >> +sw_csum: >> + priv->stats.csum_sw++; >> +} >> + >> /* Adds MAP header to front of skb->data >> * Padding is calculated and set appropriately in MAP header. Mux ID >> is >> * initialized to 0. >> */ >> struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff >> *skb, >> - int hdrlen, int pad) >> + int hdrlen, >> + struct rmnet_port *port, >> + int pad) >> { >> struct rmnet_map_header *map_header; >> u32 padding, map_datalen; >> @@ -267,6 +325,10 @@ struct rmnet_map_header >> *rmnet_map_add_map_header(struct sk_buff *skb, >> skb_push(skb, sizeof(struct rmnet_map_header)); >> memset(map_header, 0, sizeof(struct rmnet_map_header)); >> + /* Set next_hdr bit for csum offload packets */ >> + if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) >> + map_header->flags |= MAP_NEXT_HEADER_FLAG; >> + >> if (pad == RMNET_MAP_NO_PAD_BYTES) { >> map_header->pkt_len = htons(map_datalen); >> return map_header; >> @@ -394,11 +456,8 @@ int rmnet_map_checksum_downlink_packet(struct >> sk_buff *skb, u16 len) >> return 0; >> } >> -/* Generates UL checksum meta info header for IPv4 and IPv6 over >> TCP and UDP >> - * packets that are supported for UL checksum offload. >> - */ >> -void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, >> - struct net_device *orig_dev) >> +static void rmnet_map_v4_checksum_uplink_packet(struct sk_buff *skb, >> + struct net_device *orig_dev) >> { >> struct rmnet_priv *priv = netdev_priv(orig_dev); >> struct rmnet_map_ul_csum_header *ul_header; >> @@ -417,10 +476,12 @@ void rmnet_map_checksum_uplink_packet(struct >> sk_buff *skb, >> if (skb->protocol == htons(ETH_P_IP)) { >> rmnet_map_ipv4_ul_csum_header(iphdr, ul_header, skb); >> + priv->stats.csum_hw++; >> return; >> } else if (skb->protocol == htons(ETH_P_IPV6)) { >> #if IS_ENABLED(CONFIG_IPV6) >> rmnet_map_ipv6_ul_csum_header(iphdr, ul_header, skb); >> + priv->stats.csum_hw++; >> return; >> #else >> priv->stats.csum_err_invalid_ip_version++; >> @@ -437,6 +498,26 @@ void rmnet_map_checksum_uplink_packet(struct >> sk_buff *skb, >> priv->stats.csum_sw++; >> } >> +/* Generates UL checksum meta info header for IPv4 and IPv6 over >> TCP and UDP >> + * packets that are supported for UL checksum offload. >> + */ >> +void rmnet_map_checksum_uplink_packet(struct sk_buff *skb, >> + struct rmnet_port *port, >> + struct net_device *orig_dev, >> + int csum_type) >> +{ >> + switch (csum_type) { >> + case RMNET_FLAGS_EGRESS_MAP_CKSUMV4: >> + rmnet_map_v4_checksum_uplink_packet(skb, orig_dev); >> + break; >> + case RMNET_FLAGS_EGRESS_MAP_CKSUMV5: >> + rmnet_map_v5_checksum_uplink_packet(skb, port, orig_dev); >> + break; >> + default: >> + break; >> + } >> +} >> + >> /* Process a MAPv5 packet header */ >> int rmnet_map_process_next_hdr_packet(struct sk_buff *skb, >> u16 len) >> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c >> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c >> index 41fbd2c..bc6d6ac 100644 >> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c >> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c >> @@ -174,6 +174,7 @@ static const char >> rmnet_gstrings_stats[][ETH_GSTRING_LEN] = { >> "Checksum skipped on ip fragment", >> "Checksum skipped", >> "Checksum computed in software", >> + "Checksum computed in hardware", >> }; >> static void rmnet_get_strings(struct net_device *dev, u32 >> stringset, u8 *buf) >> @@ -354,4 +355,4 @@ int rmnet_vnd_update_dev_mtu(struct rmnet_port >> *port, >> } >> return 0; >> -} >> \ No newline at end of file >> +} >> diff --git a/include/uapi/linux/if_link.h >> b/include/uapi/linux/if_link.h >> index 21529b3..1691f3a 100644 >> --- a/include/uapi/linux/if_link.h >> +++ b/include/uapi/linux/if_link.h >> @@ -1236,6 +1236,7 @@ enum { >> #define RMNET_FLAGS_INGRESS_MAP_CKSUMV4 (1U << 2) >> #define RMNET_FLAGS_EGRESS_MAP_CKSUMV4 (1U << 3) >> #define RMNET_FLAGS_INGRESS_MAP_CKSUMV5 (1U << 4) >> +#define RMNET_FLAGS_EGRESS_MAP_CKSUMV5 (1U << 5) >> enum { >> IFLA_RMNET_UNSPEC, >>
This series introduces the MAPv5 packet format. Patch 0 documents the MAPv4/v5. Patch 1 introduces the MAPv5 and the Inline checksum offload for RX/Ingress. Patch 2 introduces the MAPv5 and the Inline checksum offload for TX/Egress. A new checksum header format is used as part of MAPv5.For RX checksum offload, the checksum is verified by the HW and the validity is marked in the checksum header of MAPv5. For TX, the required metadata is filled up so hardware can compute the checksum. v1->v2: - Fixed the compilation errors, warnings reported by kernel test robot. - Checksum header definition is expanded to support big, little endian formats as mentioned by Jakub. v2->v3: - Fixed compilation errors reported by kernel bot for big endian flavor. v3->v4: - Made changes to use masks instead of C bit-fields as suggested by Jakub/Alex. v4->v5: - Corrected checkpatch errors and warnings reported by patchwork. Sharath Chandra Vurukala (3): docs: networking: Add documentation for MAPv5 net: ethernet: rmnet: Support for ingress MAPv5 checksum offload net: ethernet: rmnet: Add support for MAPv5 egress packets .../device_drivers/cellular/qualcomm/rmnet.rst | 126 +++++++++++++++-- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 4 +- .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 31 +++-- drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 11 +- .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 151 ++++++++++++++++++++- drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 3 +- include/linux/if_rmnet.h | 27 +++- include/uapi/linux/if_link.h | 2 + 8 files changed, 320 insertions(+), 35 deletions(-)