Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63693/?format=api
{ "id": 63693, "url": "http://patches.dpdk.org/api/patches/63693/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191209214656.27347-17-cardigliano@ntop.org/", "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": "<20191209214656.27347-17-cardigliano@ntop.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20191209214656.27347-17-cardigliano@ntop.org", "date": "2019-12-09T21:46:55", "name": "[v3,16/17] net/ionic: add TX checksum support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "992f2cda4ca4cacbe49e840dfa1daea879b68529", "submitter": { "id": 1465, "url": "http://patches.dpdk.org/api/people/1465/?format=api", "name": "Alfredo Cardigliano", "email": "cardigliano@ntop.org" }, "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/20191209214656.27347-17-cardigliano@ntop.org/mbox/", "series": [ { "id": 7760, "url": "http://patches.dpdk.org/api/series/7760/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7760", "date": "2019-12-09T21:46:39", "name": "Introduces net/ionic PMD", "version": 3, "mbox": "http://patches.dpdk.org/series/7760/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63693/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/63693/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 274C8A04B3;\n\tMon, 9 Dec 2019 22:51:28 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id DB4061BFCD;\n\tMon, 9 Dec 2019 22:49:03 +0100 (CET)", "from mail.ntop.org (mail-digitalocean.ntop.org [167.99.215.164])\n by dpdk.org (Postfix) with ESMTP id 061AE1BE83\n for <dev@dpdk.org>; Mon, 9 Dec 2019 22:48:36 +0100 (CET)", "from devele.ntop.org (net-93-145-196-230.cust.vodafonedsl.it\n [93.145.196.230])\n by mail.ntop.org (Postfix) with ESMTPSA id B7F2041C32;\n Mon, 9 Dec 2019 22:48:35 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ntop.org; s=mail;\n t=1575928115; bh=PIV3G6IFCT/KVggIpsWckZLLDolSKIua5sUJU2qfDo0=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=qAKsIfhykvjRQOVY8Cq7v5BgrdU9AZ6b8ZAhEZQxH9fCJiRbzpOUvEj4Ry0Tq2PyV\n PA+y8JtZIsmYKZepX5wJ9PVfUl9vlb6/9LtLMFfm6KfwUgypSR3aqEwk5jXYytMfwz\n ERdOGFPKMK1nb5ojzLSpPCpFs9CzJXi4jDcoogKU=", "From": "Alfredo Cardigliano <cardigliano@ntop.org>", "To": "Alfredo Cardigliano <cardigliano@ntop.org>", "Cc": "dev@dpdk.org", "Date": "Mon, 9 Dec 2019 22:46:55 +0100", "Message-Id": "<20191209214656.27347-17-cardigliano@ntop.org>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191209214656.27347-1-cardigliano@ntop.org>", "References": "<20191209214656.27347-1-cardigliano@ntop.org>", "Subject": "[dpdk-dev] [PATCH v3 16/17] net/ionic: add TX checksum support", "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": "Add support for TX checksumming.\n\nSigned-off-by: Alfredo Cardigliano <cardigliano@ntop.org>\nReviewed-by: Shannon Nelson <snelson@pensando.io>\n---\n drivers/net/ionic/ionic_ethdev.c | 5 ++\n drivers/net/ionic/ionic_lif.c | 1 +\n drivers/net/ionic/ionic_lif.h | 1 +\n drivers/net/ionic/ionic_rxtx.c | 90 ++++++++++++++++++++++++++++++--\n 4 files changed, 94 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c\nindex bf76aeae7..7c8e70872 100644\n--- a/drivers/net/ionic/ionic_ethdev.c\n+++ b/drivers/net/ionic/ionic_ethdev.c\n@@ -412,7 +412,12 @@ ionic_dev_info_get(struct rte_eth_dev *eth_dev,\n \t\t0;\n \n \tdev_info->tx_queue_offload_capa =\n+\t\tDEV_TX_OFFLOAD_IPV4_CKSUM |\n+\t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n+\t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n \t\tDEV_TX_OFFLOAD_VLAN_INSERT |\n+\t\tDEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |\n+\t\tDEV_TX_OFFLOAD_OUTER_UDP_CKSUM |\n \t\t0;\n \n \t/*\ndiff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c\nindex 2290debf5..a807ca97f 100644\n--- a/drivers/net/ionic/ionic_lif.c\n+++ b/drivers/net/ionic/ionic_lif.c\n@@ -1511,6 +1511,7 @@ ionic_lif_init(struct ionic_lif *lif)\n \t\t| IONIC_ETH_HW_RX_HASH\n \t\t| IONIC_ETH_HW_TX_SG\n \t\t| IONIC_ETH_HW_RX_SG\n+\t\t| IONIC_ETH_HW_TX_CSUM\n \t\t| IONIC_ETH_HW_RX_CSUM\n \t\t| IONIC_ETH_HW_TSO\n \t\t| IONIC_ETH_HW_TSO_IPV6\ndiff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h\nindex dd7bd11e3..d1e1541ca 100644\n--- a/drivers/net/ionic/ionic_lif.h\n+++ b/drivers/net/ionic/ionic_lif.h\n@@ -32,6 +32,7 @@ struct ionic_tx_stats {\n \tuint64_t bytes;\n \tuint64_t drop;\n \tuint64_t stop;\n+\tuint64_t no_csum;\n \tuint64_t tso;\n \tuint64_t frags;\n };\ndiff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c\nindex c780f5727..f36112ced 100644\n--- a/drivers/net/ionic/ionic_rxtx.c\n+++ b/drivers/net/ionic/ionic_rxtx.c\n@@ -232,16 +232,59 @@ ionic_dev_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)\n \treturn 0;\n }\n \n+static void\n+ionic_tx_tcp_pseudo_csum(struct rte_mbuf *txm)\n+{\n+\tstruct ether_hdr *eth_hdr = rte_pktmbuf_mtod(txm, struct ether_hdr *);\n+\tchar *l3_hdr = ((char *)eth_hdr) + txm->l2_len;\n+\tstruct rte_tcp_hdr *tcp_hdr = (struct rte_tcp_hdr *)\n+\t\t(l3_hdr + txm->l3_len);\n+\n+\tif (txm->ol_flags & PKT_TX_IP_CKSUM) {\n+\t\tstruct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *)l3_hdr;\n+\t\tipv4_hdr->hdr_checksum = 0;\n+\t\ttcp_hdr->cksum = 0;\n+\t\ttcp_hdr->cksum = rte_ipv4_udptcp_cksum(ipv4_hdr, tcp_hdr);\n+\t} else {\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *)l3_hdr;\n+\t\ttcp_hdr->cksum = 0;\n+\t\ttcp_hdr->cksum = rte_ipv6_udptcp_cksum(ipv6_hdr, tcp_hdr);\n+\t}\n+}\n+\n+static void\n+ionic_tx_tcp_inner_pseudo_csum(struct rte_mbuf *txm)\n+{\n+\tstruct ether_hdr *eth_hdr = rte_pktmbuf_mtod(txm, struct ether_hdr *);\n+\tchar *l3_hdr = ((char *)eth_hdr) + txm->outer_l2_len +\n+\t\ttxm->outer_l3_len + txm->l2_len;\n+\tstruct rte_tcp_hdr *tcp_hdr = (struct rte_tcp_hdr *)\n+\t\t(l3_hdr + txm->l3_len);\n+\n+\tif (txm->ol_flags & PKT_TX_IPV4) {\n+\t\tstruct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *)l3_hdr;\n+\t\tipv4_hdr->hdr_checksum = 0;\n+\t\ttcp_hdr->cksum = 0;\n+\t\ttcp_hdr->cksum = rte_ipv4_udptcp_cksum(ipv4_hdr, tcp_hdr);\n+\t} else {\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *)l3_hdr;\n+\t\ttcp_hdr->cksum = 0;\n+\t\ttcp_hdr->cksum = rte_ipv6_udptcp_cksum(ipv6_hdr, tcp_hdr);\n+\t}\n+}\n+\n static void\n ionic_tx_tso_post(struct ionic_queue *q, struct ionic_txq_desc *desc,\n \t\tstruct rte_mbuf *txm,\n \t\trte_iova_t addr, uint8_t nsge, uint16_t len,\n \t\tuint32_t hdrlen, uint32_t mss,\n+\t\tbool encap,\n \t\tuint16_t vlan_tci, bool has_vlan,\n \t\tbool start, bool done)\n {\n \tuint8_t flags = 0;\n \tflags |= has_vlan ? IONIC_TXQ_DESC_FLAG_VLAN : 0;\n+\tflags |= encap ? IONIC_TXQ_DESC_FLAG_ENCAP : 0;\n \tflags |= start ? IONIC_TXQ_DESC_FLAG_TSO_SOT : 0;\n \tflags |= done ? IONIC_TXQ_DESC_FLAG_TSO_EOT : 0;\n \n@@ -286,10 +329,29 @@ ionic_tx_tso(struct ionic_queue *q, struct rte_mbuf *txm,\n \tuint32_t len;\n \tuint32_t offset = 0;\n \tbool start, done;\n+\tbool encap;\n \tbool has_vlan = !!(txm->ol_flags & PKT_TX_VLAN_PKT);\n \tuint16_t vlan_tci = txm->vlan_tci;\n+\tuint64_t ol_flags = txm->ol_flags;\n \n-\thdrlen = txm->l2_len + txm->l3_len;\n+\tencap = ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||\n+\t\t(ol_flags & PKT_TX_OUTER_UDP_CKSUM)) &&\n+\t\t((ol_flags & PKT_TX_OUTER_IPV4) ||\n+\t\t(ol_flags & PKT_TX_OUTER_IPV6));\n+\n+\t/* Preload inner-most TCP csum field with IP pseudo hdr\n+\t * calculated with IP length set to zero. HW will later\n+\t * add in length to each TCP segment resulting from the TSO.\n+\t */\n+\n+\tif (encap) {\n+\t\tionic_tx_tcp_inner_pseudo_csum(txm);\n+\t\thdrlen = txm->outer_l2_len + txm->outer_l3_len +\n+\t\t\ttxm->l2_len + txm->l3_len + txm->l4_len;\n+\t} else {\n+\t\tionic_tx_tcp_pseudo_csum(txm);\n+\t\thdrlen = txm->l2_len + txm->l3_len + txm->l4_len;\n+\t}\n \n \tseglen = hdrlen + mss;\n \tleft = txm->data_len;\n@@ -313,6 +375,7 @@ ionic_tx_tso(struct ionic_queue *q, struct rte_mbuf *txm,\n \t\tionic_tx_tso_post(q, desc, txm,\n \t\t\tdesc_addr, desc_nsge, desc_len,\n \t\t\thdrlen, mss,\n+\t\t\tencap,\n \t\t\tvlan_tci, has_vlan,\n \t\t\tstart, done && not_xmit_more);\n \t\tdesc = ionic_tx_tso_next(q, &elem);\n@@ -354,6 +417,7 @@ ionic_tx_tso(struct ionic_queue *q, struct rte_mbuf *txm,\n \t\t\tionic_tx_tso_post(q, desc, txm_seg,\n \t\t\t\tdesc_addr, desc_nsge, desc_len,\n \t\t\t\thdrlen, mss,\n+\t\t\t\tencap,\n \t\t\t\tvlan_tci, has_vlan,\n \t\t\t\tstart, done && not_xmit_more);\n \t\t\tdesc = ionic_tx_tso_next(q, &elem);\n@@ -370,7 +434,7 @@ ionic_tx_tso(struct ionic_queue *q, struct rte_mbuf *txm,\n \n static int\n ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm,\n-\t\tuint64_t offloads __rte_unused, bool not_xmit_more)\n+\t\tuint64_t offloads, bool not_xmit_more)\n {\n \tstruct ionic_txq_desc *desc_base = q->base;\n \tstruct ionic_txq_sg_desc *sg_desc_base = q->sg_base;\n@@ -379,15 +443,34 @@ ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm,\n \tstruct ionic_txq_sg_elem *elem = sg_desc->elems;\n \tstruct ionic_tx_stats *stats = IONIC_Q_TO_TX_STATS(q);\n \tstruct rte_mbuf *txm_seg;\n+\tbool encap;\n \tbool has_vlan;\n \tuint64_t ol_flags = txm->ol_flags;\n \tuint64_t addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(txm));\n \tuint8_t opcode = IONIC_TXQ_DESC_OPCODE_CSUM_NONE;\n \tuint8_t flags = 0;\n \n+\tif ((ol_flags & PKT_TX_IP_CKSUM) &&\n+\t\t\t(offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)) {\n+\t\topcode = IONIC_TXQ_DESC_OPCODE_CSUM_HW;\n+\t\tflags |= IONIC_TXQ_DESC_FLAG_CSUM_L3;\n+\t\tif (((ol_flags & PKT_TX_TCP_CKSUM) &&\n+\t\t\t\t(offloads & DEV_TX_OFFLOAD_TCP_CKSUM)) ||\n+\t\t\t\t((ol_flags & PKT_TX_UDP_CKSUM) &&\n+\t\t\t\t(offloads & DEV_TX_OFFLOAD_UDP_CKSUM)))\n+\t\t\tflags |= IONIC_TXQ_DESC_FLAG_CSUM_L4;\n+\t} else {\n+\t\tstats->no_csum++;\n+\t}\n+\n \thas_vlan = (ol_flags & PKT_TX_VLAN_PKT);\n+\tencap = ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||\n+\t\t\t(ol_flags & PKT_TX_OUTER_UDP_CKSUM)) &&\n+\t\t\t((ol_flags & PKT_TX_OUTER_IPV4) ||\n+\t\t\t(ol_flags & PKT_TX_OUTER_IPV6));\n \n \tflags |= has_vlan ? IONIC_TXQ_DESC_FLAG_VLAN : 0;\n+\tflags |= encap ? IONIC_TXQ_DESC_FLAG_ENCAP : 0;\n \n \tdesc->cmd = encode_txq_desc_cmd(opcode, flags, txm->nb_segs - 1, addr);\n \tdesc->len = txm->data_len;\n@@ -472,6 +555,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tPKT_TX_IPV4 |\t\t\\\n \tPKT_TX_IPV6 |\t\t\\\n \tPKT_TX_VLAN |\t\t\\\n+\tPKT_TX_IP_CKSUM |\t\\\n \tPKT_TX_TCP_SEG |\t\\\n \tPKT_TX_L4_MASK)\n \n@@ -710,7 +794,7 @@ ionic_rx_clean(struct ionic_queue *q,\n \n \t/* Vlan Strip */\n \tif (cq_desc->csum_flags & IONIC_RXQ_COMP_CSUM_F_VLAN) {\n-\t\tpkt_flags |= PKT_RX_VLAN_STRIPPED;\n+\t\tpkt_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;\n \t\trxm->vlan_tci = cq_desc->vlan_tci;\n \t}\n \n", "prefixes": [ "v3", "16/17" ] }