Patch Detail

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

{
    "id": 51714,
    "url": "http://patchwork.dpdk.org/api/patches/51714/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20190326122029.59359-6-xiaolong.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": "<20190326122029.59359-6-xiaolong.ye@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190326122029.59359-6-xiaolong.ye@intel.com",
    "date": "2019-03-26T12:20:29",
    "name": "[v6,5/5] net/af_xdp: enable zero copy",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "50a4c494be77a6e784cf558ce7934fd71da910b0",
    "submitter": {
        "id": 1120,
        "url": "http://patchwork.dpdk.org/api/people/1120/?format=api",
        "name": "Xiaolong Ye",
        "email": "xiaolong.ye@intel.com"
    },
    "delegate": {
        "id": 319,
        "url": "http://patchwork.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20190326122029.59359-6-xiaolong.ye@intel.com/mbox/",
    "series": [
        {
            "id": 3920,
            "url": "http://patchwork.dpdk.org/api/series/3920/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=3920",
            "date": "2019-03-26T12:20:24",
            "name": "Introduce AF_XDP PMD",
            "version": 6,
            "mbox": "http://patchwork.dpdk.org/series/3920/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/51714/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/51714/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 4DC935424;\n\tTue, 26 Mar 2019 13:25:24 +0100 (CET)",
            "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby dpdk.org (Postfix) with ESMTP id 0C4734CAB\n\tfor <dev@dpdk.org>; Tue, 26 Mar 2019 13:25:14 +0100 (CET)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Mar 2019 05:25:14 -0700",
            "from yexl-server.sh.intel.com ([10.67.110.206])\n\tby orsmga001.jf.intel.com with ESMTP; 26 Mar 2019 05:25:12 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.60,271,1549958400\"; d=\"scan'208\";a=\"217657753\"",
        "From": "Xiaolong Ye <xiaolong.ye@intel.com>",
        "To": "dev@dpdk.org, David Marchand <david.marchand@redhat.com>,\n\tAndrew Rybchenko <arybchenko@solarflare.com>",
        "Cc": "Qi Zhang <qi.z.zhang@intel.com>,\n\tKarlsson Magnus <magnus.karlsson@intel.com>,\n\tTopel Bjorn <bjorn.topel@intel.com>,\n\tMaxime Coquelin <maxime.coquelin@redhat.com>,\n\tStephen Hemminger <stephen@networkplumber.org>,\n\tFerruh Yigit <ferruh.yigit@intel.com>, Luca Boccassi <bluca@debian.org>, \n\tBruce Richardson <bruce.richardson@intel.com>,\n\tAnanyev Konstantin <konstantin.ananyev@intel.com>,\n\tXiaolong Ye <xiaolong.ye@intel.com>",
        "Date": "Tue, 26 Mar 2019 20:20:29 +0800",
        "Message-Id": "<20190326122029.59359-6-xiaolong.ye@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20190326122029.59359-1-xiaolong.ye@intel.com>",
        "References": "<20190301080947.91086-1-xiaolong.ye@intel.com>\n\t<20190326122029.59359-1-xiaolong.ye@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v6 5/5] net/af_xdp: enable zero copy",
        "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": "Try to check if external mempool (from rx_queue_setup) is fit for\naf_xdp, if it is, it will be registered to af_xdp socket directly and\nthere will be no packet data copy on Rx and Tx.\n\nSigned-off-by: Xiaolong Ye <xiaolong.ye@intel.com>\n---\n drivers/net/af_xdp/rte_eth_af_xdp.c | 130 ++++++++++++++++++++--------\n 1 file changed, 96 insertions(+), 34 deletions(-)",
    "diff": "diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c\nindex a1fda9212..c6ade4c94 100644\n--- a/drivers/net/af_xdp/rte_eth_af_xdp.c\n+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c\n@@ -67,6 +67,7 @@ struct xsk_umem_info {\n \tstruct xsk_umem *umem;\n \tstruct rte_mempool *mb_pool;\n \tvoid *buffer;\n+\tuint8_t zc;\n };\n \n struct rx_stats {\n@@ -85,6 +86,7 @@ struct pkt_rx_queue {\n \n \tstruct pkt_tx_queue *pair;\n \tuint16_t queue_idx;\n+\tuint8_t zc;\n };\n \n struct tx_stats {\n@@ -202,7 +204,9 @@ eth_af_xdp_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tif (xsk_prod_nb_free(fq, free_thresh) >= free_thresh)\n \t\t(void)reserve_fill_queue(umem, ETH_AF_XDP_RX_BATCH_SIZE);\n \n-\tif (unlikely(rte_pktmbuf_alloc_bulk(rxq->mb_pool, mbufs, rcvd) != 0))\n+\tif (!rxq->zc &&\n+\t\tunlikely(rte_pktmbuf_alloc_bulk(rxq->mb_pool,\n+\t\t\t\tmbufs, rcvd) != 0))\n \t\treturn 0;\n \n \tfor (i = 0; i < rcvd; i++) {\n@@ -216,13 +220,23 @@ eth_af_xdp_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\tlen = desc->len;\n \t\tpkt = xsk_umem__get_data(rxq->umem->buffer, addr);\n \n-\t\trte_memcpy(rte_pktmbuf_mtod(mbufs[i], void *), pkt, len);\n-\t\trte_pktmbuf_pkt_len(mbufs[i]) = len;\n-\t\trte_pktmbuf_data_len(mbufs[i]) = len;\n-\t\trx_bytes += len;\n-\t\tbufs[count++] = mbufs[i];\n-\n-\t\trte_pktmbuf_free(addr_to_mbuf(umem, addr));\n+\t\tif (rxq->zc) {\n+\t\t\tstruct rte_mbuf *mbuf;\n+\t\t\tmbuf = addr_to_mbuf(rxq->umem, addr);\n+\t\t\trte_pktmbuf_pkt_len(mbuf) = len;\n+\t\t\trte_pktmbuf_data_len(mbuf) = len;\n+\t\t\trx_bytes += len;\n+\t\t\tbufs[count++] = mbuf;\n+\t\t} else {\n+\t\t\trte_memcpy(rte_pktmbuf_mtod(mbufs[i], void *),\n+\t\t\t\t\tpkt, len);\n+\t\t\trte_pktmbuf_pkt_len(mbufs[i]) = len;\n+\t\t\trte_pktmbuf_data_len(mbufs[i]) = len;\n+\t\t\trx_bytes += len;\n+\t\t\tbufs[count++] = mbufs[i];\n+\n+\t\t\trte_pktmbuf_free(addr_to_mbuf(umem, addr));\n+\t\t}\n \t}\n \n \txsk_ring_cons__release(rx, rcvd);\n@@ -295,22 +309,29 @@ eth_af_xdp_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\t- ETH_AF_XDP_DATA_HEADROOM;\n \t\tdesc = xsk_ring_prod__tx_desc(&txq->tx, idx_tx + i);\n \t\tmbuf = bufs[i];\n-\t\tif (mbuf->pkt_len <= buf_len) {\n-\t\t\tmbuf_to_tx = rte_pktmbuf_alloc(umem->mb_pool);\n-\t\t\tif (unlikely(mbuf_to_tx == NULL)) {\n-\t\t\t\trte_pktmbuf_free(mbuf);\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\t\t\tdesc->addr = mbuf_to_addr(umem, mbuf_to_tx);\n+\t\tif (txq->pair->zc && mbuf->pool == umem->mb_pool) {\n+\t\t\tdesc->addr = mbuf_to_addr(umem, mbuf);\n \t\t\tdesc->len = mbuf->pkt_len;\n-\t\t\tpkt = xsk_umem__get_data(umem->buffer,\n-\t\t\t\t\t\t desc->addr);\n-\t\t\trte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),\n-\t\t\t       desc->len);\n \t\t\tvalid++;\n \t\t\ttx_bytes += mbuf->pkt_len;\n+\t\t} else {\n+\t\t\tif (mbuf->pkt_len <= buf_len) {\n+\t\t\t\tmbuf_to_tx = rte_pktmbuf_alloc(umem->mb_pool);\n+\t\t\t\tif (unlikely(mbuf_to_tx == NULL)) {\n+\t\t\t\t\trte_pktmbuf_free(mbuf);\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\t\t\t\tdesc->addr = mbuf_to_addr(umem, mbuf_to_tx);\n+\t\t\t\tdesc->len = mbuf->pkt_len;\n+\t\t\t\tpkt = xsk_umem__get_data(umem->buffer,\n+\t\t\t\t\t\t\t desc->addr);\n+\t\t\t\tmemcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),\n+\t\t\t\t       desc->len);\n+\t\t\t\tvalid++;\n+\t\t\t\ttx_bytes += mbuf->pkt_len;\n+\t\t\t}\n+\t\t\trte_pktmbuf_free(mbuf);\n \t\t}\n-\t\trte_pktmbuf_free(mbuf);\n \t}\n \n \txsk_ring_prod__submit(&txq->tx, nb_pkts);\n@@ -488,7 +509,7 @@ static inline uint64_t get_len(struct rte_mempool *mp)\n \treturn (uint64_t)(memhdr->len);\n }\n \n-static struct xsk_umem_info *xdp_umem_configure(void)\n+static struct xsk_umem_info *xdp_umem_configure(struct rte_mempool *mb_pool)\n {\n \tstruct xsk_umem_info *umem;\n \tstruct xsk_umem_config usr_config = {\n@@ -505,16 +526,23 @@ static struct xsk_umem_info *xdp_umem_configure(void)\n \t\treturn NULL;\n \t}\n \n-\tumem->mb_pool = rte_pktmbuf_pool_create_with_flags(\"af_xdp_mempool\",\n-\t\t\tETH_AF_XDP_NUM_BUFFERS,\n-\t\t\t250, 0,\n-\t\t\tETH_AF_XDP_FRAME_SIZE -\n-\t\t\tETH_AF_XDP_MBUF_OVERHEAD,\n-\t\t\tMEMPOOL_F_NO_SPREAD | MEMPOOL_CHUNK_F_PAGE_ALIGN,\n-\t\t\tSOCKET_ID_ANY);\n-\tif (umem->mb_pool == NULL || umem->mb_pool->nb_mem_chunks != 1) {\n-\t\tAF_XDP_LOG(ERR, \"Failed to create mempool\\n\");\n-\t\tgoto err;\n+\tif (!mb_pool) {\n+\t\tumem->mb_pool = rte_pktmbuf_pool_create_with_flags(\"af_xdp_mempool\",\n+\t\t\t\tETH_AF_XDP_NUM_BUFFERS,\n+\t\t\t\t250, 0,\n+\t\t\t\tETH_AF_XDP_FRAME_SIZE -\n+\t\t\t\tETH_AF_XDP_MBUF_OVERHEAD,\n+\t\t\t\tMEMPOOL_F_NO_SPREAD | MEMPOOL_CHUNK_F_PAGE_ALIGN,\n+\t\t\t\tSOCKET_ID_ANY);\n+\n+\t\tif (umem->mb_pool == NULL ||\n+\t\t\t\tumem->mb_pool->nb_mem_chunks != 1) {\n+\t\t\tAF_XDP_LOG(ERR, \"Failed to create mempool\\n\");\n+\t\t\tgoto err;\n+\t\t}\n+\t} else {\n+\t\tumem->mb_pool = mb_pool;\n+\t\tumem->zc = 1;\n \t}\n \tbase_addr = (void *)get_base_addr(umem->mb_pool);\n \n@@ -536,16 +564,43 @@ static struct xsk_umem_info *xdp_umem_configure(void)\n \treturn NULL;\n }\n \n+static uint8_t\n+check_mempool_zc(struct rte_mempool *mp)\n+{\n+\tRTE_ASSERT(mp);\n+\n+\t/* must continues */\n+\tif (mp->nb_mem_chunks > 1)\n+\t\treturn 0;\n+\n+\t/* check header size */\n+\tif (mp->header_size != RTE_CACHE_LINE_SIZE)\n+\t\treturn 0;\n+\n+\t/* check base address */\n+\tif ((uint64_t)get_base_addr(mp) % getpagesize() != 0)\n+\t\treturn 0;\n+\n+\t/* check chunk size */\n+\tif ((mp->elt_size + mp->header_size + mp->trailer_size) %\n+\t    ETH_AF_XDP_FRAME_SIZE != 0)\n+\t\treturn 0;\n+\n+\treturn 1;\n+}\n+\n static int\n xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq,\n-\t      int ring_size)\n+\t      int ring_size, struct rte_mempool *mb_pool)\n {\n \tstruct xsk_socket_config cfg;\n \tstruct pkt_tx_queue *txq = rxq->pair;\n+\tstruct rte_mempool *mp;\n \tint ret = 0;\n \tint reserve_size;\n \n-\trxq->umem = xdp_umem_configure();\n+\tmp = check_mempool_zc(mb_pool) ? mb_pool : NULL;\n+\trxq->umem = xdp_umem_configure(mp);\n \tif (rxq->umem == NULL)\n \t\treturn -ENOMEM;\n \n@@ -622,7 +677,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n \n \trxq->mb_pool = mb_pool;\n \n-\tif (xsk_configure(internals, rxq, nb_rx_desc)) {\n+\tif (xsk_configure(internals, rxq, nb_rx_desc, mb_pool)) {\n \t\tAF_XDP_LOG(ERR, \"Failed to configure xdp socket\\n\");\n \t\tret = -EINVAL;\n \t\tgoto err;\n@@ -630,6 +685,13 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n \n \tinternals->umem = rxq->umem;\n \n+\tif (mb_pool == internals->umem->mb_pool)\n+\t\trxq->zc = internals->umem->zc;\n+\n+\tif (rxq->zc)\n+\t\tAF_XDP_LOG(INFO,\n+\t\t\t\"zero copy enabled on rx queue %d\\n\", rx_queue_id);\n+\n \tdev->data->rx_queues[rx_queue_id] = rxq;\n \treturn 0;\n \n",
    "prefixes": [
        "v6",
        "5/5"
    ]
}