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 D8C3AA0093 for ; Tue, 19 May 2020 15:12:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB03C1D8C9; Tue, 19 May 2020 15:12:38 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 7A76B1D738 for ; Tue, 19 May 2020 15:12:37 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id u188so3529116wmu.1 for ; Tue, 19 May 2020 06:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jTcfJFj/KnfjdDFhwEE4iuSRfNXrB1deT9XaTUkF/xg=; b=GMo83+3W0bB43ZzcHK8h46bv1btXSwV6kRobpA3Mv/ta4qiimW/nsJxfX1DQlu7Ycp Ov4bXgvjTyfjM86ZcnQe8MBRtI9jydh8wBfqhcLR25w59a0odcAadgdrPvIV1F5P3Kz8 L3FNkI8pU8zPskxIRvFrYKehm6PowWV2nJQPFDKXdajUBDumoPyzDzBq5W6ptevzjrlw Uw/fAMBvkSzIC1ZgxGNlYFf9+oZ7rvKpjQzTCAS6rlwJmrz7tNsjAJAgjg6ykiINU7Gn U+GUxU3cinODrGCmJUClC/2RjmLjDV+0zf2OHsy28R9Mymwk6ga5KnSimWbSNYeuz09w tJHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jTcfJFj/KnfjdDFhwEE4iuSRfNXrB1deT9XaTUkF/xg=; b=U498D2Oc2Zz+w50ZZ+59B1xXfdLhTS1TvxmsnWK5amSCafGR3QYpLze6qm2o5lQf+h Bi6KDxGhCOiGKDIXCsQSJBu4h+17AJn5Jzt7KzrtawXescqwKUaBWIxFfR+whsXZcgso 59MvPPUhNc8UXj6WdN7ojC/6y0zd/UdTGqk3lxxn0IiUFKihk38XyQ2Wges0NZQRrrfJ UVZBoDwI2SepqWweIu2drEPDwy5VVwxbHaF1wtkWAq3rfMV9WmNl+ZFBZNU7Qs8/wslj nO0ntKGgK0FmDxQ6bjntHHYKPhJC+kEfYGIC+kGUAevTDHz44qKVzeOOSuc8Yxpyg9RV MA5A== X-Gm-Message-State: AOAM531LHqBEro2T3bBAlXSwOLF9KZE3Queq5/O0/Xz5BCEq6VgPCJ01 SzgcJSUzoye6kI666rm88qU= X-Google-Smtp-Source: ABdhPJwo8oo2BADa0zhunBFFUlvri06PjiEtOwOFEMqvZuqYdECpNaECGE1XxUZaCYQQ3T74n2i33g== X-Received: by 2002:a05:600c:2055:: with SMTP id p21mr5608029wmg.127.1589893957248; Tue, 19 May 2020 06:12:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m82sm4109977wmf.3.2020.05.19.06.12.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:12:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Ori Kam , Bernard Iremonger , dpdk stable Date: Tue, 19 May 2020 14:04:23 +0100 Message-Id: <20200519130549.112823-128-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' has been queued to stable release 19.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From aecc7782a68c56948d8173f44a2c388d6c1a4240 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Thu, 23 Apr 2020 12:05:26 +0300 Subject: [PATCH] app/testpmd: add parsing for QinQ VLAN headers [ upstream commit f16d377150a0ab406d1e845ae1c96a4519f9c0ee ] When having QinQ VLAN headers in the packet, parse_ethernet is capable of parsing only the first VLAN. Add parsing for QinQ VLAN headers in the packet. Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine") Signed-off-by: Raslan Darawsheh Acked-by: Ori Kam Acked-by: Bernard Iremonger --- app/test-pmd/csumonly.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 25091de881..7b92ab1195 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -139,22 +139,23 @@ parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info) /* * Parse an ethernet header to fill the ethertype, l2_len, l3_len and - * ipproto. This function is able to recognize IPv4/IPv6 with one optional vlan - * header. The l4_len argument is only set in case of TCP (useful for TSO). + * ipproto. This function is able to recognize IPv4/IPv6 with optional VLAN + * headers. The l4_len argument is only set in case of TCP (useful for TSO). */ static void parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info) { struct rte_ipv4_hdr *ipv4_hdr; struct rte_ipv6_hdr *ipv6_hdr; + struct rte_vlan_hdr *vlan_hdr; info->l2_len = sizeof(struct rte_ether_hdr); info->ethertype = eth_hdr->ether_type; - if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) { - struct rte_vlan_hdr *vlan_hdr = ( - struct rte_vlan_hdr *)(eth_hdr + 1); - + while (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN) || + info->ethertype == _htons(RTE_ETHER_TYPE_QINQ)) { + vlan_hdr = (struct rte_vlan_hdr *) + ((char *)eth_hdr + info->l2_len); info->l2_len += sizeof(struct rte_vlan_hdr); info->ethertype = vlan_hdr->eth_proto; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:49.696266225 +0100 +++ 0128-app-testpmd-add-parsing-for-QinQ-VLAN-headers.patch 2020-05-19 14:04:44.440652433 +0100 @@ -1,15 +1,16 @@ -From f16d377150a0ab406d1e845ae1c96a4519f9c0ee Mon Sep 17 00:00:00 2001 +From aecc7782a68c56948d8173f44a2c388d6c1a4240 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Thu, 23 Apr 2020 12:05:26 +0300 Subject: [PATCH] app/testpmd: add parsing for QinQ VLAN headers +[ upstream commit f16d377150a0ab406d1e845ae1c96a4519f9c0ee ] + When having QinQ VLAN headers in the packet, parse_ethernet is capable of parsing only the first VLAN. Add parsing for QinQ VLAN headers in the packet. Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine") -Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Acked-by: Ori Kam @@ -19,7 +20,7 @@ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c -index fe19615b14..8626223793 100644 +index 25091de881..7b92ab1195 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -139,22 +139,23 @@ parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)