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 7CCDD46B72 for ; Mon, 14 Jul 2025 17:12:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76E09402E7; Mon, 14 Jul 2025 17:12:44 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 46F2F402E7 for ; Mon, 14 Jul 2025 17:12:43 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3a54700a463so2478563f8f.1 for ; Mon, 14 Jul 2025 08:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752505963; x=1753110763; 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=F/dWjxomCrTWQeVApLrbLEDnnRgQxySMFspz1nk5Pj4=; b=jmCB9Wmd42Lhpx4V4e1MQQm8Ij74ipHunUwe6s7s5BN4kP0mHH9e/yq1ZjRY4mkdNj fSkDhO3zRk64B12Hd5NMXlfyUd31zplwhUwY4f4IfqkpdEFulAsYRLAM1DUiab4zn5io xmWMs1tzKAkzc+21xOIzKIHkBj4YSMqFRy5oxWb0/2g/7FFqQzeo16sYB/pirhfBfdyW xLpZV/qnGsd5A2XCNnZSuALVUZqIvJ/YfJGHZmLHazU6d49u4bAdbFzQXLPHKrre2MG/ bBLu3zjOSbwk4RWBO3i78Iomrwkbj12kGo3G/sewJZCk5ujQTss6rOgdfyxiC8YMkAOe yVmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752505963; x=1753110763; 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=F/dWjxomCrTWQeVApLrbLEDnnRgQxySMFspz1nk5Pj4=; b=aT/49ILbaaf/n6Re8VK/BEAKjK3GTewJGUTbaRY91mNbJRqAcOC8ub8Cqvl9AX0/uR xzodPS6N9ho53T6F26Qb3i3Xo3zh8/t++AxMDnmfWJAasH66jzHZ26+mSx0rrvvWFKHI 27cUDknvU8F52H0R1cwPd3TSRl6+3FlXWPq350/Imf7VGhOa8fyrT7u5JMXAFXM6z8Vc rRs+1wyd2Fk1ASy1GKjLT6MSK8HMRC0YH6+S1NJB1JCpu/D3y1VUgh4l638ISB9uU4/T 63Qbl70HgXO4XC4gmzQmyhjGC0/lmpVC0f9kPz1xzkmUUU568iFQWR9nbFMNl9MHul9k Yklw== X-Gm-Message-State: AOJu0Yy+u6/gblRzry5nXTQuJrwjGcgoe2U3cOI9K7K+f6+FZsAVl2dh fUuxJo+iyjNbHFHeCDdHt2/1QxboeTsfOu9F3eEGTyxVbTC4M3KLvoXdy7dJQpJ4 X-Gm-Gg: ASbGncu8ubEH+zzyqnCwvktq3lqf36Y29zYdNoU45UY7VP8a5gJME/qXror56IhLCNI 8TEGquHO6DdXwK1mEk8igWmdy7FO/3/3FA8EjdH8ywsmp2iFYl7Wg/v4frQ7NCudnuQzlOVjemi mknwATpPf78s+0GEkwxaCQ+QwKSR5altdqIgr8RhGzhU6ZiTipMuL/d15eP8mJcsoobhl3vS8Bq Q4JckmQLuLr9GUzoN8Bi1c1S9BomqyQUrAlpGowulNu9eTlvXBkgdsbLDAj+JXbeC3Lx32/qzzM 1Htu9GPD9YqMdw46XY16kZX1nsy9pzEmGQV85zMOQT5kssbUe0+FDiGjmGOHpSHqiGcY4LXelMt fOdEDtem4U4P4uqpKg3F+uxoum+Tq X-Google-Smtp-Source: AGHT+IG4VLNb9E+34Lkkx05dUXqhXlYmH1PzmgWFGtbIOF3X4LwAlF1pSxOyxDLIf0j3SOdD7xJWVA== X-Received: by 2002:a05:6000:4907:b0:3b3:9c56:b825 with SMTP id ffacd0b85a97d-3b5e7f34e3cmr16092395f8f.22.1752505962699; Mon, 14 Jul 2025 08:12:42 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:a923:75e5:f97f:ef33]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4561d19a21dsm26510505e9.24.2025.07.14.08.12.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 08:12:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: restrict VLAN strip configuration on VF' has been queued to stable release 22.11.9 Date: Mon, 14 Jul 2025 16:11:06 +0100 Message-ID: <20250714151121.219866-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250714151121.219866-1-luca.boccassi@gmail.com> References: <20250630122556.1133654-23-luca.boccassi@gmail.com> <20250714151121.219866-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 22.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/16/25. 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/92badd5b51708da3a48a2165e6240af32a1811d6 Thanks. Luca Boccassi --- >From 92badd5b51708da3a48a2165e6240af32a1811d6 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:57 +0800 Subject: [PATCH] net/txgbe: restrict VLAN strip configuration on VF [ upstream commit b8c3d76e790cb06b54469b71a1af822de50c790d ] Fix the same issue as PF in commit 66364efcf958 ("net/txgbe: restrict configuration of VLAN strip offload"). There is a hardware limitation that Rx ring config register is not writable when Rx ring is enabled, i.e. the TXGBE_RXCFG_ENA bit is set. But disabling the ring when there is traffic will cause ring get stuck. So restrict the configuration of VLAN strip offload only if device is started. Fixes: aa1ae7941e71 ("net/txgbe: support VF VLAN") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev_vf.c | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index 92603fccc2..ab85cb99e1 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -863,7 +863,7 @@ txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +txgbevf_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on) { struct txgbe_hw *hw = TXGBE_DEV_HW(dev); uint32_t ctrl; @@ -874,20 +874,28 @@ txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) return; ctrl = rd32(hw, TXGBE_RXCFG(queue)); - txgbe_dev_save_rx_queue(hw, queue); if (on) ctrl |= TXGBE_RXCFG_VLAN; else ctrl &= ~TXGBE_RXCFG_VLAN; - wr32(hw, TXGBE_RXCFG(queue), 0); - msec_delay(100); - txgbe_dev_store_rx_queue(hw, queue); - wr32m(hw, TXGBE_RXCFG(queue), - TXGBE_RXCFG_VLAN | TXGBE_RXCFG_ENA, ctrl); + wr32(hw, TXGBE_RXCFG(queue), ctrl); txgbe_vlan_hw_strip_bitmap_set(dev, queue, on); } +static void +txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +{ + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + + if (!hw->adapter_stopped) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return; + } + + txgbevf_vlan_strip_q_set(dev, queue, on); +} + static int txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) { @@ -900,7 +908,7 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) for (i = 0; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i]; on = !!(rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP); - txgbevf_vlan_strip_queue_set(dev, i, on); + txgbevf_vlan_strip_q_set(dev, i, on); } } @@ -910,6 +918,13 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) static int txgbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask) { + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + + if (!hw->adapter_stopped && (mask & RTE_ETH_VLAN_STRIP_MASK)) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return -EPERM; + } + txgbe_config_vlan_strip_on_all_queues(dev, mask); txgbevf_vlan_offload_config(dev, mask); -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-14 16:09:41.126168211 +0100 +++ 0011-net-txgbe-restrict-VLAN-strip-configuration-on-VF.patch 2025-07-14 16:09:40.704448810 +0100 @@ -1 +1 @@ -From b8c3d76e790cb06b54469b71a1af822de50c790d Mon Sep 17 00:00:00 2001 +From 92badd5b51708da3a48a2165e6240af32a1811d6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b8c3d76e790cb06b54469b71a1af822de50c790d ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index c0d8aa15b2..847febf8c3 100644 +index 92603fccc2..ab85cb99e1 100644 @@ -27 +28 @@ -@@ -935,7 +935,7 @@ txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -863,7 +863,7 @@ txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -36 +37 @@ -@@ -946,20 +946,28 @@ txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +@@ -874,20 +874,28 @@ txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) @@ -71 +72 @@ -@@ -972,7 +980,7 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -900,7 +908,7 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) @@ -80 +81 @@ -@@ -982,6 +990,13 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -910,6 +918,13 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask)