Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/98285/?format=api
{ "id": 98285, "url": "http://patches.dpdk.org/api/patches/98285/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210908083758.312055-6-jiawenwu@trustnetic.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": "<20210908083758.312055-6-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210908083758.312055-6-jiawenwu@trustnetic.com", "date": "2021-09-08T08:37:31", "name": "[05/32] net/ngbe: support CRC offload", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "813b32283062299bd80ff7467c02306c62894ede", "submitter": { "id": 1932, "url": "http://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.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/20210908083758.312055-6-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 18760, "url": "http://patches.dpdk.org/api/series/18760/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=18760", "date": "2021-09-08T08:37:26", "name": "net/ngbe: add many features", "version": 1, "mbox": "http://patches.dpdk.org/series/18760/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/98285/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/98285/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 AD1D7A0C56;\n\tWed, 8 Sep 2021 10:36:54 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CE32F41194;\n\tWed, 8 Sep 2021 10:36:35 +0200 (CEST)", "from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142])\n by mails.dpdk.org (Postfix) with ESMTP id AA06F4115D\n for <dev@dpdk.org>; Wed, 8 Sep 2021 10:36:32 +0200 (CEST)", "from wxdbg.localdomain.com (unknown [183.129.236.74])\n by esmtp6.qq.com (ESMTP) with\n id ; Wed, 08 Sep 2021 16:36:27 +0800 (CST)" ], "X-QQ-mid": "bizesmtp47t1631090188tpo2dns4", "X-QQ-SSF": "01400000002000E0G000B00A0000000", "X-QQ-FEAT": "ZTnzshg2nJbfAA/6OVfCVNaYwlduFdVqevo3yVDonY6zkgMaSps4c8T9ort0f\n RhWBJniyUjrl/jNLHTSH9v3tJpOmKqva+lhU1RcWYImdgYpKBKQxs2EqKm1sirUDP6k4Nxr\n 41IG0XKTxAPLNtoN1uR9VeDcFyRtE5MkLRDACvomuWho1LsKTlutyMFfGea0e/tyRCfMFQ5\n xEMPmDuJVQ8gO2gxbpBC2+siI/Q5KAbP97nFv7X0P7/1NtEIrM2GuKyEQJuKrnWZfQC40hX\n pgYsaLfN9pGWuJrGV+AAxeOTEuxRRzGjXSXCs4vv8V61eWP2culOcmS8AFsK9Ryv2IzPdcJ\n QTmjgZpaPI34JxWauFOMWH1ZM6urnZeVr+CowgS", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Wed, 8 Sep 2021 16:37:31 +0800", "Message-Id": "<20210908083758.312055-6-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210908083758.312055-1-jiawenwu@trustnetic.com>", "References": "<20210908083758.312055-1-jiawenwu@trustnetic.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign2", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH 05/32] net/ngbe: support CRC offload", "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": "Support to strip or keep CRC in Rx path.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n doc/guides/nics/features/ngbe.ini | 1 +\n drivers/net/ngbe/ngbe_rxtx.c | 53 +++++++++++++++++++++++++++++--\n drivers/net/ngbe/ngbe_rxtx.h | 1 +\n 3 files changed, 53 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/ngbe.ini b/doc/guides/nics/features/ngbe.ini\nindex 32f74a3084..2a472d9434 100644\n--- a/doc/guides/nics/features/ngbe.ini\n+++ b/doc/guides/nics/features/ngbe.ini\n@@ -10,6 +10,7 @@ Link status event = Y\n Queue start/stop = Y\n Scattered Rx = Y\n TSO = Y\n+CRC offload = P\n L3 checksum offload = P\n L4 checksum offload = P\n Inner L3 checksum = P\ndiff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c\nindex 21f5808787..f9d8cf9d19 100644\n--- a/drivers/net/ngbe/ngbe_rxtx.c\n+++ b/drivers/net/ngbe/ngbe_rxtx.c\n@@ -968,7 +968,8 @@ ngbe_rx_scan_hw_ring(struct ngbe_rx_queue *rxq)\n \t\t/* Translate descriptor info to mbuf format */\n \t\tfor (j = 0; j < nb_dd; ++j) {\n \t\t\tmb = rxep[j].mbuf;\n-\t\t\tpkt_len = rte_le_to_cpu_16(rxdp[j].qw1.hi.len);\n+\t\t\tpkt_len = rte_le_to_cpu_16(rxdp[j].qw1.hi.len) -\n+\t\t\t\t rxq->crc_len;\n \t\t\tmb->data_len = pkt_len;\n \t\t\tmb->pkt_len = pkt_len;\n \n@@ -1271,7 +1272,8 @@ ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t * - IP checksum flag,\n \t\t * - error flags.\n \t\t */\n-\t\tpkt_len = (uint16_t)(rte_le_to_cpu_16(rxd.qw1.hi.len));\n+\t\tpkt_len = (uint16_t)(rte_le_to_cpu_16(rxd.qw1.hi.len) -\n+\t\t\t\t rxq->crc_len);\n \t\trxm->data_off = RTE_PKTMBUF_HEADROOM;\n \t\trte_packet_prefetch((char *)rxm->buf_addr + rxm->data_off);\n \t\trxm->nb_segs = 1;\n@@ -1521,6 +1523,22 @@ ngbe_recv_pkts_sc(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts,\n \t\t/* Initialize the first mbuf of the returned packet */\n \t\tngbe_fill_cluster_head_buf(first_seg, &rxd, rxq, staterr);\n \n+\t\t/* Deal with the case, when HW CRC srip is disabled. */\n+\t\tfirst_seg->pkt_len -= rxq->crc_len;\n+\t\tif (unlikely(rxm->data_len <= rxq->crc_len)) {\n+\t\t\tstruct rte_mbuf *lp;\n+\n+\t\t\tfor (lp = first_seg; lp->next != rxm; lp = lp->next)\n+\t\t\t\t;\n+\n+\t\t\tfirst_seg->nb_segs--;\n+\t\t\tlp->data_len -= rxq->crc_len - rxm->data_len;\n+\t\t\tlp->next = NULL;\n+\t\t\trte_pktmbuf_free_seg(rxm);\n+\t\t} else {\n+\t\t\trxm->data_len -= rxq->crc_len;\n+\t\t}\n+\n \t\t/* Prefetch data of first segment, if configured to do so. */\n \t\trte_packet_prefetch((char *)first_seg->buf_addr +\n \t\t\tfirst_seg->data_off);\n@@ -1989,6 +2007,7 @@ ngbe_get_rx_port_offloads(struct rte_eth_dev *dev __rte_unused)\n \toffloads = DEV_RX_OFFLOAD_IPV4_CKSUM |\n \t\t DEV_RX_OFFLOAD_UDP_CKSUM |\n \t\t DEV_RX_OFFLOAD_TCP_CKSUM |\n+\t\t DEV_RX_OFFLOAD_KEEP_CRC |\n \t\t DEV_RX_OFFLOAD_SCATTER;\n \n \treturn offloads;\n@@ -2032,6 +2051,10 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \trxq->queue_id = queue_idx;\n \trxq->reg_idx = queue_idx;\n \trxq->port_id = dev->data->port_id;\n+\tif (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)\n+\t\trxq->crc_len = RTE_ETHER_CRC_LEN;\n+\telse\n+\t\trxq->crc_len = 0;\n \trxq->drop_en = rx_conf->rx_drop_en;\n \trxq->rx_deferred_start = rx_conf->rx_deferred_start;\n \trxq->offloads = offloads;\n@@ -2259,6 +2282,7 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)\n \tuint32_t fctrl;\n \tuint32_t hlreg0;\n \tuint32_t srrctl;\n+\tuint32_t rdrxctl;\n \tuint32_t rxcsum;\n \tuint16_t buf_size;\n \tuint16_t i;\n@@ -2279,7 +2303,14 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)\n \tfctrl |= NGBE_PSRCTL_BCA;\n \twr32(hw, NGBE_PSRCTL, fctrl);\n \n+\t/*\n+\t * Configure CRC stripping, if any.\n+\t */\n \thlreg0 = rd32(hw, NGBE_SECRXCTL);\n+\tif (rx_conf->offloads & DEV_RX_OFFLOAD_KEEP_CRC)\n+\t\thlreg0 &= ~NGBE_SECRXCTL_CRCSTRIP;\n+\telse\n+\t\thlreg0 |= NGBE_SECRXCTL_CRCSTRIP;\n \thlreg0 &= ~NGBE_SECRXCTL_XDSA;\n \twr32(hw, NGBE_SECRXCTL, hlreg0);\n \n@@ -2290,6 +2321,15 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)\n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n \t\trxq = dev->data->rx_queues[i];\n \n+\t\t/*\n+\t\t * Reset crc_len in case it was changed after queue setup by a\n+\t\t * call to configure.\n+\t\t */\n+\t\tif (rx_conf->offloads & DEV_RX_OFFLOAD_KEEP_CRC)\n+\t\t\trxq->crc_len = RTE_ETHER_CRC_LEN;\n+\t\telse\n+\t\t\trxq->crc_len = 0;\n+\n \t\t/* Setup the Base and Length of the Rx Descriptor Rings */\n \t\tbus_addr = rxq->rx_ring_phys_addr;\n \t\twr32(hw, NGBE_RXBAL(rxq->reg_idx),\n@@ -2334,6 +2374,15 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)\n \n \twr32(hw, NGBE_PSRCTL, rxcsum);\n \n+\tif (hw->is_pf) {\n+\t\trdrxctl = rd32(hw, NGBE_SECRXCTL);\n+\t\tif (rx_conf->offloads & DEV_RX_OFFLOAD_KEEP_CRC)\n+\t\t\trdrxctl &= ~NGBE_SECRXCTL_CRCSTRIP;\n+\t\telse\n+\t\t\trdrxctl |= NGBE_SECRXCTL_CRCSTRIP;\n+\t\twr32(hw, NGBE_SECRXCTL, rdrxctl);\n+\t}\n+\n \tngbe_set_rx_function(dev);\n \n \treturn 0;\ndiff --git a/drivers/net/ngbe/ngbe_rxtx.h b/drivers/net/ngbe/ngbe_rxtx.h\nindex 27c83f45a7..07b6e2374e 100644\n--- a/drivers/net/ngbe/ngbe_rxtx.h\n+++ b/drivers/net/ngbe/ngbe_rxtx.h\n@@ -268,6 +268,7 @@ struct ngbe_rx_queue {\n \t/** Packet type mask for different NICs */\n \tuint16_t pkt_type_mask;\n \tuint16_t port_id; /**< Device port identifier */\n+\tuint8_t crc_len; /**< 0 if CRC stripped, 4 otherwise. */\n \tuint8_t drop_en; /**< If not 0, set SRRCTL.Drop_En */\n \tuint8_t rx_deferred_start; /**< not in global dev start */\n \tuint64_t\toffloads; /**< Rx offloads with DEV_RX_OFFLOAD_* */\n", "prefixes": [ "05/32" ] }