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 31111431A0 for ; Thu, 19 Oct 2023 02:00:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B0DF40E40; Thu, 19 Oct 2023 02:00:14 +0200 (CEST) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mails.dpdk.org (Postfix) with ESMTP id 2E28040E40 for ; Thu, 19 Oct 2023 02:00:13 +0200 (CEST) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2c509d5ab43so85133071fa.0 for ; Wed, 18 Oct 2023 17:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673613; x=1698278413; 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=fVMQybrBubGWj5BONs3WRQJioXtii8ZNkV9fVsdBqDM=; b=GkdHO2J1kvFUBCdbZhU24zTBJRPIQGSlPjS7B7JEZImu+E+jQjmY85S+vwIf6GPj35 RWxVAhzhTm7AiS3tBAErjE6RWOWcLqLK2+EqkPUF0ZFVs3Ol6EHlmmDhyzw2dl9EeRe3 2D1uEBKlfmxgbDlYJp3IX/eQFEF2P/PbRPw8ckXDq4jk1mSF3NzDE8kBmNOYgFPNorCh iCa4N1U0tuuL5n7EXNU9zvoZdm0ruABy5Q0c68qbHJEweYW7q+GbaUPl0Gk5pWyL4OgT wQ+4/mxNUNnvSaCVnJMFFJaHfMniGcWAU4o7mUYw7aBUCtrMVaCgsPB+VBKFi6EnPvp6 BYIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673613; x=1698278413; 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=fVMQybrBubGWj5BONs3WRQJioXtii8ZNkV9fVsdBqDM=; b=LP3hyF3yt9C8LPU//b4BPjj64yB74jGHAEG6vbUo3tgT2W+oxF0Uq/KEPxHrUHCrnm AcmlUr6s4pYQUQcjrVnSppltp2bD7HLkhHRoN1dWYJhEuIS6IkiXwKvu07uct/R5j91q haLcLlh5zhGv1us3Nb+EnP8P1MGQIPsoOf7memaep2k6+4A6BN7ikB5pc1mrkWaKNJkA F+qIt0d4t/NmcxnTLx1L7azM9eyDGok3vNQQQXldHWftXCuKLhgyXNoIIfJz23e83oBR xlu8AFgcdzDbhBGq8wdRb2MdxprakcQusNBQ+Ht0QC/60UYGIcOG/zWzvB6+VpppgEjo dLcg== X-Gm-Message-State: AOJu0YyoPidMaAZp2uwUMeRD57oZ1JHBvXW4Jb6xUU6V6y578ZjlNrUN /fRTeuXLcRgXNr86MK+8qFbk7IQri/L6BA== X-Google-Smtp-Source: AGHT+IFjsDheFhCkaf6LKOEQ76iG4FrfV6SAFtBaejadxbLbWMIutpUGuci5SgS7lezcPMkiZZRVmQ== X-Received: by 2002:a05:651c:1542:b0:2c5:1d11:5688 with SMTP id y2-20020a05651c154200b002c51d115688mr336205ljp.14.1697673612626; Wed, 18 Oct 2023 17:00:12 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id l22-20020a05600c1d1600b004042dbb8925sm2985970wms.38.2023.10.18.17.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 17:00:12 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: add Tx queue maximum limit' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:59:02 +0100 Message-Id: <20231018235930.3144-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-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 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f3d6cc7ae53f44424751aa37d55c1dd1534b91ec Thanks. Luca Boccassi --- >From f3d6cc7ae53f44424751aa37d55c1dd1534b91ec 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 96d90d657d..c7df5a9718 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1277,6 +1277,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) return -EINVAL; } } + + /* + * When DCB/VT is off, maximum number of queues changes + */ + if (dev_conf->txmode.mq_mode == 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 696dd5a7e4..1106a0d91b 100644 --- a/drivers/net/txgbe/txgbe_ethdev.h +++ b/drivers/net/txgbe/txgbe_ethdev.h @@ -28,6 +28,7 @@ /*Default value of Max Rx Queue*/ #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 #define NBBY 8 /* number of bits in a byte */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:56.884910092 +0100 +++ 0013-net-txgbe-add-Tx-queue-maximum-limit.patch 2023-10-19 00:28:56.213804415 +0100 @@ -1 +1 @@ -From afcba8586daa5abc3868180e96601babfef3cfc1 Mon Sep 17 00:00:00 2001 +From f3d6cc7ae53f44424751aa37d55c1dd1534b91ec 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 96d90d657d..c7df5a9718 100644 @@ -22 +23 @@ -@@ -1499,6 +1499,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) +@@ -1277,6 +1277,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) @@ -30 +31 @@ -+ if (dev_conf->txmode.mq_mode == RTE_ETH_MQ_TX_NONE) { ++ if (dev_conf->txmode.mq_mode == ETH_MQ_TX_NONE) { @@ -43 +44 @@ -index 6b296d6fd1..7feb45d0cf 100644 +index 696dd5a7e4..1106a0d91b 100644 @@ -46 +47 @@ -@@ -41,6 +41,7 @@ +@@ -28,6 +28,7 @@