From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 555A4C6FA for ; Mon, 22 Jun 2015 18:41:32 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 22 Jun 2015 09:41:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,660,1427785200"; d="scan'208";a="592638531" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga003.jf.intel.com with ESMTP; 22 Jun 2015 09:41:31 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t5MGfTmK005648; Tue, 23 Jun 2015 00:41:29 +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 t5MGfQnE020477; Tue, 23 Jun 2015 00:41:28 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t5MGfQms020473; Tue, 23 Jun 2015 00:41:26 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Tue, 23 Jun 2015 00:41:03 +0800 Message-Id: <1434991265-20384-9-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1434991265-20384-1-git-send-email-jijiang.liu@intel.com> References: <1434991265-20384-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH v5 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: , X-List-Received-Date: Mon, 22 Jun 2015 16:41:33 -0000 Add the tso-segsz option for TSO offload. If the 'tso-segsz' is not 0, it means TSO offload is enabled. Signed-off-by: Jijiang Liu --- examples/tep_termination/main.c | 19 +++++++++++++++++++ examples/tep_termination/vxlan.c | 7 +++++++ examples/tep_termination/vxlan.h | 2 ++ examples/tep_termination/vxlan_setup.c | 7 +++++++ 4 files changed, 35 insertions(+), 0 deletions(-) diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index 2c3bc9d..7b8246c 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -114,6 +114,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" @@ -145,6 +146,9 @@ uint16_t udp_port; /* enable/disable inner TX checksum */ uint8_t tx_checksum; +/* TCP segment size */ +uint16_t tso_segsz = 0; + /* RX filter type for tunneling packet */ uint8_t filter_idx = 1; @@ -275,6 +279,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]: TCP segment size\n" " --filter-type[1-3]: filter type for tunneling packet\n" " 1: Inner MAC and tenent ID\n" " 2: Inner MAC and VLAN, and tenent ID\n" @@ -305,6 +310,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}, @@ -358,6 +364,19 @@ tep_termination_parse_args(int argc, char **argv) } 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 34851d8..b2a2f53 100644 --- a/examples/tep_termination/vxlan.c +++ b/examples/tep_termination/vxlan.c @@ -144,6 +144,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); @@ -226,6 +231,7 @@ encapsulation(struct rte_mbuf *m, uint8_t queue_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; } @@ -233,6 +239,7 @@ encapsulation(struct rte_mbuf *m, uint8_t queue_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 090eb48..4242e11 100644 --- a/examples/tep_termination/vxlan.h +++ b/examples/tep_termination/vxlan.h @@ -48,6 +48,7 @@ extern struct ipv4_hdr app_ip_hdr[VXLAN_N_PORTS]; extern struct ether_hdr app_l2_hdr[VXLAN_N_PORTS]; extern uint8_t tx_checksum; +extern uint16_t tso_segsz; struct vxlan_port { uint32_t vport_id; /**< VirtIO port id */ @@ -73,6 +74,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 942fc06..a1cd218 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -205,6 +205,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(WARNING, PORT, + "hardware TSO offload is not supported\n"); + } return 0; } -- 1.7.7.6