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 2F076455AD for ; Mon, 15 Jul 2024 17:30:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2AA6540BA0; Mon, 15 Jul 2024 17:30:29 +0200 (CEST) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by mails.dpdk.org (Postfix) with ESMTP id 7936C40A71 for ; Mon, 15 Jul 2024 17:30:28 +0200 (CEST) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-52e9f863c46so4875843e87.1 for ; Mon, 15 Jul 2024 08:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057428; x=1721662228; 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=yaAqvb+keNpPOq14+DHJtHXBEpTCf1fx7SU6i0q1C90=; b=JdmFZWZbHpfrs/JMJQl4NfFrRuRK0n1JcwCP4Ywnh0POYW5vUYlkBxI53HDm2Zag0e lMWvfg/zdF/ujEb6zGYwWbETD/ieHgtpeovm83kUq3UyfWr8g1yEMGvUu8svpnL30LfX iHRkMs7Jqf78xvDVeGaqi53s11EHVPisBu+YRbdHZg3QCDuYhMxUZ+VarKAe2Tl9tNA6 oh0iNEmcSBK9YgLo5xSxKOGtOd9YukXdz+uYYJ8HKY9jIU9hy2UVTCjrLldNW940QcHC E/gumFslI479kmuTr2D8/LfCvrXFYzpNkwoVTbw3+LGyJYoZPsH8P6hmbWcCFasM0uzQ aKmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057428; x=1721662228; 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=yaAqvb+keNpPOq14+DHJtHXBEpTCf1fx7SU6i0q1C90=; b=RqbqMtclLbjoNSD482DICVc1ZuamW83qwt2boZEdWjBpcQO/rSrODHItxa4iDxEdCv NsrK+WRxJFXfAaspys2qC1Qhs6dkeRtibXPnnZeDOocsQ133Rub4W/cfD+EPG++HQus1 cQiGKdv9eDeDLXvIjdUYPwQjcnEEklzZhF5MbQaYKvbbs/8esLXaJRLsQBmKbJky8m1C OimqDpEecJFq0+Tmx3DuvgIzhT/oxNf+vBEP6h3Jdc5wAeY9Vl2TjfNZL4h7ZaWxCX00 c9/erZfE/aP2j0uOpgV78vzpPkcr6gso/wMXr3fqhr8srAux3AW8ArMR3gUAU3EosHoU FbzA== X-Gm-Message-State: AOJu0YyWH0vbJ+wSqO9CqlAtKrouUKf6bPC0Fqu87ubH4yGsMJE9OW9j B3EmtCTeU3nNVZqR4nAj8wVJjAEjtfvuX2Ao9geHU81BsSC/GpMUGIkctepddGg= X-Google-Smtp-Source: AGHT+IF0gIgLTvnl4bVhC4gj01tmYopOFOcfRvOdBalBfS+twXUHs/sM4/S9bLfDOsLXacSXf5SHkg== X-Received: by 2002:a05:6512:ea0:b0:52c:e03d:fa33 with SMTP id 2adb3069b0e04-52eb99d4d27mr14659518e87.62.1721057427763; Mon, 15 Jul 2024 08:30:27 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f23999csm127039345e9.8.2024.07.15.08.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:30:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: restrict configuration of VLAN strip offload' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:41 +0100 Message-Id: <20240715152704.2229503-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/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/7b6163ebfad77fd4f2ce33b7bbb32cfc34294b81 Thanks. Luca Boccassi --- >From 7b6163ebfad77fd4f2ce33b7bbb32cfc34294b81 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:35 +0800 Subject: [PATCH] net/txgbe: restrict configuration of VLAN strip offload [ upstream commit 66364efcf95884b97b71aaff697f8597a286f52e ] 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") 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 862cdc55cc..def3202ce8 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -999,41 +999,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 @@ -1258,9 +1242,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); } } @@ -1322,6 +1306,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:37.768383592 +0100 +++ 0063-net-txgbe-restrict-configuration-of-VLAN-strip-offlo.patch 2024-07-15 16:19:34.672208684 +0100 @@ -1 +1 @@ -From 66364efcf95884b97b71aaff697f8597a286f52e Mon Sep 17 00:00:00 2001 +From 7b6163ebfad77fd4f2ce33b7bbb32cfc34294b81 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 66364efcf95884b97b71aaff697f8597a286f52e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 121dccb5eb..a59d964a5b 100644 +index 862cdc55cc..def3202ce8 100644 @@ -24 +25 @@ -@@ -1000,41 +1000,25 @@ txgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -999,41 +999,25 @@ txgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -77 +78 @@ -@@ -1259,9 +1243,9 @@ txgbe_vlan_hw_strip_config(struct rte_eth_dev *dev) +@@ -1258,9 +1242,9 @@ txgbe_vlan_hw_strip_config(struct rte_eth_dev *dev) @@ -89 +90 @@ -@@ -1323,6 +1307,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -1322,6 +1306,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask)