Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/124116/?format=api
http://patchwork.dpdk.org/api/patches/124116/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230217073228.340815-10-junfeng.guo@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": "<20230217073228.340815-10-junfeng.guo@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230217073228.340815-10-junfeng.guo@intel.com", "date": "2023-02-17T07:32:27", "name": "[RFC,v3,09/10] net/gve: support jumbo frame for GQI", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a68eeacf3bfa3f6ae6a4ac01001d9c8e2ac469dc", "submitter": { "id": 1785, "url": "http://patchwork.dpdk.org/api/people/1785/?format=api", "name": "Junfeng Guo", "email": "junfeng.guo@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/20230217073228.340815-10-junfeng.guo@intel.com/mbox/", "series": [ { "id": 27056, "url": "http://patchwork.dpdk.org/api/series/27056/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=27056", "date": "2023-02-17T07:32:18", "name": "gve PMD enhancement", "version": 3, "mbox": "http://patchwork.dpdk.org/series/27056/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/124116/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/124116/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 391CE41CBC;\n\tFri, 17 Feb 2023 08:39:55 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 48C0842B8B;\n\tFri, 17 Feb 2023 08:39:32 +0100 (CET)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by mails.dpdk.org (Postfix) with ESMTP id D826842D38\n for <dev@dpdk.org>; Fri, 17 Feb 2023 08:39:29 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 16 Feb 2023 23:39:29 -0800", "from dpdk-jf-ntb-one.sh.intel.com ([10.67.111.104])\n by orsmga002.jf.intel.com with ESMTP; 16 Feb 2023 23:39:25 -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=1676619570; x=1708155570;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=yiUZY7FHCmg1rfd/sot0/DAfn/1AtiSjqaeeM+QMHyQ=;\n b=MwTX0iLCnITnobiogEn8USL0ZssVuDGLUz3ekc9olElyAEE5HokR+Hqw\n 7LxGWJXwHERv9c324cWOoiKz2NYqd7OT0UNgxSKPKfzKnCCyEIj3ZWsdY\n eihrPaJek0o+NEb6Xa2G95rLqh+V/FSWy2NfMtJH9Z+lPo0dHKkZFbxp7\n ba0TyIWC2/IpdbOHfeavcHf5CRJNto1AMyQJcnbfRzLlSjp03UScbFwHS\n SHLbcGssxwHaOQmRr7uM11+svRg5A0pJ/90uGGdNe8Sf5AG1fbecgkehs\n iEVn2TggYQnbFIDoX6vxAOLav19vtTFsG1UVEJFUx+2YgthApLS1R7b8q A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10623\"; a=\"418153111\"", "E=Sophos;i=\"5.97,304,1669104000\"; d=\"scan'208\";a=\"418153111\"", "E=McAfee;i=\"6500,9779,10623\"; a=\"670458759\"", "E=Sophos;i=\"5.97,304,1669104000\"; d=\"scan'208\";a=\"670458759\"" ], "X-ExtLoop1": "1", "From": "Junfeng Guo <junfeng.guo@intel.com>", "To": "qi.z.zhang@intel.com, jingjing.wu@intel.com, ferruh.yigit@amd.com,\n beilei.xing@intel.com", "Cc": "dev@dpdk.org, xiaoyun.li@intel.com, helin.zhang@intel.com,\n Junfeng Guo <junfeng.guo@intel.com>, Rushil Gupta <rushilg@google.com>,\n Jeroen de Borst <jeroendb@google.com>", "Subject": "[RFC v3 09/10] net/gve: support jumbo frame for GQI", "Date": "Fri, 17 Feb 2023 15:32:27 +0800", "Message-Id": "<20230217073228.340815-10-junfeng.guo@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230217073228.340815-1-junfeng.guo@intel.com>", "References": "<20230130062642.3337239-1-junfeng.guo@intel.com>\n <20230217073228.340815-1-junfeng.guo@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": "Add multi-segment support to enable GQI Rx Jumbo Frame.\n\nSigned-off-by: Rushil Gupta <rushilg@google.com>\nSigned-off-by: Junfeng Guo <junfeng.guo@intel.com>\nSigned-off-by: Jeroen de Borst <jeroendb@google.com>\n---\n drivers/net/gve/gve_ethdev.h | 8 ++\n drivers/net/gve/gve_rx.c | 137 +++++++++++++++++++++++++----------\n 2 files changed, 108 insertions(+), 37 deletions(-)", "diff": "diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h\nindex bca6e86ef0..02b997312c 100644\n--- a/drivers/net/gve/gve_ethdev.h\n+++ b/drivers/net/gve/gve_ethdev.h\n@@ -142,6 +142,13 @@ struct gve_tx_queue {\n \tuint8_t is_gqi_qpl;\n };\n \n+struct gve_rx_ctx {\n+\tstruct rte_mbuf *mbuf_head;\n+\tstruct rte_mbuf *mbuf_tail;\n+\tuint16_t total_frags;\n+\tbool drop_pkt;\n+};\n+\n struct gve_rx_queue {\n \tvolatile struct gve_rx_desc *rx_desc_ring;\n \tvolatile union gve_rx_data_slot *rx_data_ring;\n@@ -150,6 +157,7 @@ struct gve_rx_queue {\n \tuint64_t rx_ring_phys_addr;\n \tstruct rte_mbuf **sw_ring;\n \tstruct rte_mempool *mpool;\n+\tstruct gve_rx_ctx ctx;\n \n \tuint16_t rx_tail;\n \tuint16_t nb_rx_desc;\ndiff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c\nindex e264bcadad..ecef0c4a86 100644\n--- a/drivers/net/gve/gve_rx.c\n+++ b/drivers/net/gve/gve_rx.c\n@@ -5,6 +5,8 @@\n #include \"gve_ethdev.h\"\n #include \"base/gve_adminq.h\"\n \n+#define GVE_PKT_CONT_BIT_IS_SET(x) (GVE_RXF_PKT_CONT & (x))\n+\n static inline void\n gve_rx_refill(struct gve_rx_queue *rxq)\n {\n@@ -82,43 +84,72 @@ gve_rx_refill(struct gve_rx_queue *rxq)\n \t}\n }\n \n-uint16_t\n-gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n+/*\n+ * This method processes a single rte_mbuf and handles packet segmentation\n+ * In QPL mode it copies data from the mbuf to the gve_rx_queue.\n+ */\n+static void\n+gve_rx_mbuf(struct gve_rx_queue *rxq, struct rte_mbuf *rxe, uint16_t len,\n+\t uint16_t rx_id)\n {\n-\tvolatile struct gve_rx_desc *rxr, *rxd;\n-\tstruct gve_rx_queue *rxq = rx_queue;\n-\tuint16_t rx_id = rxq->rx_tail;\n-\tstruct rte_mbuf *rxe;\n-\tuint16_t nb_rx, len;\n-\tuint64_t bytes = 0;\n+\tuint16_t padding = 0;\n \tuint64_t addr;\n-\tuint16_t i;\n-\n-\trxr = rxq->rx_desc_ring;\n-\tnb_rx = 0;\n \n-\tfor (i = 0; i < nb_pkts; i++) {\n-\t\trxd = &rxr[rx_id];\n-\t\tif (GVE_SEQNO(rxd->flags_seq) != rxq->expected_seqno)\n-\t\t\tbreak;\n-\n-\t\tif (rxd->flags_seq & GVE_RXF_ERR) {\n-\t\t\trxq->errors++;\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tlen = rte_be_to_cpu_16(rxd->len) - GVE_RX_PAD;\n-\t\trxe = rxq->sw_ring[rx_id];\n-\t\tif (rxq->is_gqi_qpl) {\n-\t\t\taddr = (uint64_t)(rxq->qpl->mz->addr) + rx_id * PAGE_SIZE + GVE_RX_PAD;\n-\t\t\trte_memcpy((void *)((size_t)rxe->buf_addr + rxe->data_off),\n-\t\t\t\t (void *)(size_t)addr, len);\n-\t\t}\n+\trxe->data_len = len;\n+\tif (!rxq->ctx.mbuf_head) {\n+\t\trxq->ctx.mbuf_head = rxe;\n+\t\trxq->ctx.mbuf_tail = rxe;\n+\t\trxe->nb_segs = 1;\n \t\trxe->pkt_len = len;\n \t\trxe->data_len = len;\n \t\trxe->port = rxq->port_id;\n \t\trxe->ol_flags = 0;\n+\t\tpadding = GVE_RX_PAD;\n+\t} else {\n+\t\trxq->ctx.mbuf_head->pkt_len += len;\n+\t\trxq->ctx.mbuf_head->nb_segs += 1;\n+\t\trxq->ctx.mbuf_tail->next = rxe;\n+\t\trxq->ctx.mbuf_tail = rxe;\n+\t}\n+\tif (rxq->is_gqi_qpl) {\n+\t\taddr = (uint64_t)(rxq->qpl->mz->addr) + rx_id * PAGE_SIZE + padding;\n+\t\trte_memcpy((void *)((size_t)rxe->buf_addr + rxe->data_off),\n+\t\t\t\t (void *)(size_t)addr, len);\n+\t}\n+}\n+\n+/*\n+ * This method processes a single packet fragment associated with the\n+ * passed packet descriptor.\n+ * This methods returns whether the fragment is the last fragment\n+ * of a packet.\n+ */\n+static bool\n+gve_rx(struct gve_rx_queue *rxq, volatile struct gve_rx_desc *rxd, uint16_t rx_id)\n+{\n+\tbool is_last_frag = !GVE_PKT_CONT_BIT_IS_SET(rxd->flags_seq);\n+\tuint16_t frag_size = rte_be_to_cpu_16(rxd->len);\n+\tstruct gve_rx_ctx *ctx = &rxq->ctx;\n+\tbool is_first_frag = ctx->total_frags == 0;\n+\tstruct rte_mbuf *rxe;\n+\n+\tif (ctx->drop_pkt)\n+\t\tgoto finish_frag;\n \n+\tif (rxd->flags_seq & GVE_RXF_ERR) {\n+\t\tctx->drop_pkt = true;\n+\t\trxq->errors++;\n+\t\tgoto finish_frag;\n+\t}\n+\n+\tif (is_first_frag)\n+\t\tfrag_size -= GVE_RX_PAD;\n+\n+\trxe = rxq->sw_ring[rx_id];\n+\tgve_rx_mbuf(rxq, rxe, frag_size, rx_id);\n+\trxq->bytes += frag_size;\n+\n+\tif (is_first_frag) {\n \t\tif (rxd->flags_seq & GVE_RXF_TCP)\n \t\t\trxe->packet_type |= RTE_PTYPE_L4_TCP;\n \t\tif (rxd->flags_seq & GVE_RXF_UDP)\n@@ -132,28 +163,60 @@ gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\trxe->ol_flags |= RTE_MBUF_F_RX_RSS_HASH;\n \t\t\trxe->hash.rss = rte_be_to_cpu_32(rxd->rss_hash);\n \t\t}\n+\t}\n \n-\t\trxq->expected_seqno = gve_next_seqno(rxq->expected_seqno);\n+finish_frag:\n+\tctx->total_frags++;\n+\treturn is_last_frag;\n+}\n+\n+static void\n+gve_rx_ctx_clear(struct gve_rx_ctx *ctx)\n+{\n+\tctx->mbuf_head = NULL;\n+\tctx->mbuf_tail = NULL;\n+\tctx->drop_pkt = false;\n+\tctx->total_frags = 0;\n+}\n+\n+uint16_t\n+gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n+{\n+\tvolatile struct gve_rx_desc *rxr, *rxd;\n+\tstruct gve_rx_queue *rxq = rx_queue;\n+\tstruct gve_rx_ctx *ctx = &rxq->ctx;\n+\tuint16_t rx_id = rxq->rx_tail;\n+\tuint16_t nb_rx;\n+\n+\trxr = rxq->rx_desc_ring;\n+\tnb_rx = 0;\n+\n+\twhile (nb_rx < nb_pkts) {\n+\t\trxd = &rxr[rx_id];\n+\t\tif (GVE_SEQNO(rxd->flags_seq) != rxq->expected_seqno)\n+\t\t\tbreak;\n+\n+\t\tif (gve_rx(rxq, rxd, rx_id)) {\n+\t\t\tif (!ctx->drop_pkt)\n+\t\t\t\trx_pkts[nb_rx++] = ctx->mbuf_head;\n+\t\t\trxq->nb_avail += ctx->total_frags;\n+\t\t\tgve_rx_ctx_clear(ctx);\n+\t\t}\n \n \t\trx_id++;\n \t\tif (rx_id == rxq->nb_rx_desc)\n \t\t\trx_id = 0;\n \n-\t\trx_pkts[nb_rx] = rxe;\n-\t\tbytes += len;\n-\t\tnb_rx++;\n+\t\trxq->expected_seqno = gve_next_seqno(rxq->expected_seqno);\n \t}\n \n-\trxq->nb_avail += nb_rx;\n \trxq->rx_tail = rx_id;\n \n \tif (rxq->nb_avail > rxq->free_thresh)\n \t\tgve_rx_refill(rxq);\n \n-\tif (nb_rx) {\n+\tif (nb_rx)\n \t\trxq->packets += nb_rx;\n-\t\trxq->bytes += bytes;\n-\t}\n \n \treturn nb_rx;\n }\n", "prefixes": [ "RFC", "v3", "09/10" ] }{ "id": 124116, "url": "