Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87354/?format=api
{ "id": 87354, "url": "https://patches.dpdk.org/api/patches/87354/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126183226.2420903-4-mk@semihalf.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": "<20210126183226.2420903-4-mk@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126183226.2420903-4-mk@semihalf.com", "date": "2021-01-26T18:32:24", "name": "[v2,3/5] net/ena: validate Rx req id upon acquiring the desc", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "32958a4da29eccf8506190341e8913fd19347702", "submitter": { "id": 786, "url": "https://patches.dpdk.org/api/people/786/?format=api", "name": "Michal Krawczyk", "email": "mk@semihalf.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210126183226.2420903-4-mk@semihalf.com/mbox/", "series": [ { "id": 14960, "url": "https://patches.dpdk.org/api/series/14960/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14960", "date": "2021-01-26T18:32:21", "name": "net/ena: minor bug fixes and improvements", "version": 2, "mbox": "https://patches.dpdk.org/series/14960/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/87354/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87354/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 D357FA052A;\n\tTue, 26 Jan 2021 19:33:16 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 55032140F5E;\n\tTue, 26 Jan 2021 19:33:02 +0100 (CET)", "from mail-lj1-f174.google.com (mail-lj1-f174.google.com\n [209.85.208.174])\n by mails.dpdk.org (Postfix) with ESMTP id 726E2140F3A\n for <dev@dpdk.org>; Tue, 26 Jan 2021 19:32:57 +0100 (CET)", "by mail-lj1-f174.google.com with SMTP id a25so19696892ljn.0\n for <dev@dpdk.org>; Tue, 26 Jan 2021 10:32:57 -0800 (PST)", "from mkPC.int.semihalf.com (193-106-246-138.noc.fibertech.net.pl.\n [193.106.246.138])\n by smtp.gmail.com with ESMTPSA id s3sm3351036ljo.41.2021.01.26.10.32.56\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 26 Jan 2021 10:32:56 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=semihalf-com.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=S3Vtrcvx7t+OntBjXn+Ak3frgp4zUzqhdNZghDTINPM=;\n b=V1NI6D7ZTLJhddgySqIM0LfLWHgx+TiMYgiSY4yFQzDP0jRUSAWIdsiUZxhH22zxAZ\n /mtYpUp8wV1WYxzSuY3MEy7O15ZKjroTis/kZtClECr8nqNOfIi4ZTiSfkk2CEIyvK7+\n 6wo10bT1xdGZozRECi9fipjhh3cCRPgkQYC5yyPbj2mFa1EkTGetfgxHqbAy3XKzKkbE\n QyoDAe9kGnO0zQxUKGwRkAdlG/TzSPTkGEyNrycXupbq4QSl5GQRV67j5asD6//nRFoz\n Lr2UbSHsD8YDjAzXhMgqj+P++KV3BM8PvBTKFjLN+kzIwM1kXlgbwOv2XqHoVgr9p9dd\n GLsw==", "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:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=S3Vtrcvx7t+OntBjXn+Ak3frgp4zUzqhdNZghDTINPM=;\n b=BIKmMJSiP4rkmrAC1PzAsE8huU/h+GdHcAwqy+5wMTiTEz0RIpq3KCUdisUgUfaJW8\n aJn8r7ovYSf6u4YJ2LE1/B/2eMQc9vP6zjxx27yr/v1Vsh+Qw4WL9kPenZIwcQUObQm+\n DsI1z5kicT4xk21SW4vvlo5tR8OSZg+jqwAHq05cIK8pnXa13iJqP8QJuVbAub+fNwwh\n HvqH/DACkqmFHeupjb5lm/URbW1sY22yiV6iIfed3VwZjWfrH2v+XBEiFBWKLvSlPOO9\n zQRjwkHEJkwC/n22vSNuQtR3sciYBmtmmxOHO9ZT6Ozit1JJxid/7y9Xv3UGw0Ty9ta4\n hNSQ==", "X-Gm-Message-State": "AOAM5317d2gJ5EigAIZU0CZhFDSXZQAp9Jf50v6dwn3uK2kcrOyXAUZ2\n xScKx3AAuejIkpxZTijSaZTpjJkGkvNwNrh6", "X-Google-Smtp-Source": "\n ABdhPJzvWINqWhTxI9tUP3ZqptYq9IuYrLCW4/W6GLYjOuBlI3YMYhwQylJieiBzaey6WwINLPJ+3g==", "X-Received": "by 2002:a2e:574c:: with SMTP id r12mr3417519ljd.290.1611685977327;\n Tue, 26 Jan 2021 10:32:57 -0800 (PST)", "From": "Michal Krawczyk <mk@semihalf.com>", "To": "dev@dpdk.org", "Cc": "gtzalik@amazon.com, igorch@amazon.com, mw@semihalf.com,\n Michal Krawczyk <mk@semihalf.com>, Ido Segev <idose@amazon.com>", "Date": "Tue, 26 Jan 2021 19:32:24 +0100", "Message-Id": "<20210126183226.2420903-4-mk@semihalf.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210126183226.2420903-1-mk@semihalf.com>", "References": "<20210126183226.2420903-1-mk@semihalf.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 3/5] net/ena: validate Rx req id upon\n acquiring the desc", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Instead of veryfing the Rx descriptor each time it's being used in the\ndriver code, now the verification happens on the HAL side.\n\nThis simplifies code a lot as instead of doing 2 validations, only\nsingle one is needed. The driver have to check the rc value returned\nby the ena_com upon reading the Rx descriptor and trigger the reset\nif needed. It was previously the responsibility of the\nvalidate_rx_req_id() function.\n\nAs part of the change, the version of the driver was bumped to v2.2.1.\n\nFixes: 2061fe41f212 (\"net/ena: linearize Tx mbuf\")\n\nSigned-off-by: Ido Segev <idose@amazon.com>\nSigned-off-by: Michal Krawczyk <mk@semihalf.com>\nReviewed-by: Igor Chauskin <igorch@amazon.com>\n---\n drivers/net/ena/base/ena_eth_com.c | 3 +++\n drivers/net/ena/base/ena_plat_dpdk.h | 1 +\n drivers/net/ena/ena_ethdev.c | 38 ++++++++--------------------\n 3 files changed, 14 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/ena/base/ena_eth_com.c b/drivers/net/ena/base/ena_eth_com.c\nindex a35d92fbd3..5583a310a1 100644\n--- a/drivers/net/ena/base/ena_eth_com.c\n+++ b/drivers/net/ena/base/ena_eth_com.c\n@@ -531,6 +531,7 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,\n {\n \tstruct ena_com_rx_buf_info *ena_buf = &ena_rx_ctx->ena_bufs[0];\n \tstruct ena_eth_io_rx_cdesc_base *cdesc = NULL;\n+\tu16 q_depth = io_cq->q_depth;\n \tu16 cdesc_idx = 0;\n \tu16 nb_hw_desc;\n \tu16 i = 0;\n@@ -559,6 +560,8 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,\n \tdo {\n \t\tena_buf[i].len = cdesc->length;\n \t\tena_buf[i].req_id = cdesc->req_id;\n+\t\tif (unlikely(ena_buf[i].req_id >= q_depth))\n+\t\t\treturn ENA_COM_EIO;\n \n \t\tif (++i >= nb_hw_desc)\n \t\t\tbreak;\ndiff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h\nindex 48c77f0c19..a1d749f83f 100644\n--- a/drivers/net/ena/base/ena_plat_dpdk.h\n+++ b/drivers/net/ena/base/ena_plat_dpdk.h\n@@ -51,6 +51,7 @@ typedef uint64_t dma_addr_t;\n #define ENA_COM_FAULT\t-EFAULT\n #define ENA_COM_TRY_AGAIN\t-EAGAIN\n #define ENA_COM_UNSUPPORTED -EOPNOTSUPP\n+#define ENA_COM_EIO -EIO\n \n #define ____cacheline_aligned __rte_cache_aligned\n \ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 111e830bfa..9ee9de6eb9 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -28,7 +28,7 @@\n \n #define DRV_MODULE_VER_MAJOR\t2\n #define DRV_MODULE_VER_MINOR\t2\n-#define DRV_MODULE_VER_SUBMINOR\t0\n+#define DRV_MODULE_VER_SUBMINOR\t1\n \n #define ENA_IO_TXQ_IDX(q)\t(2 * (q))\n #define ENA_IO_RXQ_IDX(q)\t(2 * (q) + 1)\n@@ -380,20 +380,6 @@ static inline void ena_tx_mbuf_prepare(struct rte_mbuf *mbuf,\n \t}\n }\n \n-static inline int validate_rx_req_id(struct ena_ring *rx_ring, uint16_t req_id)\n-{\n-\tif (likely(req_id < rx_ring->ring_size))\n-\t\treturn 0;\n-\n-\tPMD_DRV_LOG(ERR, \"Invalid rx req_id: %hu\\n\", req_id);\n-\n-\trx_ring->adapter->reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;\n-\trx_ring->adapter->trigger_reset = true;\n-\t++rx_ring->rx_stats.bad_req_id;\n-\n-\treturn -EFAULT;\n-}\n-\n static int validate_tx_req_id(struct ena_ring *tx_ring, u16 req_id)\n {\n \tstruct ena_tx_buffer *tx_info = NULL;\n@@ -1486,10 +1472,6 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \t\t\trte_prefetch0(mbufs[i + 4]);\n \n \t\treq_id = rxq->empty_rx_reqs[next_to_use];\n-\t\trc = validate_rx_req_id(rxq, req_id);\n-\t\tif (unlikely(rc))\n-\t\t\tbreak;\n-\n \t\trx_info = &rxq->rx_buffer_info[req_id];\n \n \t\trc = ena_add_single_rx_desc(rxq->ena_com_io_sq, mbuf, req_id);\n@@ -2114,8 +2096,6 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring,\n \n \tlen = ena_bufs[buf].len;\n \treq_id = ena_bufs[buf].req_id;\n-\tif (unlikely(validate_rx_req_id(rx_ring, req_id)))\n-\t\treturn NULL;\n \n \trx_info = &rx_ring->rx_buffer_info[req_id];\n \n@@ -2139,10 +2119,6 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring,\n \t\t++buf;\n \t\tlen = ena_bufs[buf].len;\n \t\treq_id = ena_bufs[buf].req_id;\n-\t\tif (unlikely(validate_rx_req_id(rx_ring, req_id))) {\n-\t\t\trte_mbuf_raw_free(mbuf_head);\n-\t\t\treturn NULL;\n-\t\t}\n \n \t\trx_info = &rx_ring->rx_buffer_info[req_id];\n \t\tRTE_ASSERT(rx_info->mbuf != NULL);\n@@ -2230,10 +2206,16 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t\t &ena_rx_ctx);\n \t\tif (unlikely(rc)) {\n \t\t\tPMD_DRV_LOG(ERR, \"ena_com_rx_pkt error %d\\n\", rc);\n-\t\t\trx_ring->adapter->reset_reason =\n-\t\t\t\tENA_REGS_RESET_TOO_MANY_RX_DESCS;\n+\t\t\tif (rc == ENA_COM_NO_SPACE) {\n+\t\t\t\t++rx_ring->rx_stats.bad_desc_num;\n+\t\t\t\trx_ring->adapter->reset_reason =\n+\t\t\t\t\tENA_REGS_RESET_TOO_MANY_RX_DESCS;\n+\t\t\t} else {\n+\t\t\t\t++rx_ring->rx_stats.bad_req_id;\n+\t\t\t\trx_ring->adapter->reset_reason =\n+\t\t\t\t\tENA_REGS_RESET_INV_RX_REQ_ID;\n+\t\t\t}\n \t\t\trx_ring->adapter->trigger_reset = true;\n-\t\t\t++rx_ring->rx_stats.bad_desc_num;\n \t\t\treturn 0;\n \t\t}\n \n", "prefixes": [ "v2", "3/5" ] }