Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/15419/?format=api
{ "id": 15419, "url": "http://patches.dpdk.org/api/patches/15419/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1472228578-6980-4-git-send-email-tomaszx.kulasek@intel.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": "<1472228578-6980-4-git-send-email-tomaszx.kulasek@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1472228578-6980-4-git-send-email-tomaszx.kulasek@intel.com", "date": "2016-08-26T16:22:55", "name": "[dpdk-dev,3/6] fm10k: add Tx preparation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6e632364cede59819169cd56cc0f7e32a7785b59", "submitter": { "id": 155, "url": "http://patches.dpdk.org/api/people/155/?format=api", "name": "Tomasz Kulasek", "email": "tomaszx.kulasek@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1472228578-6980-4-git-send-email-tomaszx.kulasek@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/15419/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/15419/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id F179D5A6F;\n\tFri, 26 Aug 2016 18:23:23 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 582425A31\n\tfor <dev@dpdk.org>; Fri, 26 Aug 2016 18:23:12 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga103.jf.intel.com with ESMTP; 26 Aug 2016 09:23:12 -0700", "from unknown (HELO Sent) ([10.103.103.127])\n\tby orsmga001.jf.intel.com with SMTP; 26 Aug 2016 09:23:10 -0700", "by Sent (sSMTP sendmail emulation); Fri, 26 Aug 2016 18:23:09 +0200" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.28,581,1464678000\"; d=\"scan'208\";\n\ta=\"1020797964\"", "From": "Tomasz Kulasek <tomaszx.kulasek@intel.com>", "To": "dev@dpdk.org", "Date": "Fri, 26 Aug 2016 18:22:55 +0200", "Message-Id": "<1472228578-6980-4-git-send-email-tomaszx.kulasek@intel.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1472228578-6980-1-git-send-email-tomaszx.kulasek@intel.com>", "References": "<1472228578-6980-1-git-send-email-tomaszx.kulasek@intel.com>", "Subject": "[dpdk-dev] [PATCH 3/6] fm10k: add Tx preparation", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>\n---\n drivers/net/fm10k/fm10k.h | 9 ++++\n drivers/net/fm10k/fm10k_ethdev.c | 5 +++\n drivers/net/fm10k/fm10k_rxtx.c | 87 +++++++++++++++++++++++++++++++++++++-\n 3 files changed, 100 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h\nindex 05aa1a2..83d2bfb 100644\n--- a/drivers/net/fm10k/fm10k.h\n+++ b/drivers/net/fm10k/fm10k.h\n@@ -69,6 +69,9 @@\n #define FM10K_MAX_RX_DESC (FM10K_MAX_RX_RING_SZ / sizeof(union fm10k_rx_desc))\n #define FM10K_MAX_TX_DESC (FM10K_MAX_TX_RING_SZ / sizeof(struct fm10k_tx_desc))\n \n+#define FM10K_TX_MAX_SEG UINT8_MAX\n+#define FM10K_TX_MAX_MTU_SEG UINT8_MAX\n+\n /*\n * byte aligment for HW RX data buffer\n * Datasheet requires RX buffer addresses shall either be 512-byte aligned or\n@@ -356,6 +359,12 @@ fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);\n uint16_t fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tuint16_t nb_pkts);\n \n+uint16_t fm10k_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n+\tuint16_t nb_pkts);\n+\n+uint16_t fm10k_prep_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts,\n+\tuint16_t nb_pkts);\n+\n int fm10k_rxq_vec_setup(struct fm10k_rx_queue *rxq);\n int fm10k_rx_vec_condition_check(struct rte_eth_dev *);\n void fm10k_rx_queue_release_mbufs_vec(struct fm10k_rx_queue *rxq);\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex 01f4a72..c9f450e 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -1441,6 +1441,8 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,\n \t\t.nb_max = FM10K_MAX_TX_DESC,\n \t\t.nb_min = FM10K_MIN_TX_DESC,\n \t\t.nb_align = FM10K_MULT_TX_DESC,\n+\t\t.nb_seg_max = FM10K_TX_MAX_SEG,\n+\t\t.nb_mtu_seg_max = FM10K_TX_MAX_MTU_SEG,\n \t};\n \n \tdev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_2_5G |\n@@ -2749,8 +2751,10 @@ fm10k_set_tx_function(struct rte_eth_dev *dev)\n \t\t\tfm10k_txq_vec_setup(txq);\n \t\t}\n \t\tdev->tx_pkt_burst = fm10k_xmit_pkts_vec;\n+\t\tdev->tx_pkt_prep = fm10k_prep_pkts_simple;\n \t} else {\n \t\tdev->tx_pkt_burst = fm10k_xmit_pkts;\n+\t\tdev->tx_pkt_prep = fm10k_prep_pkts;\n \t\tPMD_INIT_LOG(DEBUG, \"Use regular Tx func\");\n \t}\n }\n@@ -2829,6 +2833,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)\n \tdev->dev_ops = &fm10k_eth_dev_ops;\n \tdev->rx_pkt_burst = &fm10k_recv_pkts;\n \tdev->tx_pkt_burst = &fm10k_xmit_pkts;\n+\tdev->tx_pkt_prep = &fm10k_prep_pkts;\n \n \t/* only initialize in the primary process */\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\ndiff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c\nindex 5b2d04b..72b1931 100644\n--- a/drivers/net/fm10k/fm10k_rxtx.c\n+++ b/drivers/net/fm10k/fm10k_rxtx.c\n@@ -1,7 +1,7 @@\n /*-\n * BSD LICENSE\n *\n- * Copyright(c) 2013-2015 Intel Corporation. All rights reserved.\n+ * Copyright(c) 2013-2016 Intel Corporation. All rights reserved.\n * All rights reserved.\n *\n * Redistribution and use in source and binary forms, with or without\n@@ -35,6 +35,7 @@\n \n #include <rte_ethdev.h>\n #include <rte_common.h>\n+#include <rte_pkt.h>\n #include \"fm10k.h\"\n #include \"base/fm10k_type.h\"\n \n@@ -65,6 +66,12 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)\n }\n #endif\n \n+#define FM10K_TX_OFFLOAD_MASK ( \\\n+\t\tPKT_TX_VLAN_PKT | \\\n+\t\tPKT_TX_IP_CKSUM | \\\n+\t\tPKT_TX_L4_MASK | \\\n+\t\tPKT_TX_TCP_SEG)\n+\n /* @note: When this function is changed, make corresponding change to\n * fm10k_dev_supported_ptypes_get()\n */\n@@ -583,3 +590,81 @@ fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \n \treturn count;\n }\n+\n+uint16_t\n+fm10k_prep_pkts(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts)\n+{\n+\tint i, ret;\n+\tstruct rte_mbuf *m;\n+\tstruct fm10k_tx_queue *q = tx_queue;\n+\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tm = tx_pkts[i];\n+\n+\t\tif (m->ol_flags & PKT_TX_TCP_SEG) {\n+\t\t\tuint8_t hdrlen = m->outer_l2_len + m->outer_l3_len + m->l2_len +\n+\t\t\t\tm->l3_len + m->l4_len;\n+\n+\t\t\tif (q->hw_ring[q->next_free].flags & FM10K_TXD_FLAG_FTAG)\n+\t\t\t\thdrlen += sizeof(struct fm10k_ftag);\n+\n+\t\t\tif ((hdrlen < FM10K_TSO_MIN_HEADERLEN) ||\n+\t\t\t\t\t(hdrlen > FM10K_TSO_MAX_HEADERLEN) ||\n+\t\t\t\t\t(m->tso_segsz < FM10K_TSO_MINMSS)) {\n+\t\t\t\trte_errno = -EINVAL;\n+\t\t\t\treturn i;\n+\t\t\t}\n+\t\t}\n+\n+\t\tif ((m->ol_flags & PKT_TX_OFFLOAD_MASK) !=\n+\t\t\t\t(m->ol_flags & FM10K_TX_OFFLOAD_MASK)) {\n+\t\t\trte_errno = -EINVAL;\n+\t\t\treturn i;\n+\t\t}\n+\n+#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n+\t\tret = rte_validate_tx_offload(m);\n+\t\tif (ret != 0) {\n+\t\t\trte_errno = ret;\n+\t\t\treturn i;\n+\t\t}\n+#endif\n+\t\tret = rte_phdr_cksum_fix(m);\n+\t\tif (ret != 0) {\n+\t\t\trte_errno = ret;\n+\t\t\treturn i;\n+\t\t}\n+\t}\n+\n+\treturn i;\n+}\n+\n+/* fm10k vector TX path doesn't support tx offloads */\n+uint16_t\n+fm10k_prep_pkts_simple(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts)\n+{\n+\tint i;\n+\tstruct rte_mbuf *m;\n+\tuint64_t ol_flags;\n+\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tm = tx_pkts[i];\n+\t\tol_flags = m->ol_flags;\n+\n+\t\t/* simple tx path doesn't support multi-segments */\n+\t\tif (m->nb_segs != 1) {\n+\t\t\trte_errno = -EINVAL;\n+\t\t\treturn i;\n+\t\t}\n+\n+\t\t/* For simple path no tx offloads are supported */\n+\t\tif (ol_flags & PKT_TX_OFFLOAD_MASK) {\n+\t\t\trte_errno = -EINVAL;\n+\t\t\treturn i;\n+\t\t}\n+\t}\n+\n+\treturn i;\n+}\n", "prefixes": [ "dpdk-dev", "3/6" ] }