From patchwork Fri Mar 25 07:58:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanhan Liu X-Patchwork-Id: 11718 X-Patchwork-Delegate: thomas@monjalon.net 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 0A4C0532E; Fri, 25 Mar 2016 08:56:23 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 1F1C74CE7 for ; Fri, 25 Mar 2016 08:56:19 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP; 25 Mar 2016 00:56:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,389,1455004800"; d="scan'208";a="675414001" Received: from yliu-dev.sh.intel.com ([10.239.66.49]) by FMSMGA003.fm.intel.com with ESMTP; 25 Mar 2016 00:56:18 -0700 From: Yuanhan Liu To: dev@dpdk.org Cc: huawei.xie@intel.com, Thomas Monjalon , Ksiadz MarcinX , Yuanhan Liu Date: Fri, 25 Mar 2016 15:58:50 +0800 Message-Id: <1458892732-3885-3-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1458892732-3885-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1458885694-31111-1-git-send-email-yuanhan.liu@linux.intel.com> <1458892732-3885-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-dev] [PATCH v2 2/4] examples/vhost: remove unnecessary pseudo checksum calc 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" For checksum offloading only case, the TCP/IP stack would have calculated the pseudo checksum. Therefore, we don't need to re-calculate it again here; remove it. Signed-off-by: Yuanhan Liu --- examples/vhost/main.c | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index a45cddb..ceabbce 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -52,8 +52,6 @@ #include #include #include -#include -#include #include "main.h" @@ -1161,42 +1159,15 @@ static void virtio_tx_offload(struct rte_mbuf *m) void *l3_hdr; struct ipv4_hdr *ipv4_hdr = NULL; struct tcp_hdr *tcp_hdr = NULL; - struct udp_hdr *udp_hdr = NULL; - struct sctp_hdr *sctp_hdr = NULL; struct ether_hdr *eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); l3_hdr = (char *)eth_hdr + m->l2_len; - if (m->tso_segsz != 0) { - ipv4_hdr = (struct ipv4_hdr *)l3_hdr; - tcp_hdr = (struct tcp_hdr *)((char *)l3_hdr + m->l3_len); - m->ol_flags |= PKT_TX_IP_CKSUM; - ipv4_hdr->hdr_checksum = 0; - tcp_hdr->cksum = get_psd_sum(l3_hdr, m->ol_flags); - return; - } - - if (m->ol_flags & PKT_TX_L4_MASK) { - switch (m->ol_flags & PKT_TX_L4_MASK) { - case PKT_TX_TCP_CKSUM: - tcp_hdr = (struct tcp_hdr *) - ((char *)l3_hdr + m->l3_len); - tcp_hdr->cksum = get_psd_sum(l3_hdr, m->ol_flags); - break; - case PKT_TX_UDP_CKSUM: - udp_hdr = (struct udp_hdr *) - ((char *)l3_hdr + m->l3_len); - udp_hdr->dgram_cksum = get_psd_sum(l3_hdr, m->ol_flags); - break; - case PKT_TX_SCTP_CKSUM: - sctp_hdr = (struct sctp_hdr *) - ((char *)l3_hdr + m->l3_len); - sctp_hdr->cksum = 0; - break; - default: - break; - } - } + ipv4_hdr = (struct ipv4_hdr *)l3_hdr; + tcp_hdr = (struct tcp_hdr *)((char *)l3_hdr + m->l3_len); + m->ol_flags |= PKT_TX_IP_CKSUM; + ipv4_hdr->hdr_checksum = 0; + tcp_hdr->cksum = get_psd_sum(l3_hdr, m->ol_flags); } /* @@ -1265,7 +1236,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag) m->vlan_tci = vlan_tag; } - if ((m->ol_flags & PKT_TX_L4_MASK) || (m->ol_flags & PKT_TX_TCP_SEG)) + if (m->ol_flags & PKT_TX_TCP_SEG) virtio_tx_offload(m); tx_q->m_table[len] = m;