Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 135725,
    "url": "http://patchwork.dpdk.org/api/patches/135725/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240104101805.1765049-2-mingjinx.ye@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20240104101805.1765049-2-mingjinx.ye@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20240104101805.1765049-2-mingjinx.ye@intel.com",
    "date": "2024-01-04T10:18:04",
    "name": "[v9,1/2] net/iavf: fix Rx/Tx burst in multi-process",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "121128b8eab9d4be1a4f4e90b48f0e4d0fd418ba",
    "submitter": {
        "id": 2862,
        "url": "http://patchwork.dpdk.org/api/people/2862/?format=api",
        "name": "Mingjin Ye",
        "email": "mingjinx.ye@intel.com"
    },
    "delegate": {
        "id": 1540,
        "url": "http://patchwork.dpdk.org/api/users/1540/?format=api",
        "username": "qzhan15",
        "first_name": "Qi",
        "last_name": "Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240104101805.1765049-2-mingjinx.ye@intel.com/mbox/",
    "series": [
        {
            "id": 30718,
            "url": "http://patchwork.dpdk.org/api/series/30718/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=30718",
            "date": "2024-01-04T10:18:03",
            "name": "net/iavf: fix Rx/Tx burst and add diagnostics",
            "version": 9,
            "mbox": "http://patchwork.dpdk.org/series/30718/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/135725/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/135725/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0AF4743815;\n\tThu,  4 Jan 2024 11:34:52 +0100 (CET)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E847A402EB;\n\tThu,  4 Jan 2024 11:34:51 +0100 (CET)",
            "from mgamail.intel.com (mgamail.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id 7BE55402EB;\n Thu,  4 Jan 2024 11:34:50 +0100 (CET)",
            "from fmviesa001.fm.intel.com ([10.60.135.141])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 04 Jan 2024 02:34:49 -0800",
            "from unknown (HELO localhost.localdomain) ([10.239.252.253])\n by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 04 Jan 2024 02:34:47 -0800"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1704364490; x=1735900490;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=ac/4UPx4uIBu4iceik0kINqWn+EBuonLMhL94yvsfVA=;\n b=XJiYdoxo43JJedH90SXOUbkn96GxVifKOdctNXze1WfShTKQROX+wzZg\n Pv5Y48nQmxh0INgfqDF/B0gvLTEVB9lrMbo6gYQWpZUvEQXNtuHW6CH1M\n oOKkLcX3WSwRB0TJSSf1F4IMdumdXaCgA2LkJ3vbAVbsht13CPvVHteGs\n jgGSgfxAWpD6+y+PTvTGMo9+M3j6fXJzxoPTyij9IXjSZldab4fNf/4Nx\n 57KdHSdjzvO94fkH2YtvZndgVy5Rl+PbfWSooysFDsYeQEdxrSA/ENNFe\n 9h0wOcE7L5rax+bLl0MIv4mlK1zZ9/BR9/1IdFRU+BvUiC9Gnqma5IPKd w==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6600,9927,10942\"; a=\"387656819\"",
            "E=Sophos;i=\"6.04,330,1695711600\"; d=\"scan'208\";a=\"387656819\"",
            "E=Sophos;i=\"6.04,330,1695711600\"; d=\"scan'208\";a=\"22441625\""
        ],
        "X-ExtLoop1": "1",
        "From": "Mingjin Ye <mingjinx.ye@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "qiming.yang@intel.com, Mingjin Ye <mingjinx.ye@intel.com>,\n stable@dpdk.org,\n Jingjing Wu <jingjing.wu@intel.com>, Beilei Xing <beilei.xing@intel.com>",
        "Subject": "[PATCH v9 1/2] net/iavf: fix Rx/Tx burst in multi-process",
        "Date": "Thu,  4 Jan 2024 10:18:04 +0000",
        "Message-Id": "<20240104101805.1765049-2-mingjinx.ye@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20240104101805.1765049-1-mingjinx.ye@intel.com>",
        "References": "<20240103101054.1330081-3-mingjinx.ye@intel.com>\n <20240104101805.1765049-1-mingjinx.ye@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org"
    },
    "content": "In a multi-process environment, a secondary process operates on shared\nmemory and changes the function pointer of the primary process, resulting\nin a crash when the primary process cannot find the function address\nduring an Rx/Tx burst.\n\nFixes: 5b3124a0a6ef (\"net/iavf: support no polling when link down\")\nCc: stable@dpdk.org\n\nSigned-off-by: Mingjin Ye <mingjinx.ye@intel.com>\n---\nv2: Add fix for Rx burst.\n---\nv3: fix Rx/Tx routing.\n---\nv4: Fix the ops array.\n---\nv5: rebase.\n---\n drivers/net/iavf/iavf.h      |  43 +++++++-\n drivers/net/iavf/iavf_rxtx.c | 185 ++++++++++++++++++++++++-----------\n 2 files changed, 169 insertions(+), 59 deletions(-)",
    "diff": "diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h\nindex d273d884f5..ab24cb02c3 100644\n--- a/drivers/net/iavf/iavf.h\n+++ b/drivers/net/iavf/iavf.h\n@@ -314,6 +314,45 @@ struct iavf_devargs {\n \n struct iavf_security_ctx;\n \n+enum iavf_rx_burst_type {\n+\tIAVF_RX_DEFAULT,\n+\tIAVF_RX_FLEX_RXD,\n+\tIAVF_RX_BULK_ALLOC,\n+\tIAVF_RX_SCATTERED,\n+\tIAVF_RX_SCATTERED_FLEX_RXD,\n+\tIAVF_RX_SSE,\n+\tIAVF_RX_AVX2,\n+\tIAVF_RX_AVX2_OFFLOAD,\n+\tIAVF_RX_SSE_FLEX_RXD,\n+\tIAVF_RX_AVX2_FLEX_RXD,\n+\tIAVF_RX_AVX2_FLEX_RXD_OFFLOAD,\n+\tIAVF_RX_SSE_SCATTERED,\n+\tIAVF_RX_AVX2_SCATTERED,\n+\tIAVF_RX_AVX2_SCATTERED_OFFLOAD,\n+\tIAVF_RX_SSE_SCATTERED_FLEX_RXD,\n+\tIAVF_RX_AVX2_SCATTERED_FLEX_RXD,\n+\tIAVF_RX_AVX2_SCATTERED_FLEX_RXD_OFFLOAD,\n+\tIAVF_RX_AVX512,\n+\tIAVF_RX_AVX512_OFFLOAD,\n+\tIAVF_RX_AVX512_FLEX_RXD,\n+\tIAVF_RX_AVX512_FLEX_RXD_OFFLOAD,\n+\tIAVF_RX_AVX512_SCATTERED,\n+\tIAVF_RX_AVX512_SCATTERED_OFFLOAD,\n+\tIAVF_RX_AVX512_SCATTERED_FLEX_RXD,\n+\tIAVF_RX_AVX512_SCATTERED_FLEX_RXD_OFFLOAD,\n+};\n+\n+enum iavf_tx_burst_type {\n+\tIAVF_TX_DEFAULT,\n+\tIAVF_TX_SSE,\n+\tIAVF_TX_AVX2,\n+\tIAVF_TX_AVX2_OFFLOAD,\n+\tIAVF_TX_AVX512,\n+\tIAVF_TX_AVX512_OFFLOAD,\n+\tIAVF_TX_AVX512_CTX,\n+\tIAVF_TX_AVX512_CTX_OFFLOAD,\n+};\n+\n /* Structure to store private data for each VF instance. */\n struct iavf_adapter {\n \tstruct iavf_hw hw;\n@@ -329,8 +368,8 @@ struct iavf_adapter {\n \tbool stopped;\n \tbool closed;\n \tbool no_poll;\n-\teth_rx_burst_t rx_pkt_burst;\n-\teth_tx_burst_t tx_pkt_burst;\n+\tenum iavf_rx_burst_type rx_burst_type;\n+\tenum iavf_tx_burst_type tx_burst_type;\n \tuint16_t fdir_ref_cnt;\n \tstruct iavf_devargs devargs;\n };\ndiff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c\nindex e54fb74b79..f044ad3f26 100644\n--- a/drivers/net/iavf/iavf_rxtx.c\n+++ b/drivers/net/iavf/iavf_rxtx.c\n@@ -3716,15 +3716,78 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,\n \treturn i;\n }\n \n+static\n+const eth_rx_burst_t iavf_rx_pkt_burst_ops[] = {\n+\t[IAVF_RX_DEFAULT] = iavf_recv_pkts,\n+\t[IAVF_RX_FLEX_RXD] = iavf_recv_pkts_flex_rxd,\n+\t[IAVF_RX_BULK_ALLOC] = iavf_recv_pkts_bulk_alloc,\n+\t[IAVF_RX_SCATTERED] = iavf_recv_scattered_pkts,\n+\t[IAVF_RX_SCATTERED_FLEX_RXD] = iavf_recv_scattered_pkts_flex_rxd,\n+#ifdef RTE_ARCH_X86\n+\t[IAVF_RX_SSE] = iavf_recv_pkts_vec,\n+\t[IAVF_RX_AVX2] = iavf_recv_pkts_vec_avx2,\n+\t[IAVF_RX_AVX2_OFFLOAD] = iavf_recv_pkts_vec_avx2_offload,\n+\t[IAVF_RX_SSE_FLEX_RXD] = iavf_recv_pkts_vec_flex_rxd,\n+\t[IAVF_RX_AVX2_FLEX_RXD] = iavf_recv_pkts_vec_avx2_flex_rxd,\n+\t[IAVF_RX_AVX2_FLEX_RXD_OFFLOAD] =\n+\t\tiavf_recv_pkts_vec_avx2_flex_rxd_offload,\n+\t[IAVF_RX_SSE_SCATTERED] = iavf_recv_scattered_pkts_vec,\n+\t[IAVF_RX_AVX2_SCATTERED] = iavf_recv_scattered_pkts_vec_avx2,\n+\t[IAVF_RX_AVX2_SCATTERED_OFFLOAD] =\n+\t\tiavf_recv_scattered_pkts_vec_avx2_offload,\n+\t[IAVF_RX_SSE_SCATTERED_FLEX_RXD] =\n+\t\tiavf_recv_scattered_pkts_vec_flex_rxd,\n+\t[IAVF_RX_AVX2_SCATTERED_FLEX_RXD] =\n+\t\tiavf_recv_scattered_pkts_vec_avx2_flex_rxd,\n+\t[IAVF_RX_AVX2_SCATTERED_FLEX_RXD_OFFLOAD] =\n+\t\tiavf_recv_scattered_pkts_vec_avx2_flex_rxd_offload,\n+#ifdef CC_AVX512_SUPPORT\n+\t[IAVF_RX_AVX512] = iavf_recv_pkts_vec_avx512,\n+\t[IAVF_RX_AVX512_OFFLOAD] = iavf_recv_pkts_vec_avx512_offload,\n+\t[IAVF_RX_AVX512_FLEX_RXD] = iavf_recv_pkts_vec_avx512_flex_rxd,\n+\t[IAVF_RX_AVX512_FLEX_RXD_OFFLOAD] =\n+\t\tiavf_recv_pkts_vec_avx512_flex_rxd_offload,\n+\t[IAVF_RX_AVX512_SCATTERED] = iavf_recv_scattered_pkts_vec_avx512,\n+\t[IAVF_RX_AVX512_SCATTERED_OFFLOAD] =\n+\t\tiavf_recv_scattered_pkts_vec_avx512_offload,\n+\t[IAVF_RX_AVX512_SCATTERED_FLEX_RXD] =\n+\t\tiavf_recv_scattered_pkts_vec_avx512_flex_rxd,\n+\t[IAVF_RX_AVX512_SCATTERED_FLEX_RXD_OFFLOAD] =\n+\t\tiavf_recv_scattered_pkts_vec_avx512_flex_rxd_offload,\n+#endif\n+#elif defined RTE_ARCH_ARM\n+\t[IAVF_RX_SSE] = iavf_recv_pkts_vec,\n+#endif\n+};\n+\n+static\n+const eth_tx_burst_t iavf_tx_pkt_burst_ops[] = {\n+\t[IAVF_TX_DEFAULT] = iavf_xmit_pkts,\n+#ifdef RTE_ARCH_X86\n+\t[IAVF_TX_SSE] = iavf_xmit_pkts_vec,\n+\t[IAVF_TX_AVX2] = iavf_xmit_pkts_vec_avx2,\n+\t[IAVF_TX_AVX2_OFFLOAD] = iavf_xmit_pkts_vec_avx2_offload,\n+#ifdef CC_AVX512_SUPPORT\n+\t[IAVF_TX_AVX512] = iavf_xmit_pkts_vec_avx512,\n+\t[IAVF_TX_AVX512_OFFLOAD] = iavf_xmit_pkts_vec_avx512_offload,\n+\t[IAVF_TX_AVX512_CTX] = iavf_xmit_pkts_vec_avx512_ctx,\n+\t[IAVF_TX_AVX512_CTX_OFFLOAD] = iavf_xmit_pkts_vec_avx512_ctx_offload,\n+#endif\n+#endif\n+};\n+\n static uint16_t\n iavf_recv_pkts_no_poll(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t\tuint16_t nb_pkts)\n {\n \tstruct iavf_rx_queue *rxq = rx_queue;\n+\tenum iavf_rx_burst_type rx_burst_type =\n+\t\trxq->vsi->adapter->rx_burst_type;\n+\n \tif (!rxq->vsi || rxq->vsi->adapter->no_poll)\n \t\treturn 0;\n \n-\treturn rxq->vsi->adapter->rx_pkt_burst(rx_queue,\n+\treturn iavf_rx_pkt_burst_ops[rx_burst_type](rx_queue,\n \t\t\t\t\t\t\t\trx_pkts, nb_pkts);\n }\n \n@@ -3733,10 +3796,13 @@ iavf_xmit_pkts_no_poll(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\t\tuint16_t nb_pkts)\n {\n \tstruct iavf_tx_queue *txq = tx_queue;\n+\tenum iavf_tx_burst_type tx_burst_type =\n+\t\ttxq->vsi->adapter->tx_burst_type;\n+\n \tif (!txq->vsi || txq->vsi->adapter->no_poll)\n \t\treturn 0;\n \n-\treturn txq->vsi->adapter->tx_pkt_burst(tx_queue,\n+\treturn iavf_tx_pkt_burst_ops[tx_burst_type](tx_queue,\n \t\t\t\t\t\t\t\ttx_pkts, nb_pkts);\n }\n \n@@ -3747,6 +3813,7 @@ iavf_set_rx_function(struct rte_eth_dev *dev)\n \tstruct iavf_adapter *adapter =\n \t\tIAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n \tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);\n+\tenum iavf_rx_burst_type rx_burst_type;\n \tint no_poll_on_link_down = adapter->devargs.no_poll_on_link_down;\n \tint i;\n \tstruct iavf_rx_queue *rxq;\n@@ -3817,43 +3884,43 @@ iavf_set_rx_function(struct rte_eth_dev *dev)\n \t\t\t\t}\n \t\t\t}\n \t\t\tif (use_flex) {\n-\t\t\t\tdev->rx_pkt_burst = iavf_recv_scattered_pkts_vec_flex_rxd;\n+\t\t\t\trx_burst_type = IAVF_RX_SSE_SCATTERED_FLEX_RXD;\n \t\t\t\tif (use_avx2) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx2_flex_rxd;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX2_SCATTERED_FLEX_RXD;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx2_flex_rxd_offload;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX2_SCATTERED_FLEX_RXD_OFFLOAD;\n \t\t\t\t}\n #ifdef CC_AVX512_SUPPORT\n \t\t\t\tif (use_avx512) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx512_flex_rxd;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX512_SCATTERED_FLEX_RXD;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx512_flex_rxd_offload;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX512_SCATTERED_FLEX_RXD_OFFLOAD;\n \t\t\t\t}\n #endif\n \t\t\t} else {\n-\t\t\t\tdev->rx_pkt_burst = iavf_recv_scattered_pkts_vec;\n+\t\t\t\trx_burst_type = IAVF_RX_SSE_SCATTERED;\n \t\t\t\tif (use_avx2) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx2;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX2_SCATTERED;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx2_offload;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX2_SCATTERED_OFFLOAD;\n \t\t\t\t}\n #ifdef CC_AVX512_SUPPORT\n \t\t\t\tif (use_avx512) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx512;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX512_SCATTERED;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_scattered_pkts_vec_avx512_offload;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX512_SCATTERED_OFFLOAD;\n \t\t\t\t}\n #endif\n \t\t\t}\n@@ -3883,51 +3950,46 @@ iavf_set_rx_function(struct rte_eth_dev *dev)\n \t\t\t\t}\n \t\t\t}\n \t\t\tif (use_flex) {\n-\t\t\t\tdev->rx_pkt_burst = iavf_recv_pkts_vec_flex_rxd;\n+\t\t\t\trx_burst_type = IAVF_RX_SSE_FLEX_RXD;\n \t\t\t\tif (use_avx2) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx2_flex_rxd;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX2_FLEX_RXD;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx2_flex_rxd_offload;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX2_FLEX_RXD_OFFLOAD;\n \t\t\t\t}\n #ifdef CC_AVX512_SUPPORT\n \t\t\t\tif (use_avx512) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx512_flex_rxd;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX512_FLEX_RXD;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx512_flex_rxd_offload;\n+\t\t\t\t\t\trx_burst_type =\n+\t\t\t\t\t\t\tIAVF_RX_AVX512_FLEX_RXD_OFFLOAD;\n \t\t\t\t}\n #endif\n \t\t\t} else {\n-\t\t\t\tdev->rx_pkt_burst = iavf_recv_pkts_vec;\n+\t\t\t\trx_burst_type = IAVF_RX_SSE;\n \t\t\t\tif (use_avx2) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx2;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX2;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx2_offload;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX2_OFFLOAD;\n \t\t\t\t}\n #ifdef CC_AVX512_SUPPORT\n \t\t\t\tif (use_avx512) {\n \t\t\t\t\tif (check_ret == IAVF_VECTOR_PATH)\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx512;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX512;\n \t\t\t\t\telse\n-\t\t\t\t\t\tdev->rx_pkt_burst =\n-\t\t\t\t\t\t\tiavf_recv_pkts_vec_avx512_offload;\n+\t\t\t\t\t\trx_burst_type = IAVF_RX_AVX512_OFFLOAD;\n \t\t\t\t}\n #endif\n \t\t\t}\n \t\t}\n \n \t\tif (no_poll_on_link_down) {\n-\t\t\tadapter->rx_pkt_burst = dev->rx_pkt_burst;\n+\t\t\tadapter->rx_burst_type = rx_burst_type;\n \t\t\tdev->rx_pkt_burst = iavf_recv_pkts_no_poll;\n+\t\t} else {\n+\t\t\tdev->rx_pkt_burst = iavf_rx_pkt_burst_ops[rx_burst_type];\n \t\t}\n \t\treturn;\n \t}\n@@ -3943,11 +4005,13 @@ iavf_set_rx_function(struct rte_eth_dev *dev)\n \t\t\trxq = dev->data->rx_queues[i];\n \t\t\t(void)iavf_rxq_vec_setup(rxq);\n \t\t}\n-\t\tdev->rx_pkt_burst = iavf_recv_pkts_vec;\n+\t\trx_burst_type = IAVF_RX_SSE;\n \n \t\tif (no_poll_on_link_down) {\n-\t\t\tadapter->rx_pkt_burst = dev->rx_pkt_burst;\n+\t\t\tadapter->rx_burst_type = rx_burst_type;\n \t\t\tdev->rx_pkt_burst = iavf_recv_pkts_no_poll;\n+\t\t} else {\n+\t\t\tdev->rx_pkt_burst = iavf_rx_pkt_burst_ops[rx_burst_type];\n \t\t}\n \t\treturn;\n \t}\n@@ -3956,25 +4020,27 @@ iavf_set_rx_function(struct rte_eth_dev *dev)\n \t\tPMD_DRV_LOG(DEBUG, \"Using a Scattered Rx callback (port=%d).\",\n \t\t\t    dev->data->port_id);\n \t\tif (use_flex)\n-\t\t\tdev->rx_pkt_burst = iavf_recv_scattered_pkts_flex_rxd;\n+\t\t\trx_burst_type = IAVF_RX_SCATTERED_FLEX_RXD;\n \t\telse\n-\t\t\tdev->rx_pkt_burst = iavf_recv_scattered_pkts;\n+\t\t\trx_burst_type = IAVF_RX_SCATTERED;\n \t} else if (adapter->rx_bulk_alloc_allowed) {\n \t\tPMD_DRV_LOG(DEBUG, \"Using bulk Rx callback (port=%d).\",\n \t\t\t    dev->data->port_id);\n-\t\tdev->rx_pkt_burst = iavf_recv_pkts_bulk_alloc;\n+\t\trx_burst_type = IAVF_RX_BULK_ALLOC;\n \t} else {\n \t\tPMD_DRV_LOG(DEBUG, \"Using Basic Rx callback (port=%d).\",\n \t\t\t    dev->data->port_id);\n \t\tif (use_flex)\n-\t\t\tdev->rx_pkt_burst = iavf_recv_pkts_flex_rxd;\n+\t\t\trx_burst_type = IAVF_RX_FLEX_RXD;\n \t\telse\n-\t\t\tdev->rx_pkt_burst = iavf_recv_pkts;\n+\t\t\trx_burst_type = IAVF_RX_DEFAULT;\n \t}\n \n \tif (no_poll_on_link_down) {\n-\t\tadapter->rx_pkt_burst = dev->rx_pkt_burst;\n+\t\tadapter->rx_burst_type = rx_burst_type;\n \t\tdev->rx_pkt_burst = iavf_recv_pkts_no_poll;\n+\t} else {\n+\t\tdev->rx_pkt_burst = iavf_rx_pkt_burst_ops[rx_burst_type];\n \t}\n }\n \n@@ -3984,6 +4050,7 @@ iavf_set_tx_function(struct rte_eth_dev *dev)\n {\n \tstruct iavf_adapter *adapter =\n \t\tIAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n+\tenum iavf_tx_burst_type tx_burst_type;\n \tint no_poll_on_link_down = adapter->devargs.no_poll_on_link_down;\n #ifdef RTE_ARCH_X86\n \tstruct iavf_tx_queue *txq;\n@@ -4019,11 +4086,11 @@ iavf_set_tx_function(struct rte_eth_dev *dev)\n \t\tif (use_sse) {\n \t\t\tPMD_DRV_LOG(DEBUG, \"Using Vector Tx (port %d).\",\n \t\t\t\t    dev->data->port_id);\n-\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec;\n+\t\t\ttx_burst_type = IAVF_TX_SSE;\n \t\t}\n \t\tif (use_avx2) {\n \t\t\tif (check_ret == IAVF_VECTOR_PATH) {\n-\t\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec_avx2;\n+\t\t\t\ttx_burst_type = IAVF_TX_AVX2;\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Using AVX2 Vector Tx (port %d).\",\n \t\t\t\t\t    dev->data->port_id);\n \t\t\t} else if (check_ret == IAVF_VECTOR_CTX_OFFLOAD_PATH) {\n@@ -4031,7 +4098,7 @@ iavf_set_tx_function(struct rte_eth_dev *dev)\n \t\t\t\t\t\"AVX2 does not support outer checksum offload.\");\n \t\t\t\tgoto normal;\n \t\t\t} else {\n-\t\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec_avx2_offload;\n+\t\t\t\ttx_burst_type = IAVF_TX_AVX2_OFFLOAD;\n \t\t\t\tdev->tx_pkt_prepare = iavf_prep_pkts;\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Using AVX2 OFFLOAD Vector Tx (port %d).\",\n \t\t\t\t\t    dev->data->port_id);\n@@ -4040,21 +4107,21 @@ iavf_set_tx_function(struct rte_eth_dev *dev)\n #ifdef CC_AVX512_SUPPORT\n \t\tif (use_avx512) {\n \t\t\tif (check_ret == IAVF_VECTOR_PATH) {\n-\t\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512;\n+\t\t\t\ttx_burst_type = IAVF_TX_AVX512;\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Using AVX512 Vector Tx (port %d).\",\n \t\t\t\t\t    dev->data->port_id);\n \t\t\t} else if (check_ret == IAVF_VECTOR_OFFLOAD_PATH) {\n-\t\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_offload;\n+\t\t\t\ttx_burst_type = IAVF_TX_AVX512_OFFLOAD;\n \t\t\t\tdev->tx_pkt_prepare = iavf_prep_pkts;\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Using AVX512 OFFLOAD Vector Tx (port %d).\",\n \t\t\t\t\t    dev->data->port_id);\n \t\t\t} else if (check_ret == IAVF_VECTOR_CTX_PATH) {\n-\t\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_ctx;\n+\t\t\t\ttx_burst_type = IAVF_TX_AVX512_CTX;\n \t\t\t\tdev->tx_pkt_prepare = iavf_prep_pkts;\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Using AVX512 CONTEXT Vector Tx (port %d).\",\n \t\t\t\t\t\tdev->data->port_id);\n \t\t\t} else {\n-\t\t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_ctx_offload;\n+\t\t\t\ttx_burst_type = IAVF_TX_AVX512_CTX_OFFLOAD;\n \t\t\t\tdev->tx_pkt_prepare = iavf_prep_pkts;\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Using AVX512 CONTEXT OFFLOAD Vector Tx (port %d).\",\n \t\t\t\t\t    dev->data->port_id);\n@@ -4077,8 +4144,10 @@ iavf_set_tx_function(struct rte_eth_dev *dev)\n \t\t}\n \n \t\tif (no_poll_on_link_down) {\n-\t\t\tadapter->tx_pkt_burst = dev->tx_pkt_burst;\n+\t\t\tadapter->tx_burst_type = tx_burst_type;\n \t\t\tdev->tx_pkt_burst = iavf_xmit_pkts_no_poll;\n+\t\t} else {\n+\t\t\tdev->tx_pkt_burst = iavf_tx_pkt_burst_ops[tx_burst_type];\n \t\t}\n \t\treturn;\n \t}\n@@ -4087,12 +4156,14 @@ iavf_set_tx_function(struct rte_eth_dev *dev)\n #endif\n \tPMD_DRV_LOG(DEBUG, \"Using Basic Tx callback (port=%d).\",\n \t\t    dev->data->port_id);\n-\tdev->tx_pkt_burst = iavf_xmit_pkts;\n+\ttx_burst_type = IAVF_TX_DEFAULT;\n \tdev->tx_pkt_prepare = iavf_prep_pkts;\n \n \tif (no_poll_on_link_down) {\n-\t\tadapter->tx_pkt_burst = dev->tx_pkt_burst;\n+\t\tadapter->tx_burst_type = tx_burst_type;\n \t\tdev->tx_pkt_burst = iavf_xmit_pkts_no_poll;\n+\t} else {\n+\t\tdev->tx_pkt_burst = iavf_tx_pkt_burst_ops[tx_burst_type];\n \t}\n }\n \n",
    "prefixes": [
        "v9",
        "1/2"
    ]
}