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 42C65468C4 for ; Tue, 10 Jun 2025 11:23:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C57342E69; Tue, 10 Jun 2025 11:23:09 +0200 (CEST) Received: from smtpbg154.qq.com (smtpbg154.qq.com [15.184.224.54]) by mails.dpdk.org (Postfix) with ESMTP id DE20842E5D for ; Tue, 10 Jun 2025 11:23:06 +0200 (CEST) X-QQ-mid: esmtpgz12t1749547384tc912a263 X-QQ-Originating-IP: 5yfKA/7oTcQFh3hkZOjAZtaOVFtT8ruoDnX+l8EpJv8= Received: from w-MS-7E16.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:23:03 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 16388283413747734650 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:22:36 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250610092237.232224-1-jiawenwu@trustnetic.com> References: <20250610092237.232224-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: M/c8U4pHab0wo5NQ+NnraZzwe6p9jI1uORKO1fjtsPVAVt3sNKQ/4oFf D9Q+RWTShmSDkokAIdI5N3pznbSWkvm8GraBSXUh4MkpQeXKIqnQcvsaeNvcMnUp8il/6Ps bz9NemnvFM3TxbtuWX8pXhBQHNvC/NPUx7o3LdhS61/m466rBP7wxZVSQ9f1A9dTTbd03YL DmRea1B+kR4ZVUGdt0w4G6mZjbsubrlppQrD4w8AXeM9UFrKrkBgPOVU4OAT4Wikw6xJ+66 SsfuGklZPeQGnV9Utvtmwn5rYStRDk1gML/gcGXh0kI2g5pR7z8KxM7TGRARiaY2Fiu1x0r 6pGpYrDNTgrA2P2wDpvvyKUeujcX52n6f17MXNPYIoceErI2UbdPovH36yHztZipGOZ6iFa 3FRKbZCkLeRyTju+XJGld6QT7rGK1riz+z+sZ1OYEsoGI9gWNUtPJXUlJPDyVtbwHooYV7e atZcNq1RFYegu9GYmGWUCW6VPjh+VcJ0c+fcHt5xqTBo0gqPvfjSsh9ntep/NDHmkwZCJHZ zbmSRI2UtsAn5Gto6HEiYODE6K4diflPYvtiaPENQgHjMhoQZEhbWi1oSZZwHJM8wgRzw1i ZcKYiiJRnBMadT0qRSOmSu43B6taEyWmHIj5k7f1oTF/1SX9BBUEcth/kff5DIC6+LPfB4h RBaE4wW4E5X/halZn/V8j1mC3gG2jYQgPFIjU0VQU3kjwkoLUQ1T27G8kVSqK3rwsuEh+RO qBDwrPEKn2RKPUkofZEWgquZNgT+6eKenbJiUT7O7H2KzyO1oejmEyedNqBW+MwtJnU/S4/ 7g0z6d5QKOKngIihqnhodiZ8Bv3BckwiitF92+vcrHGb9W3R5LO0o9U2uuQ9yTwRF9V9eP8 FZX49Venp9yFze5ChLGpWH8AVF/qCEPkn77eB0TOlNAWsOta6l+VAg9OStmnHAPXuUpggEL r2kzR1ftNah9NsgCQfmxrv5091gnTlnaGq2ewomZGw2bnEb81WFGB08IlNXqggms+DOfiax mDDVmd2RVuBuCddSvBwn07Mc0MFsci8KP3G+9+q8RwI5AR/Xci5DH7yJg1XCkoIFfA3LZOd llE24Lh9eU3WlcHkLWmBiw= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= 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