net/ice: support auxiliary IP offset Rx descriptor

[dpdk.git] / drivers / net / ice / ice_rxtx.c

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index b83c5c8..ad58442 100644 (file)
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -23,27 +23,40 @@ uint64_t rte_net_ice_dynflag_proto_xtr_ipv4_mask;
 uint64_t rte_net_ice_dynflag_proto_xtr_ipv6_mask;
 uint64_t rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask;
 uint64_t rte_net_ice_dynflag_proto_xtr_tcp_mask;
+uint64_t rte_net_ice_dynflag_proto_xtr_ip_offset_mask;
 
 static inline uint64_t
-ice_rxdid_to_proto_xtr_ol_flag(uint8_t rxdid)
-{
-       static uint64_t *ol_flag_map[] = {
-               [ICE_RXDID_COMMS_AUX_VLAN] =
-                               &rte_net_ice_dynflag_proto_xtr_vlan_mask,
-               [ICE_RXDID_COMMS_AUX_IPV4] =
-                               &rte_net_ice_dynflag_proto_xtr_ipv4_mask,
-               [ICE_RXDID_COMMS_AUX_IPV6] =
-                               &rte_net_ice_dynflag_proto_xtr_ipv6_mask,
-               [ICE_RXDID_COMMS_AUX_IPV6_FLOW] =
-                               &rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask,
-               [ICE_RXDID_COMMS_AUX_TCP] =
-                               &rte_net_ice_dynflag_proto_xtr_tcp_mask,
+ice_rxdid_to_proto_xtr_ol_flag(uint8_t rxdid, bool *chk_valid)
+{
+       static struct {
+               uint64_t *ol_flag;
+               bool chk_valid;
+       } ol_flag_map[] = {
+               [ICE_RXDID_COMMS_AUX_VLAN] = {
+                       &rte_net_ice_dynflag_proto_xtr_vlan_mask, true },
+               [ICE_RXDID_COMMS_AUX_IPV4] = {
+                       &rte_net_ice_dynflag_proto_xtr_ipv4_mask, true },
+               [ICE_RXDID_COMMS_AUX_IPV6] = {
+                       &rte_net_ice_dynflag_proto_xtr_ipv6_mask, true },
+               [ICE_RXDID_COMMS_AUX_IPV6_FLOW] = {
+                       &rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask, true },
+               [ICE_RXDID_COMMS_AUX_TCP] = {
+                       &rte_net_ice_dynflag_proto_xtr_tcp_mask, true },
+               [ICE_RXDID_COMMS_AUX_IP_OFFSET] = {
+                       &rte_net_ice_dynflag_proto_xtr_ip_offset_mask, false },
        };
        uint64_t *ol_flag;
 
-       ol_flag = rxdid < RTE_DIM(ol_flag_map) ? ol_flag_map[rxdid] : NULL;
+       if (rxdid < RTE_DIM(ol_flag_map)) {
+               ol_flag = ol_flag_map[rxdid].ol_flag;
+               if (!ol_flag)
+                       return 0ULL;
 
-       return ol_flag != NULL ? *ol_flag : 0ULL;
+               *chk_valid = ol_flag_map[rxdid].chk_valid;
+               return *ol_flag;
+       }
+
+       return 0ULL;
 }
 
 static inline uint8_t
@@ -56,6 +69,7 @@ ice_proto_xtr_type_to_rxdid(uint8_t xtr_type)
                [PROTO_XTR_IPV6]      = ICE_RXDID_COMMS_AUX_IPV6,
                [PROTO_XTR_IPV6_FLOW] = ICE_RXDID_COMMS_AUX_IPV6_FLOW,
                [PROTO_XTR_TCP]       = ICE_RXDID_COMMS_AUX_TCP,
+               [PROTO_XTR_IP_OFFSET] = ICE_RXDID_COMMS_AUX_IP_OFFSET,
        };
 
        return xtr_type < RTE_DIM(rxdid_map) ?
@@ -1312,23 +1326,32 @@ ice_rxd_to_proto_xtr(struct rte_mbuf *mb,
                     volatile struct ice_32b_rx_flex_desc_comms *desc)
 {
        uint16_t stat_err = rte_le_to_cpu_16(desc->status_error1);
-       uint32_t metadata;
+       uint32_t metadata = 0;
        uint64_t ol_flag;
+       bool chk_valid;
 
-       if (unlikely(!(stat_err & ICE_RX_PROTO_XTR_VALID)))
-               return;
-
-       ol_flag = ice_rxdid_to_proto_xtr_ol_flag(desc->rxdid);
+       ol_flag = ice_rxdid_to_proto_xtr_ol_flag(desc->rxdid, &chk_valid);
        if (unlikely(!ol_flag))
                return;
 
-       mb->ol_flags |= ol_flag;
+       if (chk_valid) {
+               if (stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD4_VALID_S))
+                       metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux0);
+
+               if (stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD5_VALID_S))
+                       metadata |=
+                               rte_le_to_cpu_16(desc->flex_ts.flex.aux1) << 16;
+       } else {
+               if (rte_le_to_cpu_16(desc->flex_ts.flex.aux0) != 0xFFFF)
+                       metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux0);
+               else if (rte_le_to_cpu_16(desc->flex_ts.flex.aux1) != 0xFFFF)
+                       metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux1);
+       }
 
