net/ice: fix function pointer in multi-process

This patch uses the index value to call the function, instead of the
function pointer assignment to save the selection of Receive Flex
Descriptor profile ID.

Otherwise the secondary process will run with wrong function address
from primary process.

Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
Acked-by: Haiyue Wang <haiyue.wang@intel.com>

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index e7217661dd40cce06977f94d188489c6c8c6e2a6..c3cad2fbbba3dd843e61cf09b082ad9ccd6b130c 100644 (file)
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -204,51 +204,55 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq,
 #endif
 }
 
+static const ice_rxd_to_pkt_fields_t rxd_to_pkt_fields_ops[] = {
+       [ICE_RXDID_COMMS_AUX_VLAN] = ice_rxd_to_pkt_fields_by_comms_aux_v1,
+       [ICE_RXDID_COMMS_AUX_IPV4] = ice_rxd_to_pkt_fields_by_comms_aux_v1,
+       [ICE_RXDID_COMMS_AUX_IPV6] = ice_rxd_to_pkt_fields_by_comms_aux_v1,
+       [ICE_RXDID_COMMS_AUX_IPV6_FLOW] = ice_rxd_to_pkt_fields_by_comms_aux_v1,
+       [ICE_RXDID_COMMS_AUX_TCP] = ice_rxd_to_pkt_fields_by_comms_aux_v1,
+       [ICE_RXDID_COMMS_AUX_IP_OFFSET] = ice_rxd_to_pkt_fields_by_comms_aux_v2,
+       [ICE_RXDID_COMMS_GENERIC] = ice_rxd_to_pkt_fields_by_comms_generic,
+       [ICE_RXDID_COMMS_OVS] = ice_rxd_to_pkt_fields_by_comms_ovs,
+};
+
 void
 ice_select_rxd_to_pkt_fields_handler(struct ice_rx_queue *rxq, uint32_t rxdid)
 {
+       rxq->rxdid = rxdid;
+
        switch (rxdid) {
        case ICE_RXDID_COMMS_AUX_VLAN:
                rxq->xtr_ol_flag = rte_net_ice_dynflag_proto_xtr_vlan_mask;
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_aux_v1;
                break;
 
        case ICE_RXDID_COMMS_AUX_IPV4:
                rxq->xtr_ol_flag = rte_net_ice_dynflag_proto_xtr_ipv4_mask;
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_aux_v1;
                break;
 
        case ICE_RXDID_COMMS_AUX_IPV6:
                rxq->xtr_ol_flag = rte_net_ice_dynflag_proto_xtr_ipv6_mask;
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_aux_v1;
                break;
 
        case ICE_RXDID_COMMS_AUX_IPV6_FLOW:
                rxq->xtr_ol_flag = rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask;
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_aux_v1;
                break;
 
        case ICE_RXDID_COMMS_AUX_TCP:
                rxq->xtr_ol_flag = rte_net_ice_dynflag_proto_xtr_tcp_mask;
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_aux_v1;
                break;
 
        case ICE_RXDID_COMMS_AUX_IP_OFFSET:
                rxq->xtr_ol_flag = rte_net_ice_dynflag_proto_xtr_ip_offset_mask;
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_aux_v2;
                break;
 
        case ICE_RXDID_COMMS_GENERIC:
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_generic;
-               break;
-
+               /* fallthrough */
        case ICE_RXDID_COMMS_OVS:
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_ovs;
                break;
 
        default:
                /* update this according to the RXDID for PROTO_XTR_NONE */
-               rxq->rxd_to_pkt_fields = ice_rxd_to_pkt_fields_by_comms_ovs;
+               rxq->rxdid = ICE_RXDID_COMMS_OVS;
                break;
        }
 
@@ -1608,7 +1612,7 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)
                        mb->packet_type = ptype_tbl[ICE_RX_FLEX_DESC_PTYPE_M &
                                rte_le_to_cpu_16(rxdp[j].wb.ptype_flex_flags0)];
                        ice_rxd_to_vlan_tci(mb, &rxdp[j]);
-                       rxq->rxd_to_pkt_fields(rxq, mb, &rxdp[j]);
+                       rxd_to_pkt_fields_ops[rxq->rxdid](rxq, mb, &rxdp[j]);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
                        if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
                                ts_ns = ice_tstamp_convert_32b_64b(hw,
@@ -1925,7 +1929,7 @@ ice_recv_scattered_pkts(void *rx_queue,
                first_seg->packet_type = ptype_tbl[ICE_RX_FLEX_DESC_PTYPE_M &
                        rte_le_to_cpu_16(rxd.wb.ptype_flex_flags0)];
                ice_rxd_to_vlan_tci(first_seg, &rxd);
-               rxq->rxd_to_pkt_fields(rxq, first_seg, &rxd);
+               rxd_to_pkt_fields_ops[rxq->rxdid](rxq, first_seg, &rxd);
                pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
                if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
@@ -2356,7 +2360,7 @@ ice_recv_pkts(void *rx_queue,
                rxm->packet_type = ptype_tbl[ICE_RX_FLEX_DESC_PTYPE_M &
                        rte_le_to_cpu_16(rxd.wb.ptype_flex_flags0)];
                ice_rxd_to_vlan_tci(rxm, &rxd);
-               rxq->rxd_to_pkt_fields(rxq, rxm, &rxd);
+               rxd_to_pkt_fields_ops[rxq->rxdid](rxq, rxm, &rxd);
                pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0);
 #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
                if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {

diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
index e1c644fb635ebb06ce7ee6696cde0a2460346c28..146dc1f95dcd83d808cd940488e4cce2637f0d6e 100644 (file)
--- a/drivers/net/ice/ice_rxtx.h
+++ b/drivers/net/ice/ice_rxtx.h
@@ -89,7 +89,7 @@ struct ice_rx_queue {
        bool rx_deferred_start; /* don't start this queue in dev start */
        uint8_t proto_xtr; /* Protocol extraction from flexible descriptor */
        uint64_t xtr_ol_flag; /* Protocol extraction offload flag */
-       ice_rxd_to_pkt_fields_t rxd_to_pkt_fields; /* handle FlexiMD by RXDID */
+       uint32_t rxdid; /* Receive Flex Descriptor profile ID */
        ice_rx_release_mbufs_t rx_rel_mbufs;
        uint64_t offloads;
        uint32_t time_high;