Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54765/?format=api
{ "id": 54765, "url": "http://patches.dpdk.org/api/patches/54765/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1560434305-9359-4-git-send-email-lironh@marvell.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": "<1560434305-9359-4-git-send-email-lironh@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1560434305-9359-4-git-send-email-lironh@marvell.com", "date": "2019-06-13T13:58:25", "name": "[v2,3/3] net/mvneta: only use ol_flags for checksum generation offload", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8e311f1caedcb76467b28ed7bfe1d2a9746eacdc", "submitter": { "id": 996, "url": "http://patches.dpdk.org/api/people/996/?format=api", "name": "Liron Himi", "email": "lironh@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1560434305-9359-4-git-send-email-lironh@marvell.com/mbox/", "series": [ { "id": 4998, "url": "http://patches.dpdk.org/api/series/4998/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4998", "date": "2019-06-13T13:58:22", "name": "net/mvneta: minor updates", "version": 2, "mbox": "http://patches.dpdk.org/series/4998/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54765/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54765/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 691F31D3FB;\n\tThu, 13 Jun 2019 13:45:13 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id EA6781D3F0\n\tfor <dev@dpdk.org>; Thu, 13 Jun 2019 13:45:08 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx5DBj8rI008523 for <dev@dpdk.org>; Thu, 13 Jun 2019 04:45:08 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2t3j820t3q-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n\tfor <dev@dpdk.org>; Thu, 13 Jun 2019 04:45:08 -0700", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com\n\t(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tThu, 13 Jun 2019 04:45:07 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n\t(10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Thu, 13 Jun 2019 04:45:07 -0700", "from pt-lxl0023.marvell.com (pt-lxl0023.marvell.com [10.5.213.12])\n\tby maili.marvell.com (Postfix) with ESMTP id 75D203F7045;\n\tThu, 13 Jun 2019 04:45:06 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-type; s=pfpt0818;\n\tbh=kYld9SD9t8uN7CM0p09ScxewKUeM9CZejbZWWFeFh8o=; \n\tb=ojtHOnEx0vXwH4Jl0L9lAEAc68YqAO9YNN/7Fd5qA1gUaPfBc407hLRkENP7jySReGqm\n\tQ50audNLbtWHX94nYOKxB9MpOsBrOztYvBHML3w9ogTfrfE6CTj2Yxof2TqsrWUh9300\n\t+2FZ3oNKBdkae0Zq5ngxGXO5XH+TGfP08NuepYDxYA+MHRWjZy7AgTrrgmPNSV99YrOi\n\tVMzkL/Gkj1hAWsn7xRVwKhwzREqWyEAfvXwlzvPWae3mzxNwpGaY48iXRr8RyP/KA3hu\n\tqVNcjPL62llY8M5iXKQUyhmnHdu8Rw6vEFxoLMzh3mUl8JJVIikSsnuJ+bATBaotZNeP\n\tSA== ", "From": "<lironh@marvell.com>", "To": "<dev@dpdk.org>", "CC": "Liron Himi <lironh@marvell.com>", "Date": "Thu, 13 Jun 2019 16:58:25 +0300", "Message-ID": "<1560434305-9359-4-git-send-email-lironh@marvell.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1560434305-9359-1-git-send-email-lironh@marvell.com>", "References": "<1560258407-26378-1-git-send-email-lironh@marvell.com>\n\t<1560434305-9359-1-git-send-email-lironh@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:, ,\n\tdefinitions=2019-06-13_07:, , signatures=0", "Subject": "[dpdk-dev] [PATCH v2 3/3] net/mvneta: only use ol_flags for\n\tchecksum generation 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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Liron Himi <lironh@marvell.com>\n\nSigned-off-by: Liron Himi <lironh@marvell.com>\nReviewed-by: Yuri Chipchev <yuric@marvell.com>\nTested-by: Liron Himi <lironh@marvell.com>\n---\n drivers/net/mvneta/mvneta_ethdev.c | 9 ------\n drivers/net/mvneta/mvneta_ethdev.h | 14 +++++++++\n drivers/net/mvneta/mvneta_rxtx.c | 62 ++++++++++++++------------------------\n 3 files changed, 36 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c\nindex f324d93..d46a13b 100644\n--- a/drivers/net/mvneta/mvneta_ethdev.c\n+++ b/drivers/net/mvneta/mvneta_ethdev.c\n@@ -27,15 +27,6 @@\n \n #define MVNETA_IFACE_NAME_ARG \"iface\"\n \n-#define MVNETA_RX_OFFLOADS (DEV_RX_OFFLOAD_JUMBO_FRAME | \\\n-\t\t\t DEV_RX_OFFLOAD_CHECKSUM)\n-\n-/** Port Tx offloads capabilities */\n-#define MVNETA_TX_OFFLOADS (DEV_TX_OFFLOAD_IPV4_CKSUM | \\\n-\t\t\t DEV_TX_OFFLOAD_UDP_CKSUM | \\\n-\t\t\t DEV_TX_OFFLOAD_TCP_CKSUM | \\\n-\t\t\t DEV_TX_OFFLOAD_MULTI_SEGS)\n-\n #define MVNETA_PKT_SIZE_MAX (16382 - MV_MH_SIZE) /* 9700B */\n #define MVNETA_DEFAULT_MTU 1500\n \ndiff --git a/drivers/net/mvneta/mvneta_ethdev.h b/drivers/net/mvneta/mvneta_ethdev.h\nindex d892d6c..ef80677 100644\n--- a/drivers/net/mvneta/mvneta_ethdev.h\n+++ b/drivers/net/mvneta/mvneta_ethdev.h\n@@ -53,6 +53,20 @@\n #define MRVL_NETA_MTU_TO_MRU(mtu)\t((mtu) + MRVL_NETA_HDRS_LEN)\n #define MRVL_NETA_MRU_TO_MTU(mru)\t((mru) - MRVL_NETA_HDRS_LEN)\n \n+/** Rx offloads capabilities */\n+#define MVNETA_RX_OFFLOADS (DEV_RX_OFFLOAD_JUMBO_FRAME | \\\n+\t\t\t DEV_RX_OFFLOAD_CHECKSUM)\n+\n+/** Tx offloads capabilities */\n+#define MVNETA_TX_OFFLOAD_CHECKSUM (DEV_TX_OFFLOAD_IPV4_CKSUM | \\\n+\t\t\t\t DEV_TX_OFFLOAD_UDP_CKSUM | \\\n+\t\t\t\t DEV_TX_OFFLOAD_TCP_CKSUM)\n+#define MVNETA_TX_OFFLOADS (MVNETA_TX_OFFLOAD_CHECKSUM | \\\n+\t\t\t DEV_TX_OFFLOAD_MULTI_SEGS)\n+\n+#define MVNETA_TX_PKT_OFFLOADS (PKT_TX_IP_CKSUM | \\\n+\t\t\t\tPKT_TX_TCP_CKSUM | \\\n+\t\t\t\tPKT_TX_UDP_CKSUM)\n \n struct mvneta_priv {\n \t/* Hot fields, used in fast path. */\ndiff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c\nindex 62caa68..10b6f57 100644\n--- a/drivers/net/mvneta/mvneta_rxtx.c\n+++ b/drivers/net/mvneta/mvneta_rxtx.c\n@@ -280,8 +280,6 @@ mvneta_desc_to_packet_type_and_offset(struct neta_ppio_desc *desc,\n *\n * @param ol_flags\n * Offload flags.\n- * @param packet_type\n- * Packet type bitfield.\n * @param l3_type\n * Pointer to the neta_ouq_l3_type structure.\n * @param l4_type\n@@ -290,41 +288,34 @@ mvneta_desc_to_packet_type_and_offset(struct neta_ppio_desc *desc,\n * Will be set to 1 in case l3 checksum is computed.\n * @param l4_cksum\n * Will be set to 1 in case l4 checksum is computed.\n- *\n- * @return\n- * 0 on success, negative error value otherwise.\n */\n-static inline int\n-mvneta_prepare_proto_info(uint64_t ol_flags, uint32_t packet_type,\n-\t\t\tenum neta_outq_l3_type *l3_type,\n-\t\t\tenum neta_outq_l4_type *l4_type,\n-\t\t\tint *gen_l3_cksum,\n-\t\t\tint *gen_l4_cksum)\n+static inline void\n+mvneta_prepare_proto_info(uint64_t ol_flags,\n+\t\t\t enum neta_outq_l3_type *l3_type,\n+\t\t\t enum neta_outq_l4_type *l4_type,\n+\t\t\t int *gen_l3_cksum,\n+\t\t\t int *gen_l4_cksum)\n {\n \t/*\n \t * Based on ol_flags prepare information\n \t * for neta_ppio_outq_desc_set_proto_info() which setups descriptor\n \t * for offloading.\n+\t * in most of the checksum cases ipv4 must be set, so this is the\n+\t * default value\n \t */\n-\tif (ol_flags & PKT_TX_IPV4) {\n-\t\t*l3_type = NETA_OUTQ_L3_TYPE_IPV4;\n-\t\t*gen_l3_cksum = ol_flags & PKT_TX_IP_CKSUM ? 1 : 0;\n-\t} else if (ol_flags & PKT_TX_IPV6) {\n+\t*l3_type = NETA_OUTQ_L3_TYPE_IPV4;\n+\t*gen_l3_cksum = ol_flags & PKT_TX_IP_CKSUM ? 1 : 0;\n+\n+\tif (ol_flags & PKT_TX_IPV6) {\n \t\t*l3_type = NETA_OUTQ_L3_TYPE_IPV6;\n \t\t/* no checksum for ipv6 header */\n \t\t*gen_l3_cksum = 0;\n-\t} else {\n-\t\t/* if something different then stop processing */\n-\t\treturn -1;\n \t}\n \n-\tol_flags &= PKT_TX_L4_MASK;\n-\tif ((packet_type & RTE_PTYPE_L4_TCP) &&\n-\t ol_flags == PKT_TX_TCP_CKSUM) {\n+\tif (ol_flags & PKT_TX_TCP_CKSUM) {\n \t\t*l4_type = NETA_OUTQ_L4_TYPE_TCP;\n \t\t*gen_l4_cksum = 1;\n-\t} else if ((packet_type & RTE_PTYPE_L4_UDP) &&\n-\t\t ol_flags == PKT_TX_UDP_CKSUM) {\n+\t} else if (ol_flags & PKT_TX_UDP_CKSUM) {\n \t\t*l4_type = NETA_OUTQ_L4_TYPE_UDP;\n \t\t*gen_l4_cksum = 1;\n \t} else {\n@@ -332,8 +323,6 @@ mvneta_prepare_proto_info(uint64_t ol_flags, uint32_t packet_type,\n \t\t/* no checksum for other type */\n \t\t*gen_l4_cksum = 0;\n \t}\n-\n-\treturn 0;\n }\n \n /**\n@@ -385,8 +374,7 @@ mvneta_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \tstruct mvneta_txq *q = txq;\n \tstruct mvneta_shadow_txq *sq;\n \tstruct neta_ppio_desc descs[nb_pkts];\n-\n-\tint i, ret, bytes_sent = 0;\n+\tint i, bytes_sent = 0;\n \tuint16_t num, sq_free_size;\n \tuint64_t addr;\n \n@@ -419,13 +407,10 @@ mvneta_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \n \t\tbytes_sent += rte_pktmbuf_pkt_len(mbuf);\n \n-\t\tret = mvneta_prepare_proto_info(mbuf->ol_flags,\n-\t\t\t\t\t\tmbuf->packet_type,\n-\t\t\t\t\t\t&l3_type, &l4_type,\n-\t\t\t\t\t\t&gen_l3_cksum,\n-\t\t\t\t\t\t&gen_l4_cksum);\n-\t\tif (unlikely(ret))\n+\t\tif (!(mbuf->ol_flags & MVNETA_TX_PKT_OFFLOADS))\n \t\t\tcontinue;\n+\t\tmvneta_prepare_proto_info(mbuf->ol_flags, &l3_type, &l4_type,\n+\t\t\t\t\t &gen_l3_cksum, &gen_l4_cksum);\n \n \t\tneta_ppio_outq_desc_set_proto_info(&descs[i], l3_type, l4_type,\n \t\t\t\t\t\t mbuf->l2_len,\n@@ -473,7 +458,7 @@ mvneta_tx_sg_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \tstruct neta_ppio_desc descs[nb_pkts * NETA_PPIO_DESC_NUM_FRAGS];\n \tstruct neta_ppio_sg_pkts pkts;\n \tuint8_t frags[nb_pkts];\n-\tint i, j, ret, bytes_sent = 0;\n+\tint i, j, bytes_sent = 0;\n \tint tail, tail_first;\n \tuint16_t num, sq_free_size;\n \tuint16_t nb_segs, total_descs = 0;\n@@ -549,13 +534,10 @@ mvneta_tx_sg_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \n \t\tbytes_sent += rte_pktmbuf_pkt_len(mbuf);\n \n-\t\tret = mvneta_prepare_proto_info(mbuf->ol_flags,\n-\t\t\t\t\t\tmbuf->packet_type,\n-\t\t\t\t\t\t&l3_type, &l4_type,\n-\t\t\t\t\t\t&gen_l3_cksum,\n-\t\t\t\t\t\t&gen_l4_cksum);\n-\t\tif (unlikely(ret))\n+\t\tif (!(mbuf->ol_flags & MVNETA_TX_PKT_OFFLOADS))\n \t\t\tcontinue;\n+\t\tmvneta_prepare_proto_info(mbuf->ol_flags, &l3_type, &l4_type,\n+\t\t\t\t\t &gen_l3_cksum, &gen_l4_cksum);\n \n \t\tneta_ppio_outq_desc_set_proto_info(&descs[tail_first],\n \t\t\t\t\t\t l3_type, l4_type,\n", "prefixes": [ "v2", "3/3" ] }