From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 18B7DA00E6 for ; Wed, 10 Jul 2019 16:17:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 08BF72BF4; Wed, 10 Jul 2019 16:17:11 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id EEE42A3 for ; Wed, 10 Jul 2019 16:17:08 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 07:17:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,474,1557212400"; d="scan'208";a="186148859" Received: from sivswdev08.ir.intel.com ([10.237.217.47]) by fmsmga001.fm.intel.com with ESMTP; 10 Jul 2019 07:17:07 -0700 From: Konstantin Ananyev To: dev@dpdk.org Cc: Konstantin Ananyev Date: Wed, 10 Jul 2019 15:16:59 +0100 Message-Id: <20190710141659.23964-1-konstantin.ananyev@intel.com> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-dev] [PATCH] examples/ip_fragmentation: fix fail to send un-fragmented packets X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" With latest changes l3fwd_simple_forward() blindly set (PKT_TX_IPV4 | PKT_TX_IP_CKSUM) ol_flags for all IPv4 packets. Though for un-fragmented packets we also do have to set l3_len to make HW IP cksum offload to work properly. That causes HWi/PMD to drop or generate invalid packets. Though for un-fragmented packets we don't need to regenerate IPv4 cksum, as L3 header is not modified. Fix by setting ol_flags only when required. Another small fix - don't set IPv4/IPV6 ether type for unknown packet types. Fixes: 16863bbb4a41 ("examples/ip_fragmentation: enable IP checksum offload") Signed-off-by: Konstantin Ananyev --- examples/ip_fragmentation/main.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index ccaf23ff0..b6a1cf9e5 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -242,16 +242,21 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, { struct rx_queue *rxq; uint32_t i, len, next_hop; - uint8_t ipv6; - uint16_t port_out; + uint16_t port_out, ether_type; int32_t len2; + uint64_t ol_flags; + const struct rte_ether_hdr *eth; - ipv6 = 0; + ol_flags = 0; rxq = &qconf->rx_queue_list[queueid]; /* by default, send everything back to the source port */ port_out = port_in; + /* save ether type of the incoming packet */ + eth = rte_pktmbuf_mtod(m, const struct rte_ether_hdr *); + ether_type = eth->ether_type; + /* Remove the Ethernet header and trailer from the input packet */ rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr)); @@ -289,6 +294,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, /* Free input packet */ rte_pktmbuf_free(m); + /* request HW to regenerate IPv4 cksum */ + ol_flags |= (PKT_TX_IPV4 | PKT_TX_IP_CKSUM); + /* If we fail to fragment the packet */ if (unlikely (len2 < 0)) return; @@ -297,8 +305,6 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, /* if this is an IPv6 packet */ struct rte_ipv6_hdr *ip_hdr; - ipv6 = 1; - /* Read the lookup key (i.e. ip_dst) from the input packet */ ip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *); @@ -348,23 +354,18 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, rte_panic("No headroom in mbuf.\n"); } + m->ol_flags |= ol_flags; m->l2_len = sizeof(struct rte_ether_hdr); /* 02:00:00:00:00:xx */ d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; - *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)port_out << 40); + *((uint64_t *)d_addr_bytes) = 0x000000000002 + + ((uint64_t)port_out << 40); /* src addr */ rte_ether_addr_copy(&ports_eth_addr[port_out], ð_hdr->s_addr); - if (ipv6) { - eth_hdr->ether_type = - rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6); - } else { - eth_hdr->ether_type = - rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); - m->ol_flags |= (PKT_TX_IPV4 | PKT_TX_IP_CKSUM); - } + eth_hdr->ether_type = ether_type; } len += len2; -- 2.17.1