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 C78CC4326F for ; Thu, 2 Nov 2023 14:13:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFB45402E3; Thu, 2 Nov 2023 14:13:41 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 8888B42D45 for ; Thu, 2 Nov 2023 14:13:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4kFJ1saqdcLN9EE6aE0YI0dpdQvQLPd5KIVyaSt7x7E=; b=H79pI//k/0AHKB7vZZqDxYQfks4l7rkn30EEeFAx9F3akWgtrOTfIjeDh6JlELEon17DQP 8MGt6wvIrwMdUtZA/pZk/oEt+sSmEwRZVcgKyDdQN0fZlrCI1MaCPcRl+j7vsncrN+422r Eh+f7i8jPlrDsdaFPtTFUoz5gzOniGA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-ih4LyisINXKVO_UQFimaaQ-1; Thu, 02 Nov 2023 09:13:37 -0400 X-MC-Unique: ih4LyisINXKVO_UQFimaaQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C88ED185A785; Thu, 2 Nov 2023 13:13:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C873492BFA; Thu, 2 Nov 2023 13:13:35 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: add Tx queue maximum limit' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:22 +0000 Message-ID: <20231102131254.315947-16-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 11/08/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2a455021e4b81d57acbcf79f373e79200e3b57c0 Thanks. Kevin --- >From 2a455021e4b81d57acbcf79f373e79200e3b57c0 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Thu, 28 Sep 2023 17:47:48 +0800 Subject: [PATCH] net/txgbe: add Tx queue maximum limit [ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ] Limit TX queue maximum to 64 when neither VT nor DCB are enabled, since hardware doesn't support it. Fixes: 75cbb1f0e8a6 ("net/txgbe: add device configuration") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 13 +++++++++++++ drivers/net/txgbe/txgbe_ethdev.h | 1 + 2 files changed, 14 insertions(+) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 8b57ca1ba7..13c096ed6f 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1487,4 +1487,17 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) } } + + /* + * When DCB/VT is off, maximum number of queues changes + */ + if (dev_conf->txmode.mq_mode == RTE_ETH_MQ_TX_NONE) { + if (nb_tx_q > TXGBE_NONE_MODE_TX_NB_QUEUES) { + PMD_INIT_LOG(ERR, + "Neither VT nor DCB are enabled, " + "nb_tx_q > %d.", + TXGBE_NONE_MODE_TX_NB_QUEUES); + return -EINVAL; + } + } } return 0; diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h index 262dbb5e38..edc3311e19 100644 --- a/drivers/net/txgbe/txgbe_ethdev.h +++ b/drivers/net/txgbe/txgbe_ethdev.h @@ -41,4 +41,5 @@ #define TXGBE_MAX_RX_QUEUE_NUM 128 #define TXGBE_VMDQ_DCB_NB_QUEUES TXGBE_MAX_RX_QUEUE_NUM +#define TXGBE_NONE_MODE_TX_NB_QUEUES 64 #ifndef NBBY -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.275193541 +0000 +++ 0016-net-txgbe-add-Tx-queue-maximum-limit.patch 2023-11-02 13:09:40.791163265 +0000 @@ -1 +1 @@ -From afcba8586daa5abc3868180e96601babfef3cfc1 Mon Sep 17 00:00:00 2001 +From 2a455021e4b81d57acbcf79f373e79200e3b57c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 15911a3621..479cd810f8 100644 +index 8b57ca1ba7..13c096ed6f 100644 @@ -22 +23 @@ -@@ -1500,4 +1500,17 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) +@@ -1487,4 +1487,17 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) @@ -41 +42 @@ -index 6b296d6fd1..7feb45d0cf 100644 +index 262dbb5e38..edc3311e19 100644 @@ -44 +45 @@ -@@ -42,4 +42,5 @@ +@@ -41,4 +41,5 @@