Implement xmo_rx_checksum callback in ice driver to report RX checksum result to the eBPF program bounded to the NIC. Introduce ice_get_rx_csum utility routine in order to rx cksum codebase available in ice_rx_csum().
Signed-off-by: Lorenzo Bianconi lorenzo@kernel.org --- drivers/net/ethernet/intel/ice/ice_base.c | 1 + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 125 +++++++++++++++++--------- 3 files changed, 83 insertions(+), 44 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c index 2d35a278c555c526939e509c386959da6ce0cba9..7b1e932c8abc6292173caa36e4e26866d2e956bd 100644 --- a/drivers/net/ethernet/intel/ice/ice_base.c +++ b/drivers/net/ethernet/intel/ice/ice_base.c @@ -695,6 +695,7 @@ static int ice_vsi_cfg_rxq(struct ice_rx_ring *ring) } }
+ ring->pkt_ctx.rxq_flags = ring->flags; xdp_init_buff(&ring->xdp, ice_get_frame_sz(ring), &ring->xdp_rxq); ring->xdp.data = NULL; ring->xdp_ext.pkt_ctx = &ring->pkt_ctx; diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h index 841a07bfba54ffb4907e765881bee993238cf7b8..cb6bd1e9cb97f0384b86e0f9e64339f68cae0e52 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.h +++ b/drivers/net/ethernet/intel/ice/ice_txrx.h @@ -260,6 +260,7 @@ enum ice_rx_dtype { struct ice_pkt_ctx { u64 cached_phctime; __be16 vlan_proto; + u8 rxq_flags; };
struct ice_xdp_buff { diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c index 45cfaabc41cbeb9b119a0e95547e012e0df1e188..56c3f09c81cefc137c6866cdc546a7c96b7890ac 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c @@ -80,69 +80,46 @@ ice_rx_hash_to_skb(const struct ice_rx_ring *rx_ring, libeth_rx_pt_set_hash(skb, hash, decoded); }
-/** - * ice_rx_gcs - Set generic checksum in skb - * @skb: skb currently being received and modified - * @rx_desc: receive descriptor - */ -static void ice_rx_gcs(struct sk_buff *skb, - const union ice_32b_rx_flex_desc *rx_desc) -{ - const struct ice_32b_rx_flex_desc_nic *desc; - u16 csum; - - desc = (struct ice_32b_rx_flex_desc_nic *)rx_desc; - skb->ip_summed = CHECKSUM_COMPLETE; - csum = (__force u16)desc->raw_csum; - skb->csum = csum_unfold((__force __sum16)swab16(csum)); -} - -/** - * ice_rx_csum - Indicate in skb if checksum is good - * @ring: the ring we care about - * @skb: skb currently being received and modified - * @rx_desc: the receive descriptor - * @ptype: the packet type decoded by hardware - * - * skb->protocol must be set before this function is called - */ static void -ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb, - union ice_32b_rx_flex_desc *rx_desc, u16 ptype) +ice_get_rx_csum(const union ice_32b_rx_flex_desc *rx_desc, u16 ptype, + struct net_device *dev, struct ice_pf *pf, u8 rxq_flag, + enum xdp_checksum *ip_summed, u32 *cksum_meta) { - struct libeth_rx_pt decoded; + struct libeth_rx_pt decoded = libie_rx_pt_parse(ptype); u16 rx_status0, rx_status1; bool ipv4, ipv6;
- /* Start with CHECKSUM_NONE and by default csum_level = 0 */ - skb->ip_summed = CHECKSUM_NONE; - - decoded = libie_rx_pt_parse(ptype); - if (!libeth_rx_pt_has_checksum(ring->netdev, decoded)) - return; + if (!libeth_rx_pt_has_checksum(dev, decoded)) + goto checksum_none;
rx_status0 = le16_to_cpu(rx_desc->wb.status_error0); rx_status1 = le16_to_cpu(rx_desc->wb.status_error1); - - if ((ring->flags & ICE_RX_FLAGS_RING_GCS) && + if ((rxq_flag & ICE_RX_FLAGS_RING_GCS) && rx_desc->wb.rxdid == ICE_RXDID_FLEX_NIC && (decoded.inner_prot == LIBETH_RX_PT_INNER_TCP || decoded.inner_prot == LIBETH_RX_PT_INNER_UDP || decoded.inner_prot == LIBETH_RX_PT_INNER_ICMP)) { - ice_rx_gcs(skb, rx_desc); + const struct ice_32b_rx_flex_desc_nic *desc; + u16 csum; + + desc = (struct ice_32b_rx_flex_desc_nic *)rx_desc; + *ip_summed = XDP_CHECKSUM_COMPLETE; + csum = (__force u16)desc->raw_csum; + *cksum_meta = csum_unfold((__force __sum16)swab16(csum)); return; }
/* check if HW has decoded the packet and checksum */ if (!(rx_status0 & BIT(ICE_RX_FLEX_DESC_STATUS0_L3L4P_S))) - return; + goto checksum_none;
ipv4 = libeth_rx_pt_get_ip_ver(decoded) == LIBETH_RX_PT_OUTER_IPV4; ipv6 = libeth_rx_pt_get_ip_ver(decoded) == LIBETH_RX_PT_OUTER_IPV6;
if (ipv4 && (rx_status0 & (BIT(ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S)))) { - ring->vsi->back->hw_rx_eipe_error++; - return; + if (pf) + pf->hw_rx_eipe_error++; + goto checksum_none; }
if (ipv4 && (rx_status0 & (BIT(ICE_RX_FLEX_DESC_STATUS0_XSUM_IPE_S)))) @@ -167,13 +144,48 @@ ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb, * we are indicating we validated the inner checksum. */ if (decoded.tunnel_type >= LIBETH_RX_PT_TUNNEL_IP_GRENAT) - skb->csum_level = 1; + *cksum_meta = 1;
- skb->ip_summed = CHECKSUM_UNNECESSARY; + *ip_summed = XDP_CHECKSUM_UNNECESSARY; return;
checksum_fail: - ring->vsi->back->hw_csum_rx_error++; + if (pf) + pf->hw_csum_rx_error++; +checksum_none: + *ip_summed = XDP_CHECKSUM_NONE; + *cksum_meta = 0; +} + +/** + * ice_rx_csum - Indicate in skb if checksum is good + * @ring: the ring we care about + * @skb: skb currently being received and modified + * @rx_desc: the receive descriptor + * @ptype: the packet type decoded by hardware + * + * skb->protocol must be set before this function is called + */ +static void +ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb, + union ice_32b_rx_flex_desc *rx_desc, u16 ptype) +{ + enum xdp_checksum ip_summed; + u32 cksum_meta; + + ice_get_rx_csum(rx_desc, ptype, ring->netdev, ring->vsi->back, + ring->flags, &ip_summed, &cksum_meta); + switch (ip_summed) { + case XDP_CHECKSUM_UNNECESSARY: + skb->csum_level = cksum_meta; + break; + case XDP_CHECKSUM_COMPLETE: + skb->csum = cksum_meta; + break; + default: + break; + } + skb->ip_summed = ip_summed; }
/** @@ -555,6 +567,30 @@ static int ice_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash, return 0; }
+/** + * ice_xdp_rx_checksum - RX checksum XDP hint handler + * @ctx: XDP buff pointer + * @ip_summed: RX checksum result destination address + * @cksum_meta: XDP RX checksum metadata destination address + * + * Copy RX checksum result (if available) and its metadata to the + * destination address. + */ +static int ice_xdp_rx_checksum(const struct xdp_md *ctx, + enum xdp_checksum *ip_summed, + u32 *cksum_meta) +{ + const struct ice_xdp_buff *xdp_ext = (void *)ctx; + const union ice_32b_rx_flex_desc *rx_desc = xdp_ext->eop_desc; + + ice_get_rx_csum(rx_desc, ice_get_ptype(rx_desc), + xdp_ext->xdp_buff.rxq->dev, NULL, + xdp_ext->pkt_ctx->rxq_flags, + ip_summed, cksum_meta); + + return 0; +} + /** * ice_xdp_rx_vlan_tag - VLAN tag XDP hint handler * @ctx: XDP buff pointer @@ -584,4 +620,5 @@ const struct xdp_metadata_ops ice_xdp_md_ops = { .xmo_rx_timestamp = ice_xdp_rx_hw_ts, .xmo_rx_hash = ice_xdp_rx_hash, .xmo_rx_vlan_tag = ice_xdp_rx_vlan_tag, + .xmo_rx_checksum = ice_xdp_rx_checksum, };