Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8383/?format=api
{ "id": 8383, "url": "http://patches.dpdk.org/api/patches/8383/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1446210034-13750-9-git-send-email-jijiang.liu@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": "<1446210034-13750-9-git-send-email-jijiang.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446210034-13750-9-git-send-email-jijiang.liu@intel.com", "date": "2015-10-30T13:00:33", "name": "[dpdk-dev,v2,8/9] examples/vhost:support TX offload in vhost sample", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e14e4d56ecf4f897d6b9b2ecc987376ad37126de", "submitter": { "id": 52, "url": "http://patches.dpdk.org/api/people/52/?format=api", "name": "Jijiang Liu", "email": "jijiang.liu@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1446210034-13750-9-git-send-email-jijiang.liu@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/8383/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/8383/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 8B7918F9D;\n\tFri, 30 Oct 2015 14:01:02 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 025DE8F9D\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 14:00:59 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga103.fm.intel.com with ESMTP; 30 Oct 2015 06:00:59 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga002.jf.intel.com with ESMTP; 30 Oct 2015 06:00:59 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t9UD0uaA024000;\n\tFri, 30 Oct 2015 21:00:56 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t9UD0rIn013841; Fri, 30 Oct 2015 21:00:55 +0800", "(from jijiangl@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9UD0rR1013837; \n\tFri, 30 Oct 2015 21:00:53 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,218,1444719600\"; d=\"scan'208\";a=\"838824026\"", "From": "Jijiang Liu <jijiang.liu@intel.com>", "To": "dev@dpdk.org", "Date": "Fri, 30 Oct 2015 21:00:33 +0800", "Message-Id": "<1446210034-13750-9-git-send-email-jijiang.liu@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1446210034-13750-1-git-send-email-jijiang.liu@intel.com>", "References": "<1446210034-13750-1-git-send-email-jijiang.liu@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 8/9] examples/vhost:support TX offload in\n\tvhost sample", "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": "Change the vhost sample to support and test TX offload.\n\nSigned-off-by: Jijiang Liu <jijiang.liu@intel.com>\n---\n examples/vhost/main.c | 128 ++++++++++++++++++++++++++++++++++++++++++-------\n 1 files changed, 111 insertions(+), 17 deletions(-)", "diff": "diff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex 9eac2d0..06e1e8b 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -50,6 +50,10 @@\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\n #include <rte_virtio_net.h>\n+#include <rte_tcp.h>\n+#include <rte_ip.h>\n+#include <rte_udp.h>\n+#include <rte_sctp.h>\n \n #include \"main.h\"\n \n@@ -140,6 +144,8 @@\n \n #define MBUF_EXT_MEM(mb) (rte_mbuf_from_indirect(mb) != (mb))\n \n+#define VIRTIO_TX_CKSUM_OFFLOAD_MASK (PKT_TX_IP_CKSUM | PKT_TX_L4_MASK)\n+\n /* mask of enabled ports */\n static uint32_t enabled_port_mask = 0;\n \n@@ -197,6 +203,13 @@ typedef enum {\n static uint32_t enable_stats = 0;\n /* Enable retries on RX. */\n static uint32_t enable_retry = 1;\n+\n+/* Disable TX checksum offload */\n+static uint32_t enable_tx_csum;\n+\n+/* Disable TSO offload */\n+static uint32_t enable_tso;\n+\n /* Specify timeout (in useconds) between retries on RX. */\n static uint32_t burst_rx_delay_time = BURST_RX_WAIT_US;\n /* Specify the number of retries on RX. */\n@@ -292,20 +305,6 @@ struct vlan_ethhdr {\n \t__be16 h_vlan_encapsulated_proto;\n };\n \n-/* IPv4 Header */\n-struct ipv4_hdr {\n-\tuint8_t version_ihl;\t\t/**< version and header length */\n-\tuint8_t type_of_service;\t/**< type of service */\n-\tuint16_t total_length;\t\t/**< length of packet */\n-\tuint16_t packet_id;\t\t/**< packet ID */\n-\tuint16_t fragment_offset;\t/**< fragmentation offset */\n-\tuint8_t time_to_live;\t\t/**< time to live */\n-\tuint8_t next_proto_id;\t\t/**< protocol ID */\n-\tuint16_t hdr_checksum;\t\t/**< header checksum */\n-\tuint32_t src_addr;\t\t/**< source address */\n-\tuint32_t dst_addr;\t\t/**< destination address */\n-} __attribute__((__packed__));\n-\n /* Header lengths. */\n #define VLAN_HLEN 4\n #define VLAN_ETH_HLEN 18\n@@ -441,6 +440,14 @@ port_init(uint8_t port)\n \n \tif (port >= rte_eth_dev_count()) return -1;\n \n+\tif (enable_tx_csum == 0)\n+\t\trte_vhost_feature_disable(1ULL << VIRTIO_NET_F_CSUM);\n+\n+\tif (enable_tso == 0) {\n+\t\trte_vhost_feature_disable(1ULL << VIRTIO_NET_F_HOST_TSO4);\n+\t\trte_vhost_feature_disable(1ULL << VIRTIO_NET_F_HOST_TSO6);\n+\t}\n+\n \trx_rings = (uint16_t)dev_info.max_rx_queues;\n \t/* Configure ethernet device. */\n \tretval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);\n@@ -576,7 +583,9 @@ us_vhost_usage(const char *prgname)\n \t\"\t\t--rx-desc-num [0-N]: the number of descriptors on rx, \"\n \t\t\t\"used only when zero copy is enabled.\\n\"\n \t\"\t\t--tx-desc-num [0-N]: the number of descriptors on tx, \"\n-\t\t\t\"used only when zero copy is enabled.\\n\",\n+\t\t\t\"used only when zero copy is enabled.\\n\"\n+\t\"\t\t--tx-csum [0|1] disable/enable TX checksum offload.\\n\"\n+\t\"\t\t--tso [0|1] disable/enable TCP segement offload.\\n\",\n \t prgname);\n }\n \n@@ -602,6 +611,8 @@ us_vhost_parse_args(int argc, char **argv)\n \t\t{\"zero-copy\", required_argument, NULL, 0},\n \t\t{\"rx-desc-num\", required_argument, NULL, 0},\n \t\t{\"tx-desc-num\", required_argument, NULL, 0},\n+\t\t{\"tx-csum\", required_argument, NULL, 0},\n+\t\t{\"tso\", required_argument, NULL, 0},\n \t\t{NULL, 0, 0, 0},\n \t};\n \n@@ -656,6 +667,28 @@ us_vhost_parse_args(int argc, char **argv)\n \t\t\t\t}\n \t\t\t}\n \n+\t\t\t/* Enable/disable TX checksum offload. */\n+\t\t\tif (!strncmp(long_option[option_index].name, \"tx-csum\", MAX_LONG_OPT_SZ)) {\n+\t\t\t\tret = parse_num_opt(optarg, 1);\n+\t\t\t\tif (ret == -1) {\n+\t\t\t\t\tRTE_LOG(INFO, VHOST_CONFIG, \"Invalid argument for tx-csum [0|1]\\n\");\n+\t\t\t\t\tus_vhost_usage(prgname);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t} else\n+\t\t\t\t\tenable_tx_csum = ret;\n+\t\t\t}\n+\n+\t\t\t/* Enable/disable TSO offload. */\n+\t\t\tif (!strncmp(long_option[option_index].name, \"tso\", MAX_LONG_OPT_SZ)) {\n+\t\t\t\tret = parse_num_opt(optarg, 1);\n+\t\t\t\tif (ret == -1) {\n+\t\t\t\t\tRTE_LOG(INFO, VHOST_CONFIG, \"Invalid argument for tso [0|1]\\n\");\n+\t\t\t\t\tus_vhost_usage(prgname);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t} else\n+\t\t\t\t\tenable_tso = ret;\n+\t\t\t}\n+\n \t\t\t/* Specify the retries delay time (in useconds) on RX. */\n \t\t\tif (!strncmp(long_option[option_index].name, \"rx-retry-delay\", MAX_LONG_OPT_SZ)) {\n \t\t\t\tret = parse_num_opt(optarg, INT32_MAX);\n@@ -1114,6 +1147,63 @@ find_local_dest(struct virtio_net *dev, struct rte_mbuf *m,\n \treturn 0;\n }\n \n+static uint16_t\n+get_psd_sum(void *l3_hdr, uint64_t ol_flags)\n+{\n+\tif (ol_flags & PKT_TX_IPV4)\n+\t\treturn rte_ipv4_phdr_cksum(l3_hdr, ol_flags);\n+\telse /* assume ethertype == ETHER_TYPE_IPv6 */\n+\t\treturn rte_ipv6_phdr_cksum(l3_hdr, ol_flags);\n+}\n+\n+static void virtio_tx_offload(struct rte_mbuf *m)\n+{\n+\tvoid *l3_hdr;\n+\tstruct ipv4_hdr *ipv4_hdr = NULL;\n+\tstruct tcp_hdr *tcp_hdr = NULL;\n+\tstruct udp_hdr *udp_hdr = NULL;\n+\tstruct sctp_hdr *sctp_hdr = NULL;\n+\tstruct ether_hdr *eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);\n+\n+\tl3_hdr = (char *)eth_hdr + m->l2_len;\n+\n+\tif (m->ol_flags & PKT_TX_IPV4) {\n+\t\tipv4_hdr = (struct ipv4_hdr *)l3_hdr;\n+\t\tif (m->ol_flags & PKT_TX_IP_CKSUM)\n+\t\t\tipv4_hdr->hdr_checksum = 0;\n+\t}\n+\n+\tif (m->ol_flags & PKT_TX_L4_MASK) {\n+\t\tswitch (m->ol_flags & PKT_TX_L4_MASK) {\n+\t\tcase PKT_TX_TCP_CKSUM:\n+\t\t\ttcp_hdr = (struct tcp_hdr *)\n+\t\t\t\t\t((char *)l3_hdr + m->l3_len);\n+\t\t\ttcp_hdr->cksum = get_psd_sum(l3_hdr, m->ol_flags);\n+\t\t\tbreak;\n+\t\tcase PKT_TX_UDP_CKSUM:\n+\t\t\tudp_hdr = (struct udp_hdr *)\n+\t\t\t\t\t((char *)l3_hdr + m->l3_len);\n+\t\t\tudp_hdr->dgram_cksum = get_psd_sum(l3_hdr, m->ol_flags);\n+\t\t\tbreak;\n+\t\tcase PKT_TX_SCTP_CKSUM:\n+\t\t\tsctp_hdr = (struct sctp_hdr *)\n+\t\t\t\t\t((char *)l3_hdr + m->l3_len);\n+\t\t\tsctp_hdr->cksum = 0;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (m->tso_segsz != 0) {\n+\t\tipv4_hdr = (struct ipv4_hdr *)l3_hdr;\n+\t\ttcp_hdr = (struct tcp_hdr *)((char *)l3_hdr + m->l3_len);\n+\t\tm->ol_flags |= PKT_TX_IP_CKSUM;\n+\t\tipv4_hdr->hdr_checksum = 0;\n+\t\ttcp_hdr->cksum = get_psd_sum(l3_hdr, m->ol_flags);\n+\t}\n+}\n+\n /*\n * This function routes the TX packet to the correct interface. This may be a local device\n * or the physical port.\n@@ -1156,7 +1246,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)\n \t\t\t(vh->vlan_tci != vlan_tag_be))\n \t\t\tvh->vlan_tci = vlan_tag_be;\n \t} else {\n-\t\tm->ol_flags = PKT_TX_VLAN_PKT;\n+\t\tm->ol_flags |= PKT_TX_VLAN_PKT;\n \n \t\t/*\n \t\t * Find the right seg to adjust the data len when offset is\n@@ -1180,6 +1270,10 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)\n \t\tm->vlan_tci = vlan_tag;\n \t}\n \n+\tif ((m->ol_flags & VIRTIO_TX_CKSUM_OFFLOAD_MASK) ||\n+\t\t(m->ol_flags & PKT_TX_TCP_SEG))\n+\t\tvirtio_tx_offload(m);\n+\n \ttx_q->m_table[len] = m;\n \tlen++;\n \tif (enable_stats) {\n@@ -1841,7 +1935,7 @@ virtio_tx_route_zcp(struct virtio_net *dev, struct rte_mbuf *m,\n \t\tmbuf->buf_physaddr = m->buf_physaddr;\n \t\tmbuf->buf_addr = m->buf_addr;\n \t}\n-\tmbuf->ol_flags = PKT_TX_VLAN_PKT;\n+\tmbuf->ol_flags |= PKT_TX_VLAN_PKT;\n \tmbuf->vlan_tci = vlan_tag;\n \tmbuf->l2_len = sizeof(struct ether_hdr);\n \tmbuf->l3_len = sizeof(struct ipv4_hdr);\n", "prefixes": [ "dpdk-dev", "v2", "8/9" ] }