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 4A30F431D5 for ; Sun, 22 Oct 2023 16:25:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FBFD4069F; Sun, 22 Oct 2023 16:25:35 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2041.outbound.protection.outlook.com [40.107.96.41]) by mails.dpdk.org (Postfix) with ESMTP id A43FA40698 for ; Sun, 22 Oct 2023 16:25:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FRbcXB8TIcK1pzPSYq5JMPnUUdWYgZUl/SMT8MBZAZz2g6S9ySsx4yR2DvGRbZ+6UOCsavKxCWQ6sOfsqR/hacO0WezeJ+tZ9r4yZDQzt/ErnWCTtzkJTo4NbPloo5ebmRnNblU+DVwUdC80Tm4+jIbwo9Pr2dyBy/b+cS2dokRsXPBYOQx/Q3wxyICAD/S381qcFlt4JiUjLVM/NUQDFJrkM0zijzXNXlBFqEk8IA3jzIRtWfqHIYT3ekeVlbst8YRT2wBLBSBf57Xc9OdhwjXwC+Ug0ET4pueHj9skpRI+GeSVuIQRPi9nUJNBst8xgab1wLwEQVFmBJbR0C7Czg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GClsvZead213Qn/6i1jHMWSK2hink1GKYGBVMZ+g84k=; b=aNsZnuN0u1QvlckthBObc/lXhfH5pcR9lvM7ayozXaQDKaMwrFUpImYnIaTpJabcUbwWPXON3m9JGWSS5v3Z2NP++oUjWwi0aEC4PKg7Jo6z7+vyv+YkyC6NpO5nwtJat/H2/4a5gDqP0Xjs4osZiFWJPfCCLcIFFBNvVA6Kh5EfZBIJV/ZdeTfMJ0VdmCWe7Hg1yMi5UbV8qkxjD9BfAkHF2ARrPYwj10vyCTOFRXkHz+DHZnqB5VWiRfJk5I9C4Y9GY8fmxwhZw4aTh0cFTaiKm9zWrVc10qdh1tXLuoNqj4QFjAys4WgqFFsp8b/IBu5n7MkhEkmDVQvsmW2CHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GClsvZead213Qn/6i1jHMWSK2hink1GKYGBVMZ+g84k=; b=XFteu82wM60xy75WWT2H98+0D/BwCBeiNZNbzfzhJKv3HUaLnT9/XRvPewL14FyzlHHCEKpOCqN6/Ryy+qcbL9DuROl2slM/39+OmyTkxEg8aTrMeOg14Qer4OMYNdvyVovnsq6qWuA7Smr3/YjJI3g/hjkUHruNTAZFiyCXWRxsBe81CDXgIkk0G7Q7EjoXwnB9Q0T4A+0FI1OiQ8nWqUffdg/Zek3TKgzELLEC1kQb9n7V7Ba+5m5r8v/7LFN5VDgV1eS5L0vMfT+6F2hsLOcECbl8E0Zqik7KAJPCC8h7XKonontPFkj5fh+eFIbmurzMigVEC0G42Zdj8DYEXw== Received: from MW4PR03CA0324.namprd03.prod.outlook.com (2603:10b6:303:dd::29) by CYYPR12MB8937.namprd12.prod.outlook.com (2603:10b6:930:cb::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sun, 22 Oct 2023 14:25:31 +0000 Received: from CO1PEPF000044F4.namprd05.prod.outlook.com (2603:10b6:303:dd:cafe::ed) by MW4PR03CA0324.outlook.office365.com (2603:10b6:303:dd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:25:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044F4.mail.protection.outlook.com (10.167.241.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:25:30 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:25:22 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:25:21 -0700 From: Xueming Li To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: add Tx queue maximum limit' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:54 +0800 Message-ID: <20231022142250.10324-26-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F4:EE_|CYYPR12MB8937:EE_ X-MS-Office365-Filtering-Correlation-Id: a8c677d3-afcb-4f0e-9047-08dbd30abee9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ppm8O+sPzXtplqdp/L+XAvvigQgi71KbXGGC/71JsB5MzLqa++dtwZrKFIjK9T7hOSi4NFC0ZgBT6qMGGcP+kjTeQIuFxXe3NDyJReo1f1mkby37qlmWSNtbxrMhXGAjzaqtOwR0gBvPKxuR0dmbT6wMGGyHocLfT2ZuIhQFAvgk2HBi0Zzlb5VSyQ1BWXcgZ9RBqVVrodPGvScS60kslESaFAZVbowjiDkjHTbCyP6o0I2HH8sbv+d+FWwKYDXMZjg5EjXJ+tD2lL7l859MxNR6U5zikH6Mh7bptOlHaPVC3+lUAQwjeT0sRB8ZX0JoOmDV90KBa4ZbxGQ4Lmf/WLlf1taOBIgNMQYsGm81AHwsutJViplTuSUjLj2XtAy/4rmNt+1lQjUGLYc9zn+CPXLzY4bWUZLcF7rg1ORzuIgoy3R8T04w+ZR5iP6o8TpyQzwa85ebirm1fZ/rRjViQFX+H0RS42WTpJfsHarfCN/k7SwLbUwVdlGLh3ko4e3YFKy8XQjKjECKTXFpzNMAio9/VuZIXHL0cE9gF+zeKs5qNE0nDOJbnzRhYcG+N4MR8+6MGBsUTcKImp0aUY5KgMlIQIUQnvDR6e6E+FasVk4hQuhQMY54rlmhw07uqFE0VfOUAJ9EUdwebVNquYIMWiQ544nKYcbmM5iYw64CmvnndFIM1PtaSwlkMTco9Sp6N5Om4d82xyRJD8cHgQic6M3/krUkjz8FwbxJYdK6SP9pd2Fsu36ufLUYpZbTWYw2Y1mPGnWMRTxOCKZtV+LQRhYK0iaxYFR1iN4h0g/4vcU= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(376002)(396003)(346002)(39850400004)(230922051799003)(82310400011)(64100799003)(451199024)(186009)(1800799009)(46966006)(40470700004)(36840700001)(26005)(4001150100001)(2906002)(55016003)(41300700001)(40460700003)(5660300002)(86362001)(36756003)(8676002)(8936002)(4326008)(2616005)(6666004)(7636003)(478600001)(7696005)(16526019)(6286002)(356005)(1076003)(36860700001)(82740400003)(316002)(70206006)(70586007)(6916009)(83380400001)(40480700001)(966005)(53546011)(426003)(336012)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:25:30.8231 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8c677d3-afcb-4f0e-9047-08dbd30abee9 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8937 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.4 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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=2c62e368053a7ce0c26f241844d04694c410927b Thanks. Xueming Li --- >From 2c62e368053a7ce0c26f241844d04694c410927b 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 Cc: Xueming Li [ 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 2c7d71c0db..7f0b3c9b50 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1498,6 +1498,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 == 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 b8a39204e2..545ce4c9e1 100644 --- a/drivers/net/txgbe/txgbe_ethdev.h +++ b/drivers/net/txgbe/txgbe_ethdev.h @@ -40,6 +40,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:35.368444200 +0800 +++ 0025-net-txgbe-add-Tx-queue-maximum-limit.patch 2023-10-22 22:17:34.166723700 +0800 @@ -1 +1 @@ -From afcba8586daa5abc3868180e96601babfef3cfc1 Mon Sep 17 00:00:00 2001 +From 2c62e368053a7ce0c26f241844d04694c410927b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 15911a3621..479cd810f8 100644 +index 2c7d71c0db..7f0b3c9b50 100644 @@ -22 +24 @@ -@@ -1499,6 +1499,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) +@@ -1498,6 +1498,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev) @@ -43 +45 @@ -index 6b296d6fd1..7feb45d0cf 100644 +index b8a39204e2..545ce4c9e1 100644 @@ -46 +48 @@ -@@ -41,6 +41,7 @@ +@@ -40,6 +40,7 @@