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 B600FA04A4 for ; Wed, 27 May 2020 11:24:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5BC751D654; Wed, 27 May 2020 11:24:57 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 2DC0A1D651 for ; Wed, 27 May 2020 11:24:55 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id v19so2379640wmj.0 for ; Wed, 27 May 2020 02:24:55 -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=MeZLYlbi3pkLM0UptcmSnNjYzhJHlzU/bQTXNR5apug=; b=uEGVgn46RsVTh8oFCdaoldOEqjY6QY94cHypbQQnNkCfbGGcyVhRrgh8AJzg4P/DAb fr2vqbmJE1j2EEHnPHpybwMr33Rz6+55nwH5RNpcXj+gYnL+tDm5b86gErMt2ggaI0Pi YAVYgtF+M7dm7U5bsIYwjYE5k455wxZccKvHWbFyOt8L/bTMpLNZtNq1UhCqZECVYcIp P0wunNFbmBE3KQbEDduUDa3k241EeP0eIqPCoocfVnWp0700q0P8wVAQ8c5z3/cAfC01 z1AT0/upc04cp58nIOI9yds1JOwHZPKYOKgye4yRMKibY6dQrJPTEY+O9S8kR/gX/reu mpnw== 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=MeZLYlbi3pkLM0UptcmSnNjYzhJHlzU/bQTXNR5apug=; b=XIkvoqVoxCEtwYguRHK355MCTa7zDbdlisa637u9/9edjAaMvXlNnvQv4UYZzqf38y X5pUq42bJtru5e5q4i3gsNvq1y7ogBYrpGjSoxRJ1YfjZn8VyCmOt6/pTJIKnTHHD64H g88jj9WLDwQ1o3/PDXfUw5glQ6kDGh785BeV4r+u1K9niXLeAhk4rJN9wSo7DCPTLS6s erHlKjLBWOXndflqQRu2VXXM3iSxHK/A45gUAEX31iVvTyhUlV+qYqbZQwwL1q/SpDlc Xoi3U4gj0GcUKaY26Rigx37sYuiW9JlRGkYio+jqjJYvzY+fxc3VC9AwHZdvbEQOYAPk mJDw== X-Gm-Message-State: AOAM532C3RmkNC0nGqbOyvn4kFZ1UrxyrQ7VX52NKhX32L2HVHEAfzzU AZOhya0LlA3f8frBRqAzXHg= X-Google-Smtp-Source: ABdhPJzPjOeF/E3lmIu1A9yFm2v/WO5URKSbW4CMwq9Tl3aaVM4LulmE8+2AY/aDPdfalj36ulDptw== X-Received: by 2002:a1c:720d:: with SMTP id n13mr3363501wmc.130.1590571494902; Wed, 27 May 2020 02:24:54 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n7sm2242396wrx.82.2020.05.27.02.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Jeff Guo Cc: Qi Zhang , dpdk stable Date: Wed, 27 May 2020 10:24:13 +0100 Message-Id: <20200527092422.258652-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix setting L2TAG' 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/29/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 b7a08ea7cd62e57220cad5c8ae0b3cacaaa33124 Mon Sep 17 00:00:00 2001 From: Jeff Guo Date: Wed, 20 May 2020 17:25:21 -0400 Subject: [PATCH] net/i40e: fix setting L2TAG [ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ] Base on HW, if a packet is split into multiple segments, the L2TAG should only be valid on the last Rx descriptor. So fix it by setting L2TAG into mbuf when processing the last split packet. Fixes: ca74903b75cf ("net/i40e: extract non-x86 specific code from vector driver") Signed-off-by: Jeff Guo Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx_vec_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h index 0e6ffa0078..31f73f6054 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_common.h +++ b/drivers/net/i40e/i40e_rxtx_vec_common.h @@ -33,6 +33,7 @@ reassemble_packets(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_bufs, if (!split_flags[buf_idx]) { /* it's the last packet of the set */ start->hash = end->hash; + start->vlan_tci = end->vlan_tci; start->ol_flags = end->ol_flags; /* we need to strip crc for the whole packet */ start->pkt_len -= rxq->crc_len; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.989410111 +0100 +++ 0010-net-i40e-fix-setting-L2TAG.patch 2020-05-27 10:23:31.639933832 +0100 @@ -1,14 +1,15 @@ -From 61b26a9c5ae569ce5900414a41a42c41d069155c Mon Sep 17 00:00:00 2001 +From b7a08ea7cd62e57220cad5c8ae0b3cacaaa33124 Mon Sep 17 00:00:00 2001 From: Jeff Guo Date: Wed, 20 May 2020 17:25:21 -0400 Subject: [PATCH] net/i40e: fix setting L2TAG +[ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ] + Base on HW, if a packet is split into multiple segments, the L2TAG should only be valid on the last Rx descriptor. So fix it by setting L2TAG into mbuf when processing the last split packet. Fixes: ca74903b75cf ("net/i40e: extract non-x86 specific code from vector driver") -Cc: stable@dpdk.org Signed-off-by: Jeff Guo Acked-by: Qi Zhang