From patchwork Thu Nov 27 17:03:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jijiang Liu X-Patchwork-Id: 1666 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 D7C288037; Thu, 27 Nov 2014 18:03:32 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id AFBDF8036 for ; Thu, 27 Nov 2014 18:03:30 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 27 Nov 2014 08:56:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="422360485" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by FMSMGA003.fm.intel.com with ESMTP; 27 Nov 2014 08:53:35 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id sARH3ROS012548; Fri, 28 Nov 2014 01:03:27 +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 sARH3PQH009586; Fri, 28 Nov 2014 01:03:27 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id sARH3PUR009582; Fri, 28 Nov 2014 01:03:25 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Fri, 28 Nov 2014 01:03:18 +0800 Message-Id: <1417107801-9544-2-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1417107801-9544-1-git-send-email-jijiang.liu@intel.com> References: <1417107801-9544-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH v3 1/4] mbuf:add three TX offload flags and change three fields 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" In place of removing the PKT_TX_VXLAN_CKSUM, we introduce 3 new flags: PKT_TX_OUTER_IP_CKSUM, PKT_TX_OUTER_IPV6 and PKT_TX_UDP_TUNNEL_PKT, and a new field: l4_tun_len. Replace the inner_l2_len and the inner_l3_len field with the outer_l2_len and outer_l3_len field. PKT_TX_OUTER_IP_CKSUM: is not used for non-tunnelling packet;hardware outer checksum for tunnelling packet. PKT_TX_OUTER_IPV6: Tell the NIC it's an outer IPv6 packet for tunneling packet. PKT_TX_UDP_TUNNEL_PKT: is used to tell PMD that the transmit packet is a UDP tunneling packet. l4_tun_len: for VXLAN packet, it should be udp header length plus VXLAN header length. Signed-off-by: Jijiang Liu --- lib/librte_mbuf/rte_mbuf.c | 6 +++++- lib/librte_mbuf/rte_mbuf.h | 18 +++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 87c2963..3c47477 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -240,7 +240,11 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask) case PKT_TX_SCTP_CKSUM: return "PKT_TX_SCTP_CKSUM"; case PKT_TX_UDP_CKSUM: return "PKT_TX_UDP_CKSUM"; case PKT_TX_IEEE1588_TMST: return "PKT_TX_IEEE1588_TMST"; - case PKT_TX_VXLAN_CKSUM: return "PKT_TX_VXLAN_CKSUM"; + case PKT_TX_UDP_TUNNEL_PKT: return "PKT_TX_UDP_TUNNEL_PKT"; + case PKT_TX_IPV4: return "PKT_TX_IPV4"; + case PKT_TX_IPV6: return "PKT_TX_IPV6"; + case PKT_TX_OUTER_IP_CKSUM: return "PKT_TX_OUTER_IP_CKSUM"; + case PKT_TX_OUTER_IPV6: return "PKT_TX_OUTER_IPV6"; case PKT_TX_TCP_SEG: return "PKT_TX_TCP_SEG"; default: return NULL; } diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 367fc56..22ee555 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -99,10 +99,9 @@ extern "C" { #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12) /**< RX tunnel packet with IPv6 header. */ #define PKT_RX_FDIR_ID (1ULL << 13) /**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14) /**< Flexible bytes reported if FDIR match. */ -/* add new RX flags here */ /* add new TX flags here */ -#define PKT_TX_VXLAN_CKSUM (1ULL << 50) /**< TX checksum of VXLAN computed by NIC */ +#define PKT_TX_UDP_TUNNEL_PKT (1ULL << 50) /**< TX packet is an UDP tunneling packet */ #define PKT_TX_IEEE1588_TMST (1ULL << 51) /**< TX IEEE1588 packet to timestamp. */ /** @@ -125,13 +124,19 @@ extern "C" { #define PKT_TX_IP_CKSUM (1ULL << 54) /**< IP cksum of TX pkt. computed by NIC. */ #define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ +#define PKT_TX_VLAN_PKT (1ULL << 55) /**< TX packet is a 802.1q VLAN packet. */ + /** Tell the NIC it's an IPv4 packet. Required for L4 checksum offload or TSO. */ #define PKT_TX_IPV4 PKT_RX_IPV4_HDR /** Tell the NIC it's an IPv6 packet. Required for L4 checksum offload or TSO. */ #define PKT_TX_IPV6 PKT_RX_IPV6_HDR -#define PKT_TX_VLAN_PKT (1ULL << 55) /**< TX packet is a 802.1q VLAN packet. */ +/** Outer IP cksum of TX pkt. computed by NIC for tunneling packet */ +#define PKT_TX_OUTER_IP_CKSUM (1ULL << 58) + +/** Tell the NIC it's an outer IPv6 packet for tunneling packet.*/ +#define PKT_TX_OUTER_IPV6 (1ULL << 59) /** * TCP segmentation offload. To enable this offload feature for a @@ -266,10 +271,9 @@ struct rte_mbuf { uint64_t tso_segsz:16; /**< TCP TSO segment size */ /* fields for TX offloading of tunnels */ - uint64_t inner_l3_len:9; /**< inner L3 (IP) Hdr Length. */ - uint64_t inner_l2_len:7; /**< inner L2 (MAC) Hdr Length. */ - - /* uint64_t unused:8; */ + uint64_t outer_l3_len:9; /**< outer L3 (IP) Hdr Length. */ + uint64_t outer_l2_len:7; /**< outer L2 (MAC) Hdr Length. */ + uint64_t l4_tun_len:8; /**< L4 tunnelling header length */ }; }; } __rte_cache_aligned;