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 CEDE2468C4 for ; Tue, 10 Jun 2025 11:21:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7D9742E62; Tue, 10 Jun 2025 11:21:52 +0200 (CEST) Received: from smtpbgsg1.qq.com (smtpbgsg1.qq.com [54.254.200.92]) by mails.dpdk.org (Postfix) with ESMTP id 2BA7442E6F for ; Tue, 10 Jun 2025 11:21:50 +0200 (CEST) X-QQ-mid: esmtpgz11t1749547308tc37f49e6 X-QQ-Originating-IP: Oze6aL7Uk2SdpA1yZIh1gWhUKlWpehG4RepG2LD+cwA= Received: from lap-jiawenwu.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:21:48 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 8623577931723910681 EX-QQ-RecipientCnt: 3 From: Jiawen Wu To: mengyuanlou@net-swift.com Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 10/12] net/txgbe: restrict VLAN strip configuration on VF Date: Tue, 10 Jun 2025 17:21:24 +0800 Message-Id: <20250610092126.51960-11-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20250610092126.51960-1-jiawenwu@trustnetic.com> References: <20250610092126.51960-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: esmtpgz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: OX/Suy3jp+Q5Hmi0eBd/AM6F9w5RFExhbp9I/sdxrswACGWiQMSlw467 K1MjNgnfNXFYAziQUgsEPSMBdNH2+CYCQpcu3m+T1KrO2rvzEC7YYD+4hhqm4r8htfBbMlM 6Fm4+Fsf0FajR5Y5MmxYs7mHv4EzUALjwfRmgaAiRoZPM1KpZHQAei3jXEN4ziafQ+zwrI/ fpks0KvvwpwinZQZMa8YruElKcGePpVU0kv+tsROjLn/+8uQKHauuBhGMYpF/qIeCyQuLeo nUdZ39WQZqw8gBIPk3HmY0xHhXPz94X0gxbNmLBbRbRpFJcwpouOcbfVwCiIIqA4FCkedfq OaXQ5SPuN0HjnndVszoMXc4gIr6FDlX4pAexeteriSqHZHjBl2E1pIyY9p7b1DZt6gyxHRk w4YEcD5MwkYyKhbIaQR+B4chZ9zhS81VcOtUcxuWxhXlzeV+QQMueDBYCBrzcdN+RASInx9 t04+jhwnAN/Sh8yiui6PW1WfrKwx31Qgvxm4Iv/+7UtOSflc0NbxwNrB47xNE6iryF6mUuk ysgH3eSDaSXSjfXaIFKys+DiBOvZYtjuV/Xswr1eEG+lUtrf73WZv2UYqHhVOv0mp97y8Hu E5VhmNMl3yZnUbDVVBfaavWmdIwZsw8VF4up8XN3snMWn4rT9Qu3KFPa64OwWfaajAFJ2NV gse3E7y/cdlHNXA1H8+Y5LpuKC5Vs+HPrYA9McULrEfT3rXKEmYvQsyi6QO58jKMJX2KDH/ NHYGhySfbb4WxQIjHO6fTciK21upodt0YvxGgZfWD3e8cnzwMyUWFXfZpB3STwYGd22hIDZ jYOxhWnrrn/ev1CJQmbKR8jcEoKSAaGqTcm2LJzXaH47svMxhXDLxvmY1l8amS+KkNGEAfh 41k2Kv9c5GTIYUm3EHgSZgPTp6z/Aul4LBGQ2SemWWdaWNNRTKxc90oBGP1nBHVvLews4Q4 lHlgHpbb+Nq8yB75zjpNSFGVFVj4rG6JvYxiunnKbIhRX1DIJznlJWLD9nCAOs5Ybi6mzZl qHY4R4nj5xzA0YjKNCZwKUJAZDB6NzZ5kY1sXsTPQh2vN5I471X3W+MADD0Jo= X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= X-QQ-RECHKSPAM: 0 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 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") Cc: stable@dpdk.org 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 c0d8aa15b2..847febf8c3 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -935,7 +935,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; @@ -946,20 +946,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) { @@ -972,7 +980,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); } } @@ -982,6 +990,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.48.1