-       metadata = stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD4_VALID_S) ?
-                               rte_le_to_cpu_16(desc->flex_ts.flex.aux0) : 0;
+       if (!metadata)
+               return;
 
-       if (likely(stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD5_VALID_S)))
-               metadata |= rte_le_to_cpu_16(desc->flex_ts.flex.aux1) << 16;
+       mb->ol_flags |= ol_flag;
 
        *RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
 }
@@ -2234,7 +2257,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
        switch (ol_flags & PKT_TX_L4_MASK) {
        case PKT_TX_TCP_CKSUM:
                *td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;
-               *td_offset |= (tx_offload.l4_len >> 2) <<
+               *td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) <<
                              ICE_TX_DESC_LEN_L4_LEN_S;
                break;
        case PKT_TX_SCTP_CKSUM:
@@ -2371,28 +2394,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt)
        return count;
 }
 
-/* Calculate TCP header length for PKT_TX_TCP_CKSUM if not provided */
-static inline uint16_t
-ice_calc_pkt_tcp_hdr(struct rte_mbuf *tx_pkt, union ice_tx_offload tx_offload)
-{
-       uint16_t tcpoff = tx_offload.l2_len + tx_offload.l3_len;
-       const struct rte_tcp_hdr *tcp_hdr;
-       struct rte_tcp_hdr _tcp_hdr;
-
-       if (tcpoff + sizeof(struct rte_tcp_hdr) < tx_pkt->data_len) {
-               tcp_hdr = rte_pktmbuf_mtod_offset(tx_pkt, struct rte_tcp_hdr *,
-                                                 tcpoff);
-
-               return (tcp_hdr->data_off & 0xf0) >> 2;
-       }
-
-       tcp_hdr = rte_pktmbuf_read(tx_pkt, tcpoff, sizeof(_tcp_hdr), &_tcp_hdr);
-       if (tcp_hdr)
-               return (tcp_hdr->data_off & 0xf0) >> 2;
-       else
-               return 0;
-}
-
 uint16_t
 ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
@@ -2491,15 +2492,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                                                   &cd_tunneling_params);
 
                /* Enable checksum offloading */
-               if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) {
-                       if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM &&
-                           !tx_offload.l4_len)
-                               tx_offload.l4_len =
-                                    ice_calc_pkt_tcp_hdr(tx_pkt, tx_offload);
-
+               if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK)
                        ice_txd_enable_checksum(ol_flags, &td_cmd,
                                                &td_offset, tx_offload);
-               }
 
                if (nb_ctx) {
                        /* Setup TX context descriptor if required */