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 B7EF3431A0 for ; Thu, 19 Oct 2023 02:01:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B11C5410E6; Thu, 19 Oct 2023 02:01:01 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id AFF524029E for ; Thu, 19 Oct 2023 02:01:00 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-405497850dbso69107245e9.0 for ; Wed, 18 Oct 2023 17:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673660; x=1698278460; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b++BuobvGLGDV9MtcSCBJAjFy9i0nRwiMOpzP1dvBB4=; b=focjd9N4anb7vNuQxtxojHdt4QwYUeMjC3SI3TaSxFga47AQMveiQV/EPA4cBBC1mv eRkXKZqKwx77/V/b4lCh1qS/gXgWv4nFxQ9l+tPgles9c5u60eugHUzMdEyVcuqFsVkY M9UmTnxkK4IYZnHS1p8agCeKNnpLye/n0mrrglL1nEbVFdnd5IijyfUCCso8dj6XBoiq XxfUomCL5nysbtWVPbgoBdNUsvAahAbwG2AaDGi7uYLvty/EXQhCOIhlTefEp3nbbccX kSxrcLYZoEdn9znk/dqwMwoBvwsoH9dzoZSjr8hI9t9Jzj7h4GYn/mktToydW/KurEJ1 opFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673660; x=1698278460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b++BuobvGLGDV9MtcSCBJAjFy9i0nRwiMOpzP1dvBB4=; b=tF+5j4K83lFFkcoRFjB8rgT735I4kK1YgQ8NhnclBWF1WELJTLvTTODyIlGSfsYj/X CivCOuRvUTVrpYbrTgLLCC0RiuJIqUZfrxM8xLIJaJ285icBmIvbOH2VcvohVx1Mar2/ XZwdAyPukFydNeVV+xclQKUZSB8QK9MAEsFb0wYxlkvCGe6aueVyjoWGuPze6h9ttRRp /qHNYDSxTDTkdk1QbkD7+sBycCuE2uJpqTZX+UcZWooYawCU3w8eys015gA1asukYK9u me2RU/80DOu/hIK+ZOPRS8OmTmRsG3KSJTXcRW9J+3aOgHvK7eRuk/B/2jc2NgDoMzgT TV8A== X-Gm-Message-State: AOJu0YyqrQ+BZKaVRXTi+ydQ/4PSBSBWqyuD7saQhfVrxU8GLmWcj5yG PHy0w+AC41cYhkq54BNg7pQE2KTi+pr1Mw== X-Google-Smtp-Source: AGHT+IFLhKa7ShxrpxUOPQWa/fUtPwXTsMsGFEk2yqKBozbF6aSddZ0y6l2cPkZiZRUfd7Bo6rsxWw== X-Received: by 2002:a5d:460c:0:b0:32d:b289:4bda with SMTP id t12-20020a5d460c000000b0032db2894bdamr371369wrq.40.1697673660423; Wed, 18 Oct 2023 17:01:00 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id n15-20020a5d4c4f000000b0032dc24ae625sm3147065wrt.12.2023.10.18.17.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 17:01:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenjing Qiao Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix VLAN offload strip flag' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:59:18 +0100 Message-Id: <20231018235930.3144-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/23. 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/19077f1b5baf50eb03f52d9c89f9f07a607ea853 Thanks. Luca Boccassi --- >From 19077f1b5baf50eb03f52d9c89f9f07a607ea853 Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Mon, 21 Aug 2023 09:52:12 +0000 Subject: [PATCH] net/iavf: fix VLAN offload strip flag [ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ] For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP, it will set strip on when setting filter on but dpdk side will not change strip flag. To be consistent with dpdk side, disable strip again. Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops") Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 127d79318d..f3b3ff5e70 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1013,6 +1013,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); + struct rte_eth_conf *dev_conf = &dev->data->dev_conf; int err; if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN)) @@ -1021,6 +1022,23 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) err = iavf_add_del_vlan(adapter, vlan_id, on); if (err) return -EIO; + + /* For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP, + * it will set strip on when setting filter on but dpdk side will not + * change strip flag. To be consistent with dpdk side, disable strip + * again. + * + * For i40e kernel driver which supports vlan v2, dpdk will invoke vlan v2 + * related function, so it won't go through here. + */ + if (adapter->hw.mac.type == IAVF_MAC_XL710 || + adapter->hw.mac.type == IAVF_MAC_X722_VF) { + if (on && !(dev_conf->rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP)) { + err = iavf_disable_vlan_strip(adapter); + if (err) + return -EIO; + } + } return 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:57.705720341 +0100 +++ 0029-net-iavf-fix-VLAN-offload-strip-flag.patch 2023-10-19 00:28:56.281806213 +0100 @@ -1 +1 @@ -From e25c7ed114b296ddaa583427824acc30bcf9c85d Mon Sep 17 00:00:00 2001 +From 19077f1b5baf50eb03f52d9c89f9f07a607ea853 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c0ca733c67..9591acef65 100644 +index 127d79318d..f3b3ff5e70 100644 @@ -24 +25 @@ -@@ -1369,6 +1369,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1013,6 +1013,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -31,2 +32,2 @@ - if (adapter->closed) -@@ -1387,6 +1388,23 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) + if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN)) +@@ -1021,6 +1022,23 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -47 +48 @@ -+ if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) { ++ if (on && !(dev_conf->rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP)) {