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 8E9B8468C4 for ; Tue, 10 Jun 2025 11:27:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8976E42E62; Tue, 10 Jun 2025 11:27:11 +0200 (CEST) Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) by mails.dpdk.org (Postfix) with ESMTP id 3FCB242E5D for ; Tue, 10 Jun 2025 11:27:08 +0200 (CEST) X-QQ-mid: zesmtpsz7t1749547626t34eaf95a X-QQ-Originating-IP: oMSaDyVbFemQSGuVfHmpRJuQfELQufIxrBzMpA2Ck9w= Received: from lap-jiawenwu.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:27:05 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 2670759684556602953 EX-QQ-RecipientCnt: 3 From: Jiawen Wu To: mengyuanlou@net-swift.com Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 11/12] net/ngbe: restrict VLAN strip configuration on VF Date: Tue, 10 Jun 2025 17:26:38 +0800 Message-Id: <20250610092639.41216-12-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20250610092639.41216-1-jiawenwu@trustnetic.com> References: <20250610092639.41216-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpsz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: MzVGNhsCLlFKumCy9MY60/CbMQpxi0kPEHi7p0K1o5FzBs3QqLC6wZJV mBK4Xx4BGF4FQoR1EXco+gfdLhR1sx4npSAl5W6iCJRLhxbEmyySqW/qPGN+9rQ6CJpLOvi xGqniRSHYha3t5x7Pacn7FqTkTsFABsWUO3OM3EWsPr7+S6Dx8ZkoMkejP0qHoK3o+4rFfe lQ1p+zca/8PmudHxmvHfa4vonFyRd/hzzGgjCs8VAdNb2QwS2sze2b/hnJR7S9gMHzi2d0o eyVHWOFN6aLeJ9pbvNPei+proFd2uTIKSb2m5gxd0jUatdm5nL6YhR2mIcp5OHYTEdf8nQ1 by2IuNOlNgZry9LqLYEbO+poTtLY4qLgiQ8RMGaIGKO2lWDlsGdqrLb8mkWeynyxw5NnjfE TNdRvF0eTtlvWuw87L1soXzS3pkPHIPappRU3fZv6wWiZqU/L0D8sGHV/u1GaADucvLyu6l PbYmSn+5Tofayg33o67uiuLc32VzfmmMe/oSpPBGb/YOKVBGFnV090fe9ToYnDboTaCJ1Oa wTk+v9iWaWFUkFUiePq+YDIETaMxh2TJ+Eu7Zy0q3XtFGrHqNWwLGl8hAi21gfeIrn6ED8o rChF8zCPXcDOQdOFEwrN67PinXxik1ajdHpIzenQreRbsmwSUrfbSKH4IyXA4575pVfKhQm k5xuE2dEK3lO7X6FZyB1HdXNnEaTJG2c5SnZFU8K3t+JFl5ZUhXndosdtjEU9CVwnMYqwB6 Y1jNA3jDbPdJzlWh796xpLpu4Bll5jwe4gZyKJh7+RMI3KUFWIkLU3vN6ZMcDHDuDGbV5AI Uz7fqQSemFXRS2z8NtyxQxHIzKOibunhqcxjbNyUIktUo200j/0v/qdK2+90qcuOj003X/G 3/GJbsQwQZ2f3JLrPMTnZBXmXOqhXqwFcq1qM6nR+c9R+7KMflpZfEMOAb2v5FUgxaoBu8I qc+7XNLvj3HKI6CMvt+7zMR909q9AfldGRh5j85P2lOEDst7oXWn97reoBU9HvIeK6rLzof vZXPZj87iiMAgq2prW7RYhcxurEazv/TeUGy4ivWZGb0Gc2eT62zoDQmgj/sA4ZBNbO/1/d iteX0A7Gn7ibpG9T6otqrP2c6IintZs9kKEfVa78wRklmc+zAOIbjo= X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= 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 baca8ec066dc ("net/ngbe: 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: f47dc03c706f ("net/ngbe: add VLAN ops for VF device") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev_vf.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/net/ngbe/ngbe_ethdev_vf.c b/drivers/net/ngbe/ngbe_ethdev_vf.c index 5d68f1602d..846bc981f6 100644 --- a/drivers/net/ngbe/ngbe_ethdev_vf.c +++ b/drivers/net/ngbe/ngbe_ethdev_vf.c @@ -828,7 +828,7 @@ ngbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -ngbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +ngbevf_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on) { struct ngbe_hw *hw = ngbe_dev_hw(dev); uint32_t ctrl; @@ -848,6 +848,19 @@ ngbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) ngbe_vlan_hw_strip_bitmap_set(dev, queue, on); } +static void +ngbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +{ + struct ngbe_hw *hw = ngbe_dev_hw(dev); + + if (!hw->adapter_stopped) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return; + } + + ngbevf_vlan_strip_q_set(dev, queue, on); +} + static int ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) { @@ -860,7 +873,7 @@ ngbevf_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); - ngbevf_vlan_strip_queue_set(dev, i, on); + ngbevf_vlan_strip_q_set(dev, i, on); } } @@ -870,6 +883,13 @@ ngbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) static int ngbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask) { + struct ngbe_hw *hw = ngbe_dev_hw(dev); + + if (!hw->adapter_stopped && (mask & RTE_ETH_VLAN_STRIP_MASK)) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return -EPERM; + } + ngbe_config_vlan_strip_on_all_queues(dev, mask); ngbevf_vlan_offload_config(dev, mask); -- 2.48.1