Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80201/?format=api
{ "id": 80201, "url": "https://patches.dpdk.org/api/patches/80201/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201009163642.126939-1-lance.richardson@broadcom.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": "<20201009163642.126939-1-lance.richardson@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201009163642.126939-1-lance.richardson@broadcom.com", "date": "2020-10-09T16:36:42", "name": "net/bnxt: fix non-vector fast mbuf free offload", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e8cfc7a00a3cde31a7a43e827dc61eced48dbeaa", "submitter": { "id": 1323, "url": "https://patches.dpdk.org/api/people/1323/?format=api", "name": "Lance Richardson", "email": "lance.richardson@broadcom.com" }, "delegate": { "id": 1766, "url": "https://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201009163642.126939-1-lance.richardson@broadcom.com/mbox/", "series": [ { "id": 12835, "url": "https://patches.dpdk.org/api/series/12835/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=12835", "date": "2020-10-09T16:36:42", "name": "net/bnxt: fix non-vector fast mbuf free offload", "version": 1, "mbox": "https://patches.dpdk.org/series/12835/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/80201/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/80201/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0DC04A04BC;\n\tFri, 9 Oct 2020 18:36:57 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4B9BB1BCA7;\n\tFri, 9 Oct 2020 18:36:55 +0200 (CEST)", "from mail-pl1-f194.google.com (mail-pl1-f194.google.com\n [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 1910729D6\n for <dev@dpdk.org>; Fri, 9 Oct 2020 18:36:53 +0200 (CEST)", "by mail-pl1-f194.google.com with SMTP id o9so4701470plx.10\n for <dev@dpdk.org>; Fri, 09 Oct 2020 09:36:53 -0700 (PDT)", "from localhost.localdomain ([192.19.231.250])\n by smtp.gmail.com with ESMTPSA id a15sm11708563pgi.69.2020.10.09.09.36.49\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 09 Oct 2020 09:36:50 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:mime-version;\n bh=wJRANCtfS6OrubME7NNRulJkBxyTYpLrA+rkeXfWTUM=;\n b=baIVCOgU2u072atO1sSgFgQCb/ryHNABHOaYoXuMKE6+iWNYZbabioGvOhCxpyzJ64\n UYHg3Qsfu07FaRfSsgBQrwe3UR65qrAwKtt3/PTBZrKMcyJI0IK5UebkZw2ckhprVp7m\n mozIo2bQ07OxnJpPjvuZSdS7h40xAGVxTXnOk=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version;\n bh=wJRANCtfS6OrubME7NNRulJkBxyTYpLrA+rkeXfWTUM=;\n b=Jv26korz0p/imm/k2PUoT55xhVkigwKq6ToQqoVZpUp1xbokQ9isukI65S3aVkCT1P\n LvpJhiO6XnP3ao4slFnPh9exE0z4LG2E1GYvruihIRmJvXkg7dISTRPog990+eHnLBi4\n fNwRzUZuUk/jIz45VBgIdomcWxnQqaUcsMa5R2BEGPctLmyhRdhtx9BcsKaswxWeRoAC\n cknziwWR4YGo0VM5Hl5UxsLqBDAtQefGxbrbh4VtPn229dTEWko7DmgkamjWekCD4S76\n TOhyBJyBTFiWSkGGXgXb/isMufuPSYMTuYrYdQuLPuOK8KGkZfnClqAZVYP4IwDBMcW8\n KVZg==", "X-Gm-Message-State": "AOAM531cAw3VQg5XkV0yIujhGkZWZzYXZVJzbADXuSLzIGz6Qu/dmBXc\n Smca4+5UFPkBqFzcSMDnsDB6IQ==", "X-Google-Smtp-Source": "\n ABdhPJxseJ59kJwpNQUFUIxWFHmrkDhIaVlgXS0ysVDw0260lyHsPr/JcAa7NvzGq58bQOWvAD0thA==", "X-Received": "by 2002:a17:902:8543:b029:d3:9c44:7230 with SMTP id\n d3-20020a1709028543b02900d39c447230mr12793126plo.10.1602261411125;\n Fri, 09 Oct 2020 09:36:51 -0700 (PDT)", "From": "Lance Richardson <lance.richardson@broadcom.com>", "To": "Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>", "Cc": "dev@dpdk.org", "Date": "Fri, 9 Oct 2020 12:36:42 -0400", "Message-Id": "<20201009163642.126939-1-lance.richardson@broadcom.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Type": "text/plain", "Content-Transfer-Encoding": "8bit", "X-Content-Filtered-By": "Mailman/MimeDel 2.1.15", "Subject": "[dpdk-dev] [PATCH] net/bnxt: fix non-vector fast mbuf free offload", "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 <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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The fast mbuf free offload for non-vector mode requires\nadditional checks in order to handle long tx buffer\ndescriptors, so dedicated functions are needed for\nvector- and non-vector-modes.\n\nFixes: 103169df2880 (\"net/bnxt: support fast mbuf free\")\nSigned-off-by: Lance Richardson <lance.richardson@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_rxtx_vec_common.h | 27 ++++++++++++++++++++\n drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 2 +-\n drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 +-\n drivers/net/bnxt/bnxt_txr.c | 34 +++++++++++++++++++++++++\n drivers/net/bnxt/bnxt_txr.h | 27 --------------------\n 5 files changed, 63 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_common.h b/drivers/net/bnxt/bnxt_rxtx_vec_common.h\nindex 33ac53568..d540e9eee 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_common.h\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_common.h\n@@ -95,6 +95,33 @@ bnxt_rxq_rearm(struct bnxt_rx_queue *rxq, struct bnxt_rx_ring_info *rxr)\n \trxq->rxrearm_nb -= nb;\n }\n \n+/*\n+ * Transmit completion function for use when DEV_TX_OFFLOAD_MBUF_FAST_FREE\n+ * is enabled.\n+ */\n+static inline void\n+bnxt_tx_cmp_vec_fast(struct bnxt_tx_queue *txq, int nr_pkts)\n+{\n+\tstruct bnxt_tx_ring_info *txr = txq->tx_ring;\n+\tuint32_t ring_mask = txr->tx_ring_struct->ring_mask;\n+\tstruct rte_mbuf **free = txq->free;\n+\tuint16_t cons = txr->tx_cons;\n+\tunsigned int blk = 0;\n+\n+\twhile (nr_pkts--) {\n+\t\tstruct bnxt_sw_tx_bd *tx_buf;\n+\n+\t\ttx_buf = &txr->tx_buf_ring[cons];\n+\t\tcons = (cons + 1) & ring_mask;\n+\t\tfree[blk++] = tx_buf->mbuf;\n+\t\ttx_buf->mbuf = NULL;\n+\t}\n+\tif (blk)\n+\t\trte_mempool_put_bulk(free[0]->pool, (void **)free, blk);\n+\n+\ttxr->tx_cons = cons;\n+}\n+\n static inline void\n bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)\n {\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\nindex 4c04cc43a..f49e29ccb 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\n@@ -369,7 +369,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)\n \tcpr->valid = !!(raw_cons & cp_ring_struct->ring_size);\n \tif (nb_tx_pkts) {\n \t\tif (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)\n-\t\t\tbnxt_tx_cmp_fast(txq, nb_tx_pkts);\n+\t\t\tbnxt_tx_cmp_vec_fast(txq, nb_tx_pkts);\n \t\telse\n \t\t\tbnxt_tx_cmp_vec(txq, nb_tx_pkts);\n \t\tcpr->cp_raw_cons = raw_cons;\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\nindex f71f46985..e4ba63551 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n@@ -340,7 +340,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)\n \tcpr->valid = !!(raw_cons & cp_ring_struct->ring_size);\n \tif (nb_tx_pkts) {\n \t\tif (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)\n-\t\t\tbnxt_tx_cmp_fast(txq, nb_tx_pkts);\n+\t\t\tbnxt_tx_cmp_vec_fast(txq, nb_tx_pkts);\n \t\telse\n \t\t\tbnxt_tx_cmp_vec(txq, nb_tx_pkts);\n \t\tcpr->cp_raw_cons = raw_cons;\ndiff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c\nindex 125ac8341..fb358d6f1 100644\n--- a/drivers/net/bnxt/bnxt_txr.c\n+++ b/drivers/net/bnxt/bnxt_txr.c\n@@ -337,6 +337,40 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,\n \treturn 0;\n }\n \n+/*\n+ * Transmit completion function for use when DEV_TX_OFFLOAD_MBUF_FAST_FREE\n+ * is enabled.\n+ */\n+static void bnxt_tx_cmp_fast(struct bnxt_tx_queue *txq, int nr_pkts)\n+{\n+\tstruct bnxt_tx_ring_info *txr = txq->tx_ring;\n+\tstruct rte_mbuf **free = txq->free;\n+\tuint16_t cons = txr->tx_cons;\n+\tunsigned int blk = 0;\n+\tint i, j;\n+\n+\tfor (i = 0; i < nr_pkts; i++) {\n+\t\tstruct bnxt_sw_tx_bd *tx_buf;\n+\t\tunsigned short nr_bds;\n+\n+\t\ttx_buf = &txr->tx_buf_ring[cons];\n+\t\tnr_bds = tx_buf->nr_bds;\n+\t\tfor (j = 0; j < nr_bds; j++) {\n+\t\t\tif (tx_buf->mbuf) {\n+\t\t\t\t/* Add mbuf to the bulk free array */\n+\t\t\t\tfree[blk++] = tx_buf->mbuf;\n+\t\t\t\ttx_buf->mbuf = NULL;\n+\t\t\t}\n+\t\t\tcons = RING_NEXT(txr->tx_ring_struct, cons);\n+\t\t\ttx_buf = &txr->tx_buf_ring[cons];\n+\t\t}\n+\t}\n+\tif (blk)\n+\t\trte_mempool_put_bulk(free[0]->pool, (void *)free, blk);\n+\n+\ttxr->tx_cons = cons;\n+}\n+\n static void bnxt_tx_cmp(struct bnxt_tx_queue *txq, int nr_pkts)\n {\n \tstruct bnxt_tx_ring_info *txr = txq->tx_ring;\ndiff --git a/drivers/net/bnxt/bnxt_txr.h b/drivers/net/bnxt/bnxt_txr.h\nindex c0b1fde22..d241227d4 100644\n--- a/drivers/net/bnxt/bnxt_txr.h\n+++ b/drivers/net/bnxt/bnxt_txr.h\n@@ -44,33 +44,6 @@ static inline uint32_t bnxt_tx_avail(struct bnxt_tx_queue *txq)\n \t\t bnxt_tx_bds_in_hw(txq)) - 1);\n }\n \n-/*\n- * Transmit completion function for use when DEV_TX_OFFLOAD_MBUF_FAST_FREE\n- * is enabled.\n- */\n-static inline void\n-bnxt_tx_cmp_fast(struct bnxt_tx_queue *txq, int nr_pkts)\n-{\n-\tstruct bnxt_tx_ring_info *txr = txq->tx_ring;\n-\tuint32_t ring_mask = txr->tx_ring_struct->ring_mask;\n-\tstruct rte_mbuf **free = txq->free;\n-\tuint16_t cons = txr->tx_cons;\n-\tunsigned int blk = 0;\n-\n-\twhile (nr_pkts--) {\n-\t\tstruct bnxt_sw_tx_bd *tx_buf;\n-\n-\t\ttx_buf = &txr->tx_buf_ring[cons];\n-\t\tcons = (cons + 1) & ring_mask;\n-\t\tfree[blk++] = tx_buf->mbuf;\n-\t\ttx_buf->mbuf = NULL;\n-\t}\n-\tif (blk)\n-\t\trte_mempool_put_bulk(free[0]->pool, (void **)free, blk);\n-\n-\ttxr->tx_cons = cons;\n-}\n-\n void bnxt_free_tx_rings(struct bnxt *bp);\n int bnxt_init_one_tx_ring(struct bnxt_tx_queue *txq);\n int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id);\n", "prefixes": [] }