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 1183A45489; Tue, 18 Jun 2024 09:12:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED55C40E2B; Tue, 18 Jun 2024 09:12:31 +0200 (CEST) Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) by mails.dpdk.org (Postfix) with ESMTP id 57A1440DDC; Tue, 18 Jun 2024 09:12:08 +0200 (CEST) X-QQ-mid: bizesmtpsz1t1718694725t6jqg2a X-QQ-Originating-IP: tThOidqsedJn+tKhUUv4SALJn6FQ6yKcqzvMETbVOQI= Received: from lap-jiawenwu.trustnetic.com ( [183.159.97.141]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 18 Jun 2024 15:12:05 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 18275039777203525470 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 04/19] net/txgbe: restrict the configuration of VLAN strip offload Date: Tue, 18 Jun 2024 15:11:35 +0800 Message-Id: <20240618071150.21564-5-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20240618071150.21564-1-jiawenwu@trustnetic.com> References: <20240618071150.21564-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpsz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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: 220b0e49bc47 ("net/txgbe: support VLAN") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 49 +++++++++++++------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 121dccb5eb..a59d964a5b 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1000,41 +1000,25 @@ txgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -txgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +txgbe_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on) { - struct txgbe_hw *hw = TXGBE_DEV_HW(dev); - struct txgbe_rx_queue *rxq; - bool restart; - uint32_t rxcfg, rxbal, rxbah; - if (on) txgbe_vlan_hw_strip_enable(dev, queue); else txgbe_vlan_hw_strip_disable(dev, queue); +} - rxq = dev->data->rx_queues[queue]; - rxbal = rd32(hw, TXGBE_RXBAL(rxq->reg_idx)); - rxbah = rd32(hw, TXGBE_RXBAH(rxq->reg_idx)); - rxcfg = rd32(hw, TXGBE_RXCFG(rxq->reg_idx)); - if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) { - restart = (rxcfg & TXGBE_RXCFG_ENA) && - !(rxcfg & TXGBE_RXCFG_VLAN); - rxcfg |= TXGBE_RXCFG_VLAN; - } else { - restart = (rxcfg & TXGBE_RXCFG_ENA) && - (rxcfg & TXGBE_RXCFG_VLAN); - rxcfg &= ~TXGBE_RXCFG_VLAN; - } - rxcfg &= ~TXGBE_RXCFG_ENA; +static void +txgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +{ + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); - if (restart) { - /* set vlan strip for ring */ - txgbe_dev_rx_queue_stop(dev, queue); - wr32(hw, TXGBE_RXBAL(rxq->reg_idx), rxbal); - wr32(hw, TXGBE_RXBAH(rxq->reg_idx), rxbah); - wr32(hw, TXGBE_RXCFG(rxq->reg_idx), rxcfg); - txgbe_dev_rx_queue_start(dev, queue); + if (!hw->adapter_stopped) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return; } + + txgbe_vlan_strip_q_set(dev, queue, on); } static int @@ -1259,9 +1243,9 @@ txgbe_vlan_hw_strip_config(struct rte_eth_dev *dev) rxq = dev->data->rx_queues[i]; if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - txgbe_vlan_strip_queue_set(dev, i, 1); + txgbe_vlan_strip_q_set(dev, i, 1); else - txgbe_vlan_strip_queue_set(dev, i, 0); + txgbe_vlan_strip_q_set(dev, i, 0); } } @@ -1323,6 +1307,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) static int txgbe_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); txgbe_vlan_offload_config(dev, mask); -- 2.27.0