From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2C7B7A0524 for ; Fri, 5 Feb 2021 12:22:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 274101606CE; Fri, 5 Feb 2021 12:22:39 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 88BB24067B for ; Fri, 5 Feb 2021 12:22:37 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id t142so3554648wmt.1 for ; Fri, 05 Feb 2021 03:22:37 -0800 (PST) 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=CObrbnhQqrllfCduZAtodZnYrMOF8PpK+2CRCIwBdE0=; b=TfXszK6tkTQs/sMypBDfVOkk822vAT5cxc08o9PVZTaHTf/YR0X/vIfLa+8JIlnQvE l3rcy0oh8AqSzL1bzVQqqr2AcLVd3xGWcMfnhoIl74eARGNjNP+zXICiDECvRaCdYZR2 Ajssz3NrWTQUOdm261GX8nvFPILUUABH+zdjIKDDes0vk18mQmwz8ox967lGxCCYtr5L zTaZG3Z+KNZeD0+Je1u6gc/w3X4BGXS/EoUTu5DAh67nTCUdIqXqLvMMeSqBwOTUdGLP 3qoIpq17P4NgbPkSe/H8cc7xzUgi6TQbnKQ01cIpatgvgunaid8E97WqNQqVtJBTLC81 0Bpg== 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=CObrbnhQqrllfCduZAtodZnYrMOF8PpK+2CRCIwBdE0=; b=U7kR2eassFuroWjD/gFGhQn+XCUyOPl9LUKA/I8+3Nue6WYtbeO1blZjvXSEI5DMvd Zy8mu13vGa1BPhEnduy9yo4We6J2OsmxkWwExEaVNc/1XQGZkz/ncxZvKaktv2de6X0h QMZM82g85Fceta62VgNqSdBqxjHcIfhnpXvIuSaAfHME755dmyb+inMCrxeEaG9H6oZi 5/HU2lKLTUCk5lpx3mE6mZTeUpC5UWKzJ0wBhVySyqtxva92MFAQmXwwTFoR/h2rDUBL gkPgxQUXAxakkWwBvN7yJqVTr87CRXTOgXwL214Kvu+Oxgot6Vqy328ruCyVV6ftAUnm 4bpA== X-Gm-Message-State: AOAM530hYZ2OQvuhq/iOR30mLKirZ1TE8U50h5JKui3DOSzKOmlV5BHJ BuEsgpXlFm9HStqDSHWheKAAyuiQ0YnhF7WY X-Google-Smtp-Source: ABdhPJxxuIMPh9DujQuWWz3Z7ZnHQisO2heMWtn6ZDE+q4fQadRLlFnIBujWKlHW5F/6SXA/YZmGfg== X-Received: by 2002:a05:600c:4f93:: with SMTP id n19mr3135879wmq.163.1612524157343; Fri, 05 Feb 2021 03:22:37 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c5sm11753257wrn.77.2021.02.05.03.22.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:22:36 -0800 (PST) From: luca.boccassi@gmail.com To: Souvik Dey Cc: Jeff Guo , dpdk stable Date: Fri, 5 Feb 2021 11:15:46 +0000 Message-Id: <20210205111920.1272063-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix VLAN stripping in VF' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b9b4af40296d5235615ada1d794991f69851d4b5 Thanks. Luca Boccassi --- >From b9b4af40296d5235615ada1d794991f69851d4b5 Mon Sep 17 00:00:00 2001 From: Souvik Dey Date: Tue, 15 Dec 2020 08:28:15 -0500 Subject: [PATCH] net/i40e: fix VLAN stripping in VF [ upstream commit 95ba3f72110c10dd51517d6544be64854c5a1208 ] When VF adds VLAN, Linux PF driver enables VLAN stripping by default, this might have issues if the app configured DEV_RX_OFFLOAD_VLAN_STRIP. This behavior of the Linux driver causes confusion with the DPDK app using i40e_pmd. So it is better to reconfigure the vlan_offload, which checks for DEV_RX_OFFLOAD_VLAN_STRIP flag in the dev_conf and enables or disables the vlan strip in the PF. Application cannot use rte_eth_dev_set_vlan_offload() to set the VLAN_STRIP, as this will only work for the first time when original and current config mismatch, but for all subsequent call it will be ignored. Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Souvik Dey Acked-by: Jeff Guo --- drivers/net/i40e/i40e_ethdev_vf.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index c26b036b85..2faee1d7e1 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1078,8 +1078,18 @@ i40evf_add_vlan(struct rte_eth_dev *dev, uint16_t vlanid) args.out_buffer = vf->aq_resp; args.out_size = I40E_AQ_BUF_SZ; err = i40evf_execute_vf_cmd(dev, &args); - if (err) + if (err) { PMD_DRV_LOG(ERR, "fail to execute command OP_ADD_VLAN"); + return err; + } + /** + * In linux kernel driver on receiving ADD_VLAN it enables + * VLAN_STRIP by default. So reconfigure the vlan_offload + * as it was done by the app earlier. + */ + err = i40evf_vlan_offload_set(dev, ETH_VLAN_STRIP_MASK); + if (err) + PMD_DRV_LOG(ERR, "fail to set vlan_strip"); return err; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.976675158 +0000 +++ 0060-net-i40e-fix-VLAN-stripping-in-VF.patch 2021-02-05 11:18:28.802691036 +0000 @@ -1 +1 @@ -From 95ba3f72110c10dd51517d6544be64854c5a1208 Mon Sep 17 00:00:00 2001 +From b9b4af40296d5235615ada1d794991f69851d4b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 95ba3f72110c10dd51517d6544be64854c5a1208 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org