Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17185/?format=api
{ "id": 17185, "url": "http://patchwork.dpdk.org/api/patches/17185/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1479922585-8640-3-git-send-email-tomaszx.kulasek@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1479922585-8640-3-git-send-email-tomaszx.kulasek@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1479922585-8640-3-git-send-email-tomaszx.kulasek@intel.com", "date": "2016-11-23T17:36:21", "name": "[dpdk-dev,v12,2/6] e1000: add Tx preparation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7a39b76bad9fdfefd68c48f61d4df6b693705152", "submitter": { "id": 155, "url": "http://patchwork.dpdk.org/api/people/155/?format=api", "name": "Tomasz Kulasek", "email": "tomaszx.kulasek@intel.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1479922585-8640-3-git-send-email-tomaszx.kulasek@intel.com/mbox/", "series": [], "comments": "http://patchwork.dpdk.org/api/patches/17185/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/17185/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 19B63568A;\n\tWed, 23 Nov 2016 18:38:48 +0100 (CET)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 7084A5688\n\tfor <dev@dpdk.org>; Wed, 23 Nov 2016 18:38:46 +0100 (CET)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga103.jf.intel.com with ESMTP; 23 Nov 2016 09:38:45 -0800", "from unknown (HELO Sent) ([10.103.102.79])\n\tby fmsmga002.fm.intel.com with SMTP; 23 Nov 2016 09:38:43 -0800", "by Sent (sSMTP sendmail emulation); Wed, 23 Nov 2016 18:38:00 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.31,539,1473145200\"; d=\"scan'208\";\n\ta=\"1089549171\"", "From": "Tomasz Kulasek <tomaszx.kulasek@intel.com>", "To": "dev@dpdk.org", "Cc": "konstantin.ananyev@intel.com,\n\tolivier.matz@6wind.com", "Date": "Wed, 23 Nov 2016 18:36:21 +0100", "Message-Id": "<1479922585-8640-3-git-send-email-tomaszx.kulasek@intel.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1479922585-8640-1-git-send-email-tomaszx.kulasek@intel.com>", "References": "<1477486575-25148-1-git-send-email-tomaszx.kulasek@intel.com>\n\t<1479922585-8640-1-git-send-email-tomaszx.kulasek@intel.com>", "Subject": "[dpdk-dev] [PATCH v12 2/6] e1000: 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>\nAcked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n drivers/net/e1000/e1000_ethdev.h | 11 ++++++++\n drivers/net/e1000/em_ethdev.c | 5 +++-\n drivers/net/e1000/em_rxtx.c | 48 ++++++++++++++++++++++++++++++++++-\n drivers/net/e1000/igb_ethdev.c | 4 +++\n drivers/net/e1000/igb_rxtx.c | 52 +++++++++++++++++++++++++++++++++++++-\n 5 files changed, 117 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h\nindex 6c25c8d..bd0f277 100644\n--- a/drivers/net/e1000/e1000_ethdev.h\n+++ b/drivers/net/e1000/e1000_ethdev.h\n@@ -138,6 +138,11 @@\n #define E1000_MISC_VEC_ID RTE_INTR_VEC_ZERO_OFFSET\n #define E1000_RX_VEC_START RTE_INTR_VEC_RXTX_OFFSET\n \n+#define IGB_TX_MAX_SEG UINT8_MAX\n+#define IGB_TX_MAX_MTU_SEG UINT8_MAX\n+#define EM_TX_MAX_SEG UINT8_MAX\n+#define EM_TX_MAX_MTU_SEG UINT8_MAX\n+\n /* structure for interrupt relative data */\n struct e1000_interrupt {\n \tuint32_t flags;\n@@ -315,6 +320,9 @@ int eth_igb_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n uint16_t eth_igb_xmit_pkts(void *txq, struct rte_mbuf **tx_pkts,\n \t\tuint16_t nb_pkts);\n \n+uint16_t eth_igb_prep_pkts(void *txq, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts);\n+\n uint16_t eth_igb_recv_pkts(void *rxq, struct rte_mbuf **rx_pkts,\n \t\tuint16_t nb_pkts);\n \n@@ -376,6 +384,9 @@ int eth_em_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n uint16_t eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tuint16_t nb_pkts);\n \n+uint16_t eth_em_prep_pkts(void *txq, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts);\n+\n uint16_t eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tuint16_t nb_pkts);\n \ndiff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c\nindex aee3d34..a004ee9 100644\n--- a/drivers/net/e1000/em_ethdev.c\n+++ b/drivers/net/e1000/em_ethdev.c\n@@ -1,7 +1,7 @@\n /*-\n * BSD LICENSE\n *\n- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.\n+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.\n * All rights reserved.\n *\n * Redistribution and use in source and binary forms, with or without\n@@ -300,6 +300,7 @@ static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,\n \teth_dev->dev_ops = ð_em_ops;\n \teth_dev->rx_pkt_burst = (eth_rx_burst_t)ð_em_recv_pkts;\n \teth_dev->tx_pkt_burst = (eth_tx_burst_t)ð_em_xmit_pkts;\n+\teth_dev->tx_pkt_prepare = (eth_tx_prep_t)ð_em_prep_pkts;\n \n \t/* for secondary processes, we don't initialise any further as primary\n \t * has already done this work. Only check we don't need a different\n@@ -1079,6 +1080,8 @@ static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,\n \t\t.nb_max = E1000_MAX_RING_DESC,\n \t\t.nb_min = E1000_MIN_RING_DESC,\n \t\t.nb_align = EM_TXD_ALIGN,\n+\t\t.nb_seg_max = EM_TX_MAX_SEG,\n+\t\t.nb_mtu_seg_max = EM_TX_MAX_MTU_SEG,\n \t};\n \n \tdev_info->speed_capa = ETH_LINK_SPEED_10M_HD | ETH_LINK_SPEED_10M |\ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex 41f51c0..7e271ad 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -1,7 +1,7 @@\n /*-\n * BSD LICENSE\n *\n- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.\n+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.\n * All rights reserved.\n *\n * Redistribution and use in source and binary forms, with or without\n@@ -66,6 +66,7 @@\n #include <rte_udp.h>\n #include <rte_tcp.h>\n #include <rte_sctp.h>\n+#include <rte_net.h>\n #include <rte_string_fns.h>\n \n #include \"e1000_logs.h\"\n@@ -77,6 +78,14 @@\n \n #define E1000_RXDCTL_GRAN\t0x01000000 /* RXDCTL Granularity */\n \n+#define E1000_TX_OFFLOAD_MASK ( \\\n+\t\tPKT_TX_IP_CKSUM | \\\n+\t\tPKT_TX_L4_MASK | \\\n+\t\tPKT_TX_VLAN_PKT)\n+\n+#define E1000_TX_OFFLOAD_NOTSUP_MASK \\\n+\t\t(PKT_TX_OFFLOAD_MASK ^ E1000_TX_OFFLOAD_MASK)\n+\n /**\n * Structure associated with each descriptor of the RX ring of a RX queue.\n */\n@@ -618,6 +627,43 @@ struct em_tx_queue {\n \n /*********************************************************************\n *\n+ * TX prep functions\n+ *\n+ **********************************************************************/\n+uint16_t\n+eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts)\n+{\n+\tint i, ret;\n+\tstruct rte_mbuf *m;\n+\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tm = tx_pkts[i];\n+\n+\t\tif (m->ol_flags & E1000_TX_OFFLOAD_NOTSUP_MASK) {\n+\t\t\trte_errno = -ENOTSUP;\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_net_intel_cksum_prepare(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+/*********************************************************************\n+ *\n * RX functions\n *\n **********************************************************************/\ndiff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c\nindex 2fddf0c..015ef46 100644\n--- a/drivers/net/e1000/igb_ethdev.c\n+++ b/drivers/net/e1000/igb_ethdev.c\n@@ -369,6 +369,8 @@ static void eth_igbvf_interrupt_handler(struct rte_intr_handle *handle,\n \t.nb_max = E1000_MAX_RING_DESC,\n \t.nb_min = E1000_MIN_RING_DESC,\n \t.nb_align = IGB_RXD_ALIGN,\n+\t.nb_seg_max = IGB_TX_MAX_SEG,\n+\t.nb_mtu_seg_max = IGB_TX_MAX_MTU_SEG,\n };\n \n static const struct eth_dev_ops eth_igb_ops = {\n@@ -760,6 +762,7 @@ struct rte_igb_xstats_name_off {\n \teth_dev->dev_ops = ð_igb_ops;\n \teth_dev->rx_pkt_burst = ð_igb_recv_pkts;\n \teth_dev->tx_pkt_burst = ð_igb_xmit_pkts;\n+\teth_dev->tx_pkt_prepare = ð_igb_prep_pkts;\n \n \t/* for secondary processes, we don't initialise any further as primary\n \t * has already done this work. Only check we don't need a different\n@@ -963,6 +966,7 @@ struct rte_igb_xstats_name_off {\n \teth_dev->dev_ops = &igbvf_eth_dev_ops;\n \teth_dev->rx_pkt_burst = ð_igb_recv_pkts;\n \teth_dev->tx_pkt_burst = ð_igb_xmit_pkts;\n+\teth_dev->tx_pkt_prepare = ð_igb_prep_pkts;\n \n \t/* for secondary processes, we don't initialise any further as primary\n \t * has already done this work. Only check we don't need a different\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex dbd37ac..8a3a3db 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -1,7 +1,7 @@\n /*-\n * BSD LICENSE\n *\n- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.\n+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.\n * All rights reserved.\n *\n * Redistribution and use in source and binary forms, with or without\n@@ -65,6 +65,7 @@\n #include <rte_udp.h>\n #include <rte_tcp.h>\n #include <rte_sctp.h>\n+#include <rte_net.h>\n #include <rte_string_fns.h>\n \n #include \"e1000_logs.h\"\n@@ -78,6 +79,9 @@\n \t\tPKT_TX_L4_MASK |\t\t \\\n \t\tPKT_TX_TCP_SEG)\n \n+#define IGB_TX_OFFLOAD_NOTSUP_MASK \\\n+\t\t(PKT_TX_OFFLOAD_MASK ^ IGB_TX_OFFLOAD_MASK)\n+\n /**\n * Structure associated with each descriptor of the RX ring of a RX queue.\n */\n@@ -616,6 +620,51 @@ struct igb_tx_queue {\n \n /*********************************************************************\n *\n+ * TX prep functions\n+ *\n+ **********************************************************************/\n+uint16_t\n+eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,\n+\t\tuint16_t nb_pkts)\n+{\n+\tint i, ret;\n+\tstruct rte_mbuf *m;\n+\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tm = tx_pkts[i];\n+\n+\t\t/* Check some limitations for TSO in hardware */\n+\t\tif (m->ol_flags & PKT_TX_TCP_SEG)\n+\t\t\tif ((m->tso_segsz > IGB_TSO_MAX_MSS) || (m->l2_len + m->l3_len +\n+\t\t\t\t\tm->l4_len > IGB_TSO_MAX_HDRLEN)) {\n+\t\t\t\trte_errno = -EINVAL;\n+\t\t\t\treturn i;\n+\t\t\t}\n+\n+\t\tif (m->ol_flags & IGB_TX_OFFLOAD_NOTSUP_MASK) {\n+\t\t\trte_errno = -ENOTSUP;\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_net_intel_cksum_prepare(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+/*********************************************************************\n+ *\n * RX functions\n *\n **********************************************************************/\n@@ -1364,6 +1413,7 @@ struct igb_tx_queue {\n \n \tigb_reset_tx_queue(txq, dev);\n \tdev->tx_pkt_burst = eth_igb_xmit_pkts;\n+\tdev->tx_pkt_prepare = ð_igb_prep_pkts;\n \tdev->data->tx_queues[queue_idx] = txq;\n \n \treturn 0;\n", "prefixes": [ "dpdk-dev", "v12", "2/6" ] }