From patchwork Fri May 29 07:39:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jijiang Liu X-Patchwork-Id: 4950 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A6048C35C; Fri, 29 May 2015 09:40:19 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 6AB30C34C for ; Fri, 29 May 2015 09:40:16 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 29 May 2015 00:40:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,515,1427785200"; d="scan'208";a="737229303" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga002.jf.intel.com with ESMTP; 29 May 2015 00:40:14 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t4T7eCF9014261; Fri, 29 May 2015 15:40:12 +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 t4T7e8Oe019768; Fri, 29 May 2015 15:40:10 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t4T7e8tm019764; Fri, 29 May 2015 15:40:08 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Fri, 29 May 2015 15:39:47 +0800 Message-Id: <1432885189-19669-9-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1432885189-19669-1-git-send-email-jijiang.liu@intel.com> References: <1432885189-19669-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH v2 08/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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If the 'tso-segsz' is not 0, which means TSO offload is enabled. Signed-off-by: Jijiang Liu --- examples/tep_termination/main.c | 17 +++++++++++++++++ examples/tep_termination/vxlan.c | 8 ++++++++ examples/tep_termination/vxlan.h | 1 + examples/tep_termination/vxlan_setup.c | 8 ++++++++ 4 files changed, 34 insertions(+), 0 deletions(-) diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index 5e391c3..995fd2a 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -111,6 +111,7 @@ #define CMD_LINE_OPT_NB_DEVICES "nb-devices" #define CMD_LINE_OPT_UDP_PORT "udp-port" #define CMD_LINE_OPT_TX_CHECKSUM "tx-checksum" +#define CMD_LINE_OPT_TSO_SEGSZ "tso-segsz" #define CMD_LINE_OPT_FILTER_TYPE "filter-type" #define CMD_LINE_OPT_RX_RETRY "rx-retry" #define CMD_LINE_OPT_RX_RETRY_DELAY "rx-retry-delay" @@ -142,6 +143,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; @@ -270,6 +274,7 @@ tep_termination_usage(const char *prgname) " --udp-port: UDP destination port for VXLAN packet\n" " --nb-devices[1-64]: The 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" @@ -300,6 +305,7 @@ tep_termination_parse_args(int argc, char **argv) {CMD_LINE_OPT_NB_DEVICES, required_argument, NULL, 0}, {CMD_LINE_OPT_UDP_PORT, required_argument, NULL, 0}, {CMD_LINE_OPT_TX_CHECKSUM, required_argument, NULL, 0}, + {CMD_LINE_OPT_TSO_SEGSZ, required_argument, NULL, 0}, {CMD_LINE_OPT_FILTER_TYPE, required_argument, NULL, 0}, {CMD_LINE_OPT_RX_RETRY, required_argument, NULL, 0}, {CMD_LINE_OPT_RX_RETRY_DELAY, required_argument, NULL, 0}, @@ -347,6 +353,17 @@ tep_termination_parse_args(int argc, char **argv) enable_retry = ret; } + if (!strncmp(long_option[option_index].name, CMD_LINE_OPT_TSO_SEGSZ, + sizeof(CMD_LINE_OPT_TSO_SEGSZ))) { + ret = parse_num_opt(optarg, INT16_MAX); + if (ret == -1) { + RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for TCP segment size [0-N]\n"); + tep_termination_usage(prgname); + return -1; + } else + tso_segsz = ret; + } + if (!strncmp(long_option[option_index].name, CMD_LINE_OPT_UDP_PORT, sizeof(CMD_LINE_OPT_UDP_PORT))) { ret = parse_num_opt(optarg, INT16_MAX); diff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c index 786281c..6d44a97 100644 --- a/examples/tep_termination/vxlan.c +++ b/examples/tep_termination/vxlan.c @@ -47,6 +47,7 @@ extern uint8_t tx_checksum; 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 tso_segsz; /* We cannot use rte_cpu_to_be_16() on a constant in a switch/case */ #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN @@ -156,6 +157,11 @@ process_inner_cksums(struct ether_hdr *eth_hdr, union tunnel_offload_info *info) ol_flags |= PKT_TX_TCP_CKSUM; tcp_hdr->cksum = get_psd_sum(l3_hdr, ethertype, ol_flags); + if (tso_segsz != 0) { + ol_flags |= PKT_TX_TCP_SEG; + info->tso_segsz = tso_segsz; + info->l4_len = sizeof(struct tcp_hdr); + } } else if (l4_proto == IPPROTO_SCTP) { sctp_hdr = (struct sctp_hdr *)((char *)l3_hdr + info->l3_len); @@ -228,6 +234,7 @@ encapsulation(struct rte_mbuf *m, uint8_t vport_id) ol_flags |= process_inner_cksums(phdr, &tx_offload); m->l2_len = tx_offload.l2_len; m->l3_len = tx_offload.l3_len; + m->l4_len = tx_offload.l4_len; m->l2_len += ETHER_VXLAN_HLEN; } @@ -235,6 +242,7 @@ 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 = tx_offload.tso_segsz; /*VXLAN HEADER*/ vxlan->vx_flags = rte_cpu_to_be_32(VXLAN_HF_VNI); diff --git a/examples/tep_termination/vxlan.h b/examples/tep_termination/vxlan.h index f000b93..dfe7063 100644 --- a/examples/tep_termination/vxlan.h +++ b/examples/tep_termination/vxlan.h @@ -64,6 +64,7 @@ union tunnel_offload_info { uint64_t l2_len:7; /**< L2 (MAC) Header Length. */ uint64_t l3_len:9; /**< L3 (IP) Header Length. */ uint64_t l4_len:8; /**< L4 Header Length. */ + uint64_t tso_segsz:16; /**< TCP TSO segment size */ uint64_t outer_l2_len:7; /**< outer L2 Header Length */ uint64_t outer_l3_len:16; /**< outer L3 Header Length */ }; diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c index 7d42b77..528b74a 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -81,6 +81,7 @@ extern uint16_t num_devices; extern uint16_t udp_port; extern uint8_t ports[RTE_MAX_ETHPORTS]; extern uint8_t filter_idx; +extern uint16_t tso_segsz; /* ethernet addresses of ports */ extern struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; @@ -218,6 +219,13 @@ vxlan_port_init(uint8_t port, struct rte_mempool *mbuf_pool) ports_eth_addr[port].addr_bytes[4], ports_eth_addr[port].addr_bytes[5]); + if (tso_segsz != 0) { + struct rte_eth_dev_info dev_info; + rte_eth_dev_info_get(port, &dev_info); + if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) == 0) + RTE_LOG(INFO, PORT, "hardware TSO offload is" + " not supported\n"); + } return 0; }