Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/121810 _apply patch failure_ Submitter: Mingxia Liu Date: Wednesday, January 11 2023 07:15:45 Applied on: CommitID:fe2c18a0a8b22703dec3add385a371ad819d7872 Apply patch set 121810-121815 failed: Checking patch drivers/common/idpf/idpf_common_device.c... error: drivers/common/idpf/idpf_common_device.c: does not exist in index Checking patch drivers/common/idpf/idpf_common_device.h... error: drivers/common/idpf/idpf_common_device.h: does not exist in index Checking patch drivers/common/idpf/idpf_common_virtchnl.c... error: drivers/common/idpf/idpf_common_virtchnl.c: does not exist in index Checking patch drivers/common/idpf/idpf_common_virtchnl.h... error: drivers/common/idpf/idpf_common_virtchnl.h: does not exist in index Checking patch drivers/common/idpf/version.map... error: while searching for: idpf_splitq_recv_pkts_avx512; idpf_singleq_xmit_pkts_avx512; idpf_splitq_xmit_pkts_avx512; local: *; }; error: patch failed: drivers/common/idpf/version.map:50 Checking patch drivers/net/idpf/idpf_ethdev.c... error: while searching for: return ptypes; } static int idpf_init_rss(struct idpf_vport *vport) { error: patch failed: drivers/net/idpf/idpf_ethdev.c:140 error: while searching for: goto err_vport; } vport->stopped = 0; return 0; error: patch failed: drivers/net/idpf/idpf_ethdev.c:327 Hunk #3 succeeded at 1060 (offset 369 lines). Applying patch drivers/common/idpf/version.map with 1 reject... Rejected hunk #1. Applying patch drivers/net/idpf/idpf_ethdev.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Hunk #3 applied cleanly. diff a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map (rejected hunks) @@ -50,6 +50,8 @@ INTERNAL { idpf_splitq_recv_pkts_avx512; idpf_singleq_xmit_pkts_avx512; idpf_splitq_xmit_pkts_avx512; + idpf_update_stats; + idpf_query_stats; local: *; }; diff a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c (rejected hunks) @@ -140,6 +140,86 @@ idpf_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused) return ptypes; } +static uint64_t +idpf_get_mbuf_alloc_failed_stats(struct rte_eth_dev *dev) +{ + uint64_t mbuf_alloc_failed = 0; + struct idpf_rx_queue *rxq; + int i = 0; + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; + mbuf_alloc_failed += rte_atomic64_read(&(rxq->rx_stats.mbuf_alloc_failed)); + } + + return mbuf_alloc_failed; +} + +static int +idpf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +{ + struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + struct virtchnl2_vport_stats *pstats = NULL; + int ret; + + ret = idpf_query_stats(vport, &pstats); + if (ret == 0) { + uint8_t crc_stats_len = (dev->data->dev_conf.rxmode.offloads & + RTE_ETH_RX_OFFLOAD_KEEP_CRC) ? 0 : + RTE_ETHER_CRC_LEN; + + idpf_update_stats(&vport->eth_stats_offset, pstats); + stats->ipackets = pstats->rx_unicast + pstats->rx_multicast + + pstats->rx_broadcast - pstats->rx_discards; + stats->opackets = pstats->tx_broadcast + pstats->tx_multicast + + pstats->tx_unicast; + stats->imissed = pstats->rx_discards; + stats->oerrors = pstats->tx_errors + pstats->tx_discards; + stats->ibytes = pstats->rx_bytes; + stats->ibytes -= stats->ipackets * crc_stats_len; + stats->obytes = pstats->tx_bytes; + + dev->data->rx_mbuf_alloc_failed = idpf_get_mbuf_alloc_failed_stats(dev); + stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; + } else { + PMD_DRV_LOG(ERR, "Get statistics failed"); + } + return ret; +} + +static void +idpf_reset_mbuf_alloc_failed_stats(struct rte_eth_dev *dev) +{ + struct idpf_rx_queue *rxq; + int i; + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; + rte_atomic64_set(&(rxq->rx_stats.mbuf_alloc_failed), 0); + } +} + +static int +idpf_dev_stats_reset(struct rte_eth_dev *dev) +{ + struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + struct virtchnl2_vport_stats *pstats = NULL; + int ret; + + ret = idpf_query_stats(vport, &pstats); + if (ret != 0) + return ret; + + /* set stats offset base on current values */ + vport->eth_stats_offset = *pstats; + + idpf_reset_mbuf_alloc_failed_stats(dev); + + return 0; +} + static int idpf_init_rss(struct idpf_vport *vport) { @@ -327,6 +407,11 @@ idpf_dev_start(struct rte_eth_dev *dev) goto err_vport; } + if (idpf_dev_stats_reset(dev)) { + PMD_DRV_LOG(ERR, "Failed to reset stats"); + goto err_vport; + } + vport->stopped = 0; return 0; Checking patch drivers/common/idpf/idpf_common_device.h... error: drivers/common/idpf/idpf_common_device.h: does not exist in index Checking patch drivers/common/idpf/idpf_common_virtchnl.c... error: drivers/common/idpf/idpf_common_virtchnl.c: does not exist in index Checking patch drivers/common/idpf/idpf_common_virtchnl.h... error: drivers/common/idpf/idpf_common_virtchnl.h: does not exist in index Checking patch drivers/common/idpf/version.map... error: while searching for: idpf_splitq_xmit_pkts_avx512; idpf_update_stats; idpf_query_stats; local: *; }; error: patch failed: drivers/common/idpf/version.map:52 Checking patch drivers/net/idpf/idpf_ethdev.c... error: drivers/net/idpf/idpf_ethdev.c: does not match index Checking patch drivers/net/idpf/idpf_ethdev.h... Hunk #1 succeeded at 60 (offset 12 lines). Applying patch drivers/common/idpf/version.map with 1 reject... Rejected hunk #1. Applied patch drivers/net/idpf/idpf_ethdev.h cleanly. diff a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map (rejected hunks) @@ -52,6 +52,12 @@ INTERNAL { idpf_splitq_xmit_pkts_avx512; idpf_update_stats; idpf_query_stats; + idpf_vc_set_rss_key; + idpf_vc_get_rss_key; + idpf_vc_set_rss_lut; + idpf_vc_get_rss_lut; + idpf_vc_set_rss_hash; + idpf_vc_get_rss_hash; local: *; }; Checking patch drivers/common/idpf/idpf_common_rxtx.c... error: drivers/common/idpf/idpf_common_rxtx.c: does not exist in index Checking patch drivers/common/idpf/idpf_common_rxtx.h... error: drivers/common/idpf/idpf_common_rxtx.h: does not exist in index Checking patch drivers/common/idpf/version.map... error: while searching for: idpf_splitq_recv_pkts; idpf_splitq_xmit_pkts; idpf_singleq_recv_pkts; idpf_singleq_xmit_pkts; idpf_prep_pkts; idpf_singleq_rx_vec_setup; error: patch failed: drivers/common/idpf/version.map:41 Checking patch drivers/net/idpf/idpf_ethdev.c... error: drivers/net/idpf/idpf_ethdev.c: does not match index Checking patch drivers/net/idpf/idpf_rxtx.c... Hunk #1 succeeded at 1003 (offset 500 lines). Hunk #2 succeeded at 1018 (offset 500 lines). Hunk #3 succeeded at 2264 (offset 1450 lines). Checking patch drivers/net/idpf/idpf_rxtx.h... error: while searching for: #define IDPF_DEFAULT_TX_RS_THRESH 32 #define IDPF_DEFAULT_TX_FREE_THRESH 32 int idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, unsigned int socket_id, const struct rte_eth_rxconf *rx_conf, error: patch failed: drivers/net/idpf/idpf_rxtx.h:23 Applying patch drivers/common/idpf/version.map with 1 reject... Rejected hunk #1. Applied patch drivers/net/idpf/idpf_rxtx.c cleanly. Applying patch drivers/net/idpf/idpf_rxtx.h with 1 reject... Rejected hunk #1. diff a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map (rejected hunks) @@ -41,6 +41,7 @@ INTERNAL { idpf_splitq_recv_pkts; idpf_splitq_xmit_pkts; idpf_singleq_recv_pkts; + idpf_singleq_recv_scatter_pkts; idpf_singleq_xmit_pkts; idpf_prep_pkts; idpf_singleq_rx_vec_setup; diff a/drivers/net/idpf/idpf_rxtx.h b/drivers/net/idpf/idpf_rxtx.h (rejected hunks) @@ -23,6 +23,8 @@ #define IDPF_DEFAULT_TX_RS_THRESH 32 #define IDPF_DEFAULT_TX_FREE_THRESH 32 +#define IDPF_SUPPORT_CHAIN_NUM 5 + int idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, unsigned int socket_id, const struct rte_eth_rxconf *rx_conf, Checking patch drivers/common/idpf/idpf_common_rxtx.c... error: drivers/common/idpf/idpf_common_rxtx.c: does not exist in index Checking patch drivers/common/idpf/idpf_common_device.h... error: drivers/common/idpf/idpf_common_device.h: does not exist in index Checking patch drivers/common/idpf/idpf_common_virtchnl.c... error: drivers/common/idpf/idpf_common_virtchnl.c: does not exist in index Checking patch drivers/net/idpf/idpf_ethdev.c... error: drivers/net/idpf/idpf_ethdev.c: does not match index Checking patch drivers/net/idpf/idpf_ethdev.h... error: drivers/net/idpf/idpf_ethdev.h: does not match index Checking patch drivers/net/idpf/idpf_ethdev.c... error: drivers/net/idpf/idpf_ethdev.c: does not match index https://lab.dpdk.org/results/dashboard/patchsets/24934/ UNH-IOL DPDK Community Lab