From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id DB420F64 for ; Mon, 30 Apr 2018 18:29:12 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id o78so15261186wmg.0 for ; Mon, 30 Apr 2018 09:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=3Y+hKnmD0whsEv6GZclq94ed7H7GniFN7fx6ktHRNMI=; b=g98+8yHLtHfgNddudj5KCve5u4MeLYbYphLDhlSC3SLeEz7R+zuWFy0czdwktJIqd6 s5CJVSdBsXaszot0A8JqP14mp7iyUESZfopccTroM3AMAUe210RyxFGlio1LmEOG1dFt NQ16sD9ayJGhrXcJgbZfA2s17768N2rZ9MOripDOaBVH6Utb69pwOIEXA/Xc3d/AFJaA kdjU42YQVt7exjMxw5scWxrctXCjVsBu9Jg3UJcKJReNBW3gLZ60cIY1HVaSn4vCZ1Zg 3UhvWF04zzNxH0HFIO5OIQUxS/aOHZuDjL948MmQANU5Wfkit8RiUmit9Fx/WN0NKD3b dzRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3Y+hKnmD0whsEv6GZclq94ed7H7GniFN7fx6ktHRNMI=; b=hYc1EHq2ZaBdetsy7baIFIcn8xAPjVYgibtpizWBWWxRK5Pswq1/Kq/SmrV6pe/K8d sqN2DrFRIuF+zlksK1NtKAZYu7QOENYpgw6p9QACuOyMHyQ0IdI1isuJcGNZLGR/Fxnt cxEXEmdrEvGqLLlhG+42e81Zb7UeqSOoBoxD415rTSEa/HANsOV3EyGEwh/uoCwHpxn3 PyxdF9swIJtbpA3xqD/0igq7kpx8Mrzx8+2xhi77yrzqAt3snn0L6vK5/3uoLVxIwBb6 bJsgVZMZEmQkcQQyoR7Ifg5VnjQjP+noSKtvOXv6JnkQUqf0xXXPVBzgZu4Rx6BVRgrL XJDQ== X-Gm-Message-State: ALQs6tAFiSYUW9MziOwrCkgW7ioha+rnrVw8Jl/4QofVwGsr6leEBt6E M1HF26VK+FnXC5dTFsXtTGDzncf1 X-Google-Smtp-Source: AB8JxZrsShKxMs8mrJJi905w4J1fWwDrFhhKFuKBUuqXINZ1YpCsU7IhqFof3m8F0s+knUj4bXOwvQ== X-Received: by 10.28.99.85 with SMTP id x82mr3759971wmb.14.1525105752312; Mon, 30 Apr 2018 09:29:12 -0700 (PDT) Received: from pala.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id z5-v6sm8905974wrm.61.2018.04.30.09.29.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Apr 2018 09:29:11 -0700 (PDT) From: Didier Pallard To: stable@dpdk.org Date: Mon, 30 Apr 2018 18:28:29 +0200 Message-Id: <20180430162829.11029-2-didier.pallard@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180430162829.11029-1-didier.pallard@6wind.com> References: <20180430162829.11029-1-didier.pallard@6wind.com> Subject: [dpdk-stable] [18.02 2/2] net/vmxnet3: fix Rx offload information in multiseg packets X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2018 16:29:13 -0000 [ backported from upstream commit d08e3c90d4e0a37618a5174c712dee1bf3cb73a3 ] In case we are working on a multisegment buffer, most bit are set in last segment of the buffer. Correctly look at those bits in eop part of the rx_offload function. Fixes: 2fdd835f992c ("vmxnet3: support jumbo frames") Cc: stable@dpdk.org Signed-off-by: Didier Pallard Acked-by: Yong Wang --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 23b69cce1029..c08d957fb093 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -656,12 +656,19 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd, /* Offloads set in sop */ if (sop) { + } else { /* Offloads set in eop */ /* Check for RSS */ if (rcd->rssType != VMXNET3_RCD_RSS_TYPE_NONE) { rxm->ol_flags |= PKT_RX_RSS_HASH; rxm->hash.rss = rcd->rssHash; } + /* Check for hardware stripped VLAN tag */ + if (rcd->ts) { + rxm->ol_flags |= (PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED); + rxm->vlan_tci = rte_le_to_cpu_16((uint16_t)rcd->tci); + } + /* Check packet type, checksum errors. Only IPv4 for now. */ if (rcd->v4) { struct ether_hdr *eth = rte_pktmbuf_mtod(rxm, struct ether_hdr *); @@ -682,12 +689,6 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd, } else { rxm->packet_type = RTE_PTYPE_UNKNOWN; } - } else { /* Offloads set in eop */ - /* Check for hardware stripped VLAN tag */ - if (rcd->ts) { - rxm->ol_flags |= (PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED); - rxm->vlan_tci = rte_le_to_cpu_16((uint16_t)rcd->tci); - } } } -- 2.11.0