Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52855/?format=api
{ "id": 52855, "url": "http://patches.dpdk.org/api/patches/52855/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190417085653.110559-4-xiaolong.ye@intel.com/", "project": { "id": 1, "url": "http://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": "<20190417085653.110559-4-xiaolong.ye@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190417085653.110559-4-xiaolong.ye@intel.com", "date": "2019-04-17T08:56:52", "name": "[v3,3/4] net/af_xdp: make reserve/submit peek/release consistent", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "858226dffaebb26f48054924b380d397db6f239c", "submitter": { "id": 1120, "url": "http://patches.dpdk.org/api/people/1120/?format=api", "name": "Xiaolong Ye", "email": "xiaolong.ye@intel.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190417085653.110559-4-xiaolong.ye@intel.com/mbox/", "series": [ { "id": 4346, "url": "http://patches.dpdk.org/api/series/4346/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4346", "date": "2019-04-17T08:56:49", "name": "some fixes for AF_XDP pmd", "version": 3, "mbox": "http://patches.dpdk.org/series/4346/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52855/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/52855/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 1BBA71B5E5;\n\tWed, 17 Apr 2019 11:02:53 +0200 (CEST)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 1F2811B5CA\n\tfor <dev@dpdk.org>; Wed, 17 Apr 2019 11:02:45 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 Apr 2019 02:02:45 -0700", "from yexl-server.sh.intel.com ([10.67.110.206])\n\tby fmsmga001.fm.intel.com with ESMTP; 17 Apr 2019 02:02:44 -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,361,1549958400\"; d=\"scan'208\";a=\"165467620\"", "From": "Xiaolong Ye <xiaolong.ye@intel.com>", "To": "dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,\n\tDavid Marchand <david.marchand@redhat.com>", "Cc": "Qi Zhang <qi.z.zhang@intel.com>,\n\tKarlsson Magnus <magnus.karlsson@intel.com>,\n\tTopel Bjorn <bjorn.topel@intel.com>, Xiaolong Ye <xiaolong.ye@intel.com>", "Date": "Wed, 17 Apr 2019 16:56:52 +0800", "Message-Id": "<20190417085653.110559-4-xiaolong.ye@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190417085653.110559-1-xiaolong.ye@intel.com>", "References": "<CAJFAV8y=fHuFWrbuH7fHB3kAHxiQMexmPSKvN+4v1nKVv3QAcg@mail.gmail.com>\n\t<20190417085653.110559-1-xiaolong.ye@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 3/4] net/af_xdp: make reserve/submit\n\tpeek/release consistent", "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": "As David pointed out, if we reserve N slots for Tx, but only submit n\nslots, we would end up with an incorrect opinion of the number of available\nslots later, we also would get wrong idx when we call\nxsk_ring_prod__reserve next time. It also applies to\nxsk_ring_cons__peek()/xsk_ring_cons__release().\n\nThis patch ensures that both reserve/submit and peek/release are\nconsistent.\n\nFixes: f1debd77efaf (\"net/af_xdp: introduce AF_XDP PMD\")\n\nSuggested-by: David Marchand <david.marchand@redhat.com>\nSigned-off-by: Xiaolong Ye <xiaolong.ye@intel.com>\n---\n drivers/net/af_xdp/rte_eth_af_xdp.c | 79 +++++++++++++++--------------\n 1 file changed, 40 insertions(+), 39 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 8430921af..817092584 100644\n--- a/drivers/net/af_xdp/rte_eth_af_xdp.c\n+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c\n@@ -134,30 +134,34 @@ static const struct rte_eth_link pmd_link = {\n };\n \n static inline int\n-reserve_fill_queue(struct xsk_umem_info *umem, int reserve_size)\n+reserve_fill_queue(struct xsk_umem_info *umem, uint16_t reserve_size)\n {\n \tstruct xsk_ring_prod *fq = &umem->fq;\n+\tvoid *addrs[reserve_size];\n \tuint32_t idx;\n-\tint i, ret;\n+\tuint16_t i;\n+\n+\tif (rte_ring_dequeue_bulk(umem->buf_ring, addrs, reserve_size, NULL)\n+\t\t != reserve_size) {\n+\t\tAF_XDP_LOG(DEBUG, \"Failed to get enough buffers for fq.\\n\");\n+\t\treturn -1;\n+\t}\n \n-\tret = xsk_ring_prod__reserve(fq, reserve_size, &idx);\n-\tif (unlikely(!ret)) {\n-\t\tAF_XDP_LOG(ERR, \"Failed to reserve enough fq descs.\\n\");\n-\t\treturn ret;\n+\tif (unlikely(!xsk_ring_prod__reserve(fq, reserve_size, &idx))) {\n+\t\tAF_XDP_LOG(DEBUG, \"Failed to reserve enough fq descs.\\n\");\n+\t\trte_ring_enqueue_bulk(umem->buf_ring, addrs,\n+\t\t\t\treserve_size, NULL);\n+\t\treturn -1;\n \t}\n \n \tfor (i = 0; i < reserve_size; i++) {\n \t\t__u64 *fq_addr;\n-\t\tvoid *addr = NULL;\n-\t\tif (rte_ring_dequeue(umem->buf_ring, &addr)) {\n-\t\t\ti--;\n-\t\t\tbreak;\n-\t\t}\n+\n \t\tfq_addr = xsk_ring_prod__fill_addr(fq, idx++);\n-\t\t*fq_addr = (uint64_t)addr;\n+\t\t*fq_addr = (uint64_t)addrs[i];\n \t}\n \n-\txsk_ring_prod__submit(fq, i);\n+\txsk_ring_prod__submit(fq, reserve_size);\n \n \treturn 0;\n }\n@@ -174,21 +178,20 @@ eth_af_xdp_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct rte_mbuf *mbufs[ETH_AF_XDP_TX_BATCH_SIZE];\n \tunsigned long dropped = 0;\n \tunsigned long rx_bytes = 0;\n-\tuint16_t count = 0;\n \tint rcvd, i;\n \n \tnb_pkts = RTE_MIN(nb_pkts, ETH_AF_XDP_TX_BATCH_SIZE);\n \n+\tif (unlikely(rte_pktmbuf_alloc_bulk(rxq->mb_pool, mbufs, nb_pkts) != 0))\n+\t\treturn 0;\n+\n \trcvd = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx);\n \tif (rcvd == 0)\n-\t\treturn 0;\n+\t\tgoto out;\n \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-\t\treturn 0;\n-\n \tfor (i = 0; i < rcvd; i++) {\n \t\tconst struct xdp_desc *desc;\n \t\tuint64_t addr;\n@@ -204,7 +207,7 @@ eth_af_xdp_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\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+\t\tbufs[i] = mbufs[i];\n \n \t\trte_ring_enqueue(umem->buf_ring, (void *)addr);\n \t}\n@@ -215,7 +218,12 @@ eth_af_xdp_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \trxq->stats.rx_pkts += (rcvd - dropped);\n \trxq->stats.rx_bytes += rx_bytes;\n \n-\treturn count;\n+out:\n+\tif (rcvd != nb_pkts)\n+\t\trte_mempool_put_bulk(rxq->mb_pool, (void **)&mbufs[rcvd],\n+\t\t\t\t nb_pkts - rcvd);\n+\n+\treturn rcvd;\n }\n \n static void\n@@ -262,7 +270,7 @@ eth_af_xdp_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct rte_mbuf *mbuf;\n \tvoid *addrs[ETH_AF_XDP_TX_BATCH_SIZE];\n \tunsigned long tx_bytes = 0;\n-\tint i, valid = 0;\n+\tint i;\n \tuint32_t idx_tx;\n \n \tnb_pkts = RTE_MIN(nb_pkts, ETH_AF_XDP_TX_BATCH_SIZE);\n@@ -283,20 +291,18 @@ eth_af_xdp_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tfor (i = 0; i < nb_pkts; i++) {\n \t\tstruct xdp_desc *desc;\n \t\tvoid *pkt;\n-\t\tuint32_t buf_len = ETH_AF_XDP_FRAME_SIZE\n-\t\t\t\t\t- ETH_AF_XDP_DATA_HEADROOM;\n+\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\tdesc->addr = (uint64_t)addrs[valid];\n-\t\t\tdesc->len = mbuf->pkt_len;\n-\t\t\tpkt = xsk_umem__get_data(umem->mz->addr,\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}\n+\n+\t\tdesc->addr = (uint64_t)addrs[i];\n+\t\tdesc->len = mbuf->pkt_len;\n+\t\tpkt = xsk_umem__get_data(umem->mz->addr,\n+\t\t\t\t\t desc->addr);\n+\t\trte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),\n+\t\t\t desc->len);\n+\t\ttx_bytes += mbuf->pkt_len;\n+\n \t\trte_pktmbuf_free(mbuf);\n \t}\n \n@@ -304,12 +310,7 @@ eth_af_xdp_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \tkick_tx(txq);\n \n-\tif (valid < nb_pkts)\n-\t\trte_ring_enqueue_bulk(umem->buf_ring, &addrs[valid],\n-\t\t\t\t nb_pkts - valid, NULL);\n-\n-\ttxq->stats.err_pkts += nb_pkts - valid;\n-\ttxq->stats.tx_pkts += valid;\n+\ttxq->stats.tx_pkts += nb_pkts;\n \ttxq->stats.tx_bytes += tx_bytes;\n \n \treturn nb_pkts;\n", "prefixes": [ "v3", "3/4" ] }