Patch Detail

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

{
    "id": 60606,
    "url": "https://patches.dpdk.org/api/patches/60606/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20191007110809.62801-4-bruce.richardson@intel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.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": "<20191007110809.62801-4-bruce.richardson@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20191007110809.62801-4-bruce.richardson@intel.com",
    "date": "2019-10-07T11:08:06",
    "name": "[v7,3/6] examples/ioat: add rawdev copy mode support",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "8ee08278b84c6ae8bd8382257edd7c4ec4ad3af7",
    "submitter": {
        "id": 20,
        "url": "https://patches.dpdk.org/api/people/20/?format=api",
        "name": "Bruce Richardson",
        "email": "bruce.richardson@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20191007110809.62801-4-bruce.richardson@intel.com/mbox/",
    "series": [
        {
            "id": 6718,
            "url": "https://patches.dpdk.org/api/series/6718/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6718",
            "date": "2019-10-07T11:08:03",
            "name": "examples/ioat: sample app for ioat driver",
            "version": 7,
            "mbox": "https://patches.dpdk.org/series/6718/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/60606/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/60606/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1EEC11C22D;\n\tMon,  7 Oct 2019 13:08:33 +0200 (CEST)",
            "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 38FC21C215\n\tfor <dev@dpdk.org>; Mon,  7 Oct 2019 13:08:31 +0200 (CEST)",
            "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t07 Oct 2019 04:08:30 -0700",
            "from silpixa00399126.ir.intel.com (HELO\n\tsilpixa00399126.ger.corp.intel.com) ([10.237.223.2])\n\tby orsmga002.jf.intel.com with ESMTP; 07 Oct 2019 04:08:29 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.67,268,1566889200\"; d=\"scan'208\";a=\"205041044\"",
        "From": "Bruce Richardson <bruce.richardson@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "Marcin Baran <marcinx.baran@intel.com>,\n\tPawel Modrak <pawelx.modrak@intel.com>,\n\tBruce Richardson <bruce.richardson@intel.com>",
        "Date": "Mon,  7 Oct 2019 12:08:06 +0100",
        "Message-Id": "<20191007110809.62801-4-bruce.richardson@intel.com>",
        "X-Mailer": "git-send-email 2.21.0",
        "In-Reply-To": "<20191007110809.62801-1-bruce.richardson@intel.com>",
        "References": "<20190920073714.1314-1-marcinx.baran@intel.com>\n\t<20191007110809.62801-1-bruce.richardson@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v7 3/6] examples/ioat: add rawdev copy mode\n\tsupport",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Marcin Baran <marcinx.baran@intel.com>\n\nAdded support for copying packets using rawdev device. Each port's Rx queue\nis assigned DMA channel for copy.\n\nSigned-off-by: Marcin Baran <marcinx.baran@intel.com>\nSigned-off-by: Pawel Modrak <pawelx.modrak@intel.com>\nAcked-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n examples/ioat/ioatfwd.c | 117 +++++++++++++++++++++++++++++++++++++++-\n 1 file changed, 115 insertions(+), 2 deletions(-)",
    "diff": "diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c\nindex 2a4da948a..a38b6700b 100644\n--- a/examples/ioat/ioatfwd.c\n+++ b/examples/ioat/ioatfwd.c\n@@ -121,6 +121,50 @@ pktmbuf_sw_copy(struct rte_mbuf *src, struct rte_mbuf *dst)\n \t\trte_pktmbuf_mtod(src, char *), src->data_len);\n }\n \n+static uint32_t\n+ioat_enqueue_packets(struct rte_mbuf **pkts,\n+\tuint32_t nb_rx, uint16_t dev_id)\n+{\n+\tint ret;\n+\tuint32_t i;\n+\tstruct rte_mbuf *pkts_copy[MAX_PKT_BURST];\n+\n+\tconst uint64_t addr_offset = RTE_PTR_DIFF(pkts[0]->buf_addr,\n+\t\t&pkts[0]->rearm_data);\n+\n+\tret = rte_mempool_get_bulk(ioat_pktmbuf_pool,\n+\t\t(void *)pkts_copy, nb_rx);\n+\n+\tif (unlikely(ret < 0))\n+\t\trte_exit(EXIT_FAILURE, \"Unable to allocate memory.\\n\");\n+\n+\tfor (i = 0; i < nb_rx; i++) {\n+\t\t/* Perform data copy */\n+\t\tret = rte_ioat_enqueue_copy(dev_id,\n+\t\t\tpkts[i]->buf_iova\n+\t\t\t- addr_offset,\n+\t\t\tpkts_copy[i]->buf_iova\n+\t\t\t- addr_offset,\n+\t\t\trte_pktmbuf_data_len(pkts[i])\n+\t\t\t+ addr_offset,\n+\t\t\t(uintptr_t)pkts[i],\n+\t\t\t(uintptr_t)pkts_copy[i],\n+\t\t\t0 /* nofence */);\n+\n+\t\tif (ret != 1)\n+\t\t\tbreak;\n+\t}\n+\n+\tret = i;\n+\t/* Free any not enqueued packets. */\n+\trte_mempool_put_bulk(ioat_pktmbuf_pool, (void *)&pkts[i], nb_rx - i);\n+\trte_mempool_put_bulk(ioat_pktmbuf_pool, (void *)&pkts_copy[i],\n+\t\tnb_rx - i);\n+\n+\n+\treturn ret;\n+}\n+\n /* Receive packets on one port and enqueue to IOAT rawdev or rte_ring. */\n static void\n ioat_rx_port(struct rxtx_port_config *rx_config)\n@@ -138,6 +182,10 @@ ioat_rx_port(struct rxtx_port_config *rx_config)\n \n \t\tif (copy_mode == COPY_MODE_IOAT_NUM) {\n \t\t\t/* Perform packet hardware copy */\n+\t\t\tnb_enq = ioat_enqueue_packets(pkts_burst,\n+\t\t\t\tnb_rx, rx_config->ioat_ids[i]);\n+\t\t\tif (nb_enq > 0)\n+\t\t\t\trte_ioat_do_copies(rx_config->ioat_ids[i]);\n \t\t} else {\n \t\t\t/* Perform packet software copy, free source packets */\n \t\t\tint ret;\n@@ -174,11 +222,15 @@ static void\n ioat_tx_port(struct rxtx_port_config *tx_config)\n {\n \tuint32_t i, j, nb_dq = 0;\n+\tstruct rte_mbuf *mbufs_src[MAX_PKT_BURST];\n \tstruct rte_mbuf *mbufs_dst[MAX_PKT_BURST];\n \n \tfor (i = 0; i < tx_config->nb_queues; i++) {\n \t\tif (copy_mode == COPY_MODE_IOAT_NUM) {\n \t\t\t/* Deque the mbufs from IOAT device. */\n+\t\t\tnb_dq = rte_ioat_completed_copies(\n+\t\t\t\ttx_config->ioat_ids[i], MAX_PKT_BURST,\n+\t\t\t\t(void *)mbufs_src, (void *)mbufs_dst);\n \t\t} else {\n \t\t\t/* Deque the mbufs from rx_to_tx_ring. */\n \t\t\tnb_dq = rte_ring_dequeue_burst(\n@@ -189,6 +241,10 @@ ioat_tx_port(struct rxtx_port_config *tx_config)\n \t\tif (nb_dq == 0)\n \t\t\treturn;\n \n+\t\tif (copy_mode == COPY_MODE_IOAT_NUM)\n+\t\t\trte_mempool_put_bulk(ioat_pktmbuf_pool,\n+\t\t\t\t(void *)mbufs_src, nb_dq);\n+\n \t\t/* Update macs if enabled */\n \t\tif (mac_updating) {\n \t\t\tfor (j = 0; j < nb_dq; j++)\n@@ -401,6 +457,52 @@ check_link_status(uint32_t port_mask)\n \treturn retval;\n }\n \n+static void\n+configure_rawdev_queue(uint32_t dev_id)\n+{\n+\tstruct rte_ioat_rawdev_config dev_config = { .ring_size = ring_size };\n+\tstruct rte_rawdev_info info = { .dev_private = &dev_config };\n+\n+\tif (rte_rawdev_configure(dev_id, &info) != 0) {\n+\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\"Error with rte_rawdev_configure()\\n\");\n+\t}\n+\tif (rte_rawdev_start(dev_id) != 0) {\n+\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\"Error with rte_rawdev_start()\\n\");\n+\t}\n+}\n+\n+static void\n+assign_rawdevs(void)\n+{\n+\tuint16_t nb_rawdev = 0, rdev_id = 0;\n+\tuint32_t i, j;\n+\n+\tfor (i = 0; i < cfg.nb_ports; i++) {\n+\t\tfor (j = 0; j < cfg.ports[i].nb_queues; j++) {\n+\t\t\tstruct rte_rawdev_info rdev_info = { 0 };\n+\n+\t\t\tdo {\n+\t\t\t\tif (rdev_id == rte_rawdev_count())\n+\t\t\t\t\tgoto end;\n+\t\t\t\trte_rawdev_info_get(rdev_id++, &rdev_info);\n+\t\t\t} while (strcmp(rdev_info.driver_name,\n+\t\t\t\tIOAT_PMD_RAWDEV_NAME_STR) != 0);\n+\n+\t\t\tcfg.ports[i].ioat_ids[j] = rdev_id - 1;\n+\t\t\tconfigure_rawdev_queue(cfg.ports[i].ioat_ids[j]);\n+\t\t\t++nb_rawdev;\n+\t\t}\n+\t}\n+end:\n+\tif (nb_rawdev < cfg.nb_ports * cfg.ports[0].nb_queues)\n+\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\"Not enough IOAT rawdevs (%u) for all queues (%u).\\n\",\n+\t\t\tnb_rawdev, cfg.nb_ports * cfg.ports[0].nb_queues);\n+\tRTE_LOG(INFO, IOAT, \"Number of used rawdevs: %u.\\n\", nb_rawdev);\n+}\n+\n static void\n assign_rings(void)\n {\n@@ -597,18 +699,29 @@ main(int argc, char **argv)\n \t\trte_exit(EXIT_FAILURE,\n \t\t\t\"There should be at least one slave lcore.\\n\");\n \n-\tassign_rings();\n+\tif (copy_mode == COPY_MODE_IOAT_NUM)\n+\t\tassign_rawdevs();\n+\telse /* copy_mode == COPY_MODE_SW_NUM */\n+\t\tassign_rings();\n \n \tstart_forwarding_cores();\n \n \t/* force_quit is true when we get here */\n \trte_eal_mp_wait_lcore();\n \n+\tuint32_t j;\n \tfor (i = 0; i < cfg.nb_ports; i++) {\n \t\tprintf(\"Closing port %d\\n\", cfg.ports[i].rxtx_port);\n \t\trte_eth_dev_stop(cfg.ports[i].rxtx_port);\n \t\trte_eth_dev_close(cfg.ports[i].rxtx_port);\n-\t\trte_ring_free(cfg.ports[i].rx_to_tx_ring);\n+\t\tif (copy_mode == COPY_MODE_IOAT_NUM) {\n+\t\t\tfor (j = 0; j < cfg.ports[i].nb_queues; j++) {\n+\t\t\t\tprintf(\"Stopping rawdev %d\\n\",\n+\t\t\t\t\tcfg.ports[i].ioat_ids[j]);\n+\t\t\t\trte_rawdev_stop(cfg.ports[i].ioat_ids[j]);\n+\t\t\t}\n+\t\t} else /* copy_mode == COPY_MODE_SW_NUM */\n+\t\t\trte_ring_free(cfg.ports[i].rx_to_tx_ring);\n \t}\n \n \tprintf(\"Bye...\\n\");\n",
    "prefixes": [
        "v7",
        "3/6"
    ]
}