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 6E59B45C9B for ; Tue, 12 Nov 2024 23:09:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 695E94064C; Tue, 12 Nov 2024 23:09:56 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id A99EC4064C for ; Tue, 12 Nov 2024 23:09:55 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-37d55f0cf85so4147146f8f.3 for ; Tue, 12 Nov 2024 14:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449395; x=1732054195; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vUYEGgTYrRLJ66X8BqakuAolr8p+VRbg1yB3uPs3wss=; b=RA1Zf4+W5//kFgYWCun3VFf+U6A7CxR5lYfWqFfuA2jgcWX7YQfj11rApgNS6hG0ss D+Ke0wBEi4nvwQIQtx0DDwn70/qoWHNWxkEcQbJSbB3Dra5skAaFoaWoqUGPWEOYw9Co xa9Sj8zEGYfHOYOCKd2RAcluNl9z8cRH4rdanbb7sDNY6VAspCYlA0TF5uTzoTDOar47 c+z4W1l7Ck1VLZWDb1cGsnwB0exr/LgMi4GrWPXtR33B0urdz1HDDTedFp6np/QlaV0D OTp2NbDlWiJzj2OEM4duywo1Y/QKFI8fHT4ePB8H8uVOaeG2j0oVZka880dZfo6nVSIT A6Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449395; x=1732054195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vUYEGgTYrRLJ66X8BqakuAolr8p+VRbg1yB3uPs3wss=; b=AEyEmIOA7cwFPR6w+URKpAG2rpwl22MDc1zD1FJcqnlsh4ndr6ADxF+SwauFHYRUfq gIkQ0brFlwQAN58ZpR9zeKRKCrxr5zsE+pnVtuMs9Fu/wVSKYdXiIazF9R/oUAaoQRTu BV4PGiJ1QvUWVwFxVyRpO3FrNJxQTdnqsJ04uPf9x6+nm0ocq6X1xLhnRaiP9SzXLzQW dhu4EBioyNnq/MiKfmkXNNEpEVLs7QPggRTpnZnnNsmxQDlKEZ1wVfxDI2f78RPkn6be Kgj8zTcaEjb0WhEQUwI9MEU3QCXZQVJV0H0TEqrqmNoI9TQMNerYG2y2oLLlbwF0eoI1 mwMw== X-Gm-Message-State: AOJu0YwLLGbN2hJKrOkEHjjbw1MpTSFSIKUfMfCQl9VttygsFudehlRO NzyNhE3ctZw2NeZZ47TZXnAb3gU4BL2lLXX/7LQBKe5mJm/f2BzPW6O7HQ== X-Google-Smtp-Source: AGHT+IGei2k88Pxb6jiAjqXfGwppQW1D+s/Ye13mlaXt867eE/d1bbJUiS2T5cF2/IXdOnuzf9AWew== X-Received: by 2002:a05:6000:400e:b0:382:531:536f with SMTP id ffacd0b85a97d-3820df67247mr479518f8f.30.1731449395217; Tue, 12 Nov 2024 14:09:55 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381ed999fe3sm16453231f8f.57.2024.11.12.14.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:09:54 -0800 (PST) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: restrict configuration of VLAN strip offload' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:41 +0000 Message-ID: <20241112220754.666489-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0b6713d5ba3bc2b0e975db13e08a2cfa9fd1c332 Thanks. Luca Boccassi --- >From 0b6713d5ba3bc2b0e975db13e08a2cfa9fd1c332 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 4 Nov 2024 10:30:07 +0800 Subject: [PATCH] net/ngbe: restrict configuration of VLAN strip offload [ upstream commit baca8ec066dc6fdc42374e8eafd67eecfd6c9267 ] 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") 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 38754ce0f0..9d6ae6f2ef 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -584,41 +584,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 @@ -844,9 +828,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); } } @@ -908,6 +892,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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.672796554 +0000 +++ 0031-net-ngbe-restrict-configuration-of-VLAN-strip-offloa.patch 2024-11-12 22:06:58.683307454 +0000 @@ -1 +1 @@ -From baca8ec066dc6fdc42374e8eafd67eecfd6c9267 Mon Sep 17 00:00:00 2001 +From 0b6713d5ba3bc2b0e975db13e08a2cfa9fd1c332 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit baca8ec066dc6fdc42374e8eafd67eecfd6c9267 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 325a9d1eaf..08e87471f6 100644 +index 38754ce0f0..9d6ae6f2ef 100644 @@ -24 +25 @@ -@@ -586,41 +586,25 @@ ngbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -584,41 +584,25 @@ ngbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -77 +78 @@ -@@ -846,9 +830,9 @@ ngbe_vlan_hw_strip_config(struct rte_eth_dev *dev) +@@ -844,9 +828,9 @@ ngbe_vlan_hw_strip_config(struct rte_eth_dev *dev) @@ -89 +90 @@ -@@ -910,6 +894,13 @@ ngbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -908,6 +892,13 @@ ngbe_vlan_offload_config(struct rte_eth_dev *dev, int mask)