From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 4FD16C3B8 for ; Thu, 16 Apr 2015 05:56:26 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 15 Apr 2015 20:56:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,585,1422950400"; d="scan'208";a="709922016" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga002.fm.intel.com with ESMTP; 15 Apr 2015 20:56:25 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t3G3uNTa005245; Thu, 16 Apr 2015 11:56:23 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t3G3uJQO029179; Thu, 16 Apr 2015 11:56:21 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t3G3uJMT029175; Thu, 16 Apr 2015 11:56:19 +0800 From: Jijiang Liu To: dev@dpdk.org, walter.e.gilmore@intel.com, thomas.long@intel.com Date: Thu, 16 Apr 2015 11:55:57 +0800 Message-Id: <1429156558-28548-10-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1429156558-28548-1-git-send-email-jijiang.liu@intel.com> References: <1429156558-28548-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH RFC 09/10] examples/tep_termination:add TSO offload configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 03:56:27 -0000 If the 'tso-segsz' is not 0, which means TSO offload is enabled. Signed-off-by: Jijiang Liu --- examples/tep_termination/main.c | 19 +++++++++++++++++-- examples/tep_termination/vxlan.c | 4 ++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index 7c69a82..8ce78ee 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -122,6 +122,9 @@ uint16_t udp_port; /* enable/disable inner TX checksum */ uint8_t tx_checksum; +/* TSO segment size */ +uint16_t tso_segsz = 0; + /* RX filter type for tunneling packet */ uint8_t filter_idx; @@ -246,6 +249,7 @@ vep_termination_usage(const char *prgname) " --udp-port: UDP destination port for VXLAN packet\n" " --nb-devices: number of virtIO device\n" " --tx-checksum [0|1]: inner Tx checksum offload\n" + " --tso-segsz [0-N]: TSO segment size\n" " --filter-type[1-3]: filter type for tunneling packet\n" " 1: Inner MAC&VLAN and tenent ID\n" " 2: Inner MAC and tenent ID\n" @@ -271,6 +275,7 @@ tep_parse_args(int argc, char **argv) {"udp-port", required_argument, NULL, 0}, {"nb-devices", required_argument, NULL, 0}, {"tx-checksum", required_argument, NULL, 0}, + {"tso-segsz", required_argument, NULL, 0}, {"filter-type", required_argument, NULL, 0}, {"stats", required_argument, NULL, 0}, {"dev-basename", required_argument, NULL, 0}, @@ -301,6 +306,16 @@ tep_parse_args(int argc, char **argv) } else num_devices = ret; } + + if (!strncmp(long_option[option_index].name, "tso-segsz", MAX_LONG_OPT_SZ)) { + ret = parse_num_opt(optarg, INT16_MAX); + if (ret == -1) { + RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for TCP segment size [0-N]\n"); + vep_termination_usage(prgname); + return -1; + } else + tso_segsz = ret; + } if (!strncmp(long_option[option_index].name, "udp-port", MAX_LONG_OPT_SZ)) { ret = parse_num_opt(optarg, INT16_MAX); @@ -310,8 +325,8 @@ tep_parse_args(int argc, char **argv) return -1; } } - - if (!strncmp(long_option[option_index].name, "tx-checksum", MAX_LONG_OPT_SZ)) { + + if (!strncmp(long_option[option_index].name, "tx-checksum", MAX_LONG_OPT_SZ)) { ret = parse_num_opt(optarg, 1); if (ret == -1) { RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tx-checksum [0|1]\n"); diff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c index 6fc75ee..e3ef832 100644 --- a/examples/tep_termination/vxlan.c +++ b/examples/tep_termination/vxlan.c @@ -48,6 +48,7 @@ extern struct vxlan_conf vxdev; extern struct ipv4_hdr app_ip_hdr[VXLAN_N_PORTS]; extern struct ether_hdr app_l2_hdr[VXLAN_N_PORTS]; extern uint16_t udp_port; +extern uint16_t tso_segsz; static uint16_t get_psd_sum(void *l3_hdr, uint16_t ethertype, uint64_t ol_flags) @@ -149,6 +150,8 @@ process_inner_cksums(struct ether_hdr *eth_hdr, struct offload_info *info) ol_flags |= PKT_TX_TCP_CKSUM; tcp_hdr->cksum = get_psd_sum(l3_hdr, info->ethertype, ol_flags); + if (tso_segsz != 0) + ol_flags |= PKT_TX_TCP_SEG; } else if (info->l4_proto == IPPROTO_SCTP) { sctp_hdr = (struct sctp_hdr *)((char *)l3_hdr + info->l3_len); @@ -219,6 +222,7 @@ int encapsulation(struct rte_mbuf *m, uint8_t vport_id) m->outer_l3_len = sizeof(struct ipv4_hdr); m->ol_flags |= ol_flags; + m->tso_segsz = tso_segsz; /*VXLAN HEADER*/ vxlan->vx_flags = VXLAN_FLAGS; -- 1.7.7.6