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 B29DE45C2A for ; Mon, 4 Nov 2024 03:07:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0144406BB; Mon, 4 Nov 2024 03:07:24 +0100 (CET) Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) by mails.dpdk.org (Postfix) with ESMTP id DC47240DC9; Mon, 4 Nov 2024 03:07:18 +0100 (CET) X-QQ-mid: bizesmtp91t1730686036tamijilf X-QQ-Originating-IP: ymfqwCqx93hPgVjJPI0Y3iC9ohClLKYKmj+R1nQXluI= Received: from wxdbg.localdomain.com ( [60.186.23.108]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 04 Nov 2024 10:07:16 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 14378646305265298822 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH v3 13/13] net/ngbe: restrict configuration of VLAN strip offload Date: Mon, 4 Nov 2024 10:30:07 +0800 Message-Id: <20241104023007.782475-14-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20241104023007.782475-1-jiawenwu@trustnetic.com> References: <20241028023147.60157-1-jiawenwu@trustnetic.com> <20241104023007.782475-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: ND6R2T5QMWLZT8WZEp4z+JvPciz7QwBGIhykWrajyUBiMo3IoIOr134t JO2IevgkNOpTpn5cMvpd48EmEML6O6PlnHOhopAxsCXzUEKHpfIaUFmTawJR/Y7p/S6+dWR ry3etAzgljxT6hjSbDWXlUAnklCKU2Af1TGm5+BRKl9ZiE6E4cFxhZGmV1YTfSSP2CIgWD2 aggHN94g6d1cvFXIbLAeyeOJ7BAEYaCrTUI5wFkxtBEquInXFCY1Q2QlGzI1RhxUahbkkQp BLAWaUeAo7U4wVDXq3BNtRbfNBNkOmQHcP8+BlWcY7UvtZYfOfHsz2jzIPiX80TEUuNTwha 9zq6WhHSrtiBiAGE76qfHMN1MZc7pVhm1bslbm4mrWn9WcsEwhI0ShaSYywmx1Hlp8kRz5+ GSlVzp3SZeZE7IHU9JdeMZgE+33+MEtwB5Hl184wjdsHNXbGmpp+h52fINViJmBthqxMRNj yOJN8lMy1ZDNZuiANwnpn59II9+J2PRn2BPsbTnTPBt6XycEvZotA9R3SKVhKMpld6E3N53 kPTqGG5YunmXSmh/J5HZHSbCd8jt0tIt6eRw+5DsKUvD2D5yncwFt4G+TM4yNh+1UpEqYvX R9BNzncHklTVUqr7RFY/AMUI4Q9VVCgWkmCuzfyrETY6GbVS0ggLQmuf+Kcgw4pJ+0cf+1m hdHIV4eBknNZrHWKThxlSTQpwxLMWaQEKoHOJG1Ru0zzjgmGCbC5UvQKTeRQgHxFYlO5h+m dYrdM6XSwfmF1jmeQAd9AAQ7Gur06ezu2Py/yTLtQ9gUqH7QYtFxVPDRIHXIlwfo7NNrFFZ IyTgQQHkk7oDb8pYT9lwLP9sPITryQUyzsaCQMZc1253r82dhDZcvIB3AD/debTIePlUbq7 L+B4Odr4GQzvA/t9E7e/sx5JNu6WPyByghVo5Lh153UwQu3QlaKAxBX/KgUhhCv5nwHIYdn pwfq7ZjCXUWQtPD8upnfoFq7drUlgmdxzTlv6O55mkMRU0ykpkf1sONs1Ej+GG3zboQg= X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= 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 There is a hardware limitation that Rx ring config register is not writable when Rx ring is enabled, i.e. the NGBE_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: 59b46438fdaa ("net/ngbe: support VLAN offload and VLAN filter") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 49 ++++++++++++++-------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 325a9d1eaf..08e87471f6 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -586,41 +586,25 @@ ngbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -ngbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +ngbe_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on) { - struct ngbe_hw *hw = ngbe_dev_hw(dev); - struct ngbe_rx_queue *rxq; - bool restart; - uint32_t rxcfg, rxbal, rxbah; - if (on) ngbe_vlan_hw_strip_enable(dev, queue); else ngbe_vlan_hw_strip_disable(dev, queue); +} - rxq = dev->data->rx_queues[queue]; - rxbal = rd32(hw, NGBE_RXBAL(rxq->reg_idx)); - rxbah = rd32(hw, NGBE_RXBAH(rxq->reg_idx)); - rxcfg = rd32(hw, NGBE_RXCFG(rxq->reg_idx)); - if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) { - restart = (rxcfg & NGBE_RXCFG_ENA) && - !(rxcfg & NGBE_RXCFG_VLAN); - rxcfg |= NGBE_RXCFG_VLAN; - } else { - restart = (rxcfg & NGBE_RXCFG_ENA) && - (rxcfg & NGBE_RXCFG_VLAN); - rxcfg &= ~NGBE_RXCFG_VLAN; - } - rxcfg &= ~NGBE_RXCFG_ENA; +static void +ngbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +{ + struct ngbe_hw *hw = ngbe_dev_hw(dev); - if (restart) { - /* set vlan strip for ring */ - ngbe_dev_rx_queue_stop(dev, queue); - wr32(hw, NGBE_RXBAL(rxq->reg_idx), rxbal); - wr32(hw, NGBE_RXBAH(rxq->reg_idx), rxbah); - wr32(hw, NGBE_RXCFG(rxq->reg_idx), rxcfg); - ngbe_dev_rx_queue_start(dev, queue); + if (!hw->adapter_stopped) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return; } + + ngbe_vlan_strip_q_set(dev, queue, on); } static int @@ -846,9 +830,9 @@ ngbe_vlan_hw_strip_config(struct rte_eth_dev *dev) rxq = dev->data->rx_queues[i]; if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - ngbe_vlan_hw_strip_enable(dev, i); + ngbe_vlan_strip_q_set(dev, i, 1); else - ngbe_vlan_hw_strip_disable(dev, i); + ngbe_vlan_strip_q_set(dev, i, 0); } } @@ -910,6 +894,13 @@ ngbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) static int ngbe_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); ngbe_vlan_offload_config(dev, mask); -- 2.27.0