From patchwork Tue Aug 13 15:59:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143123 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 02F86457BB; Wed, 14 Aug 2024 09:48:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1939E40FDE; Wed, 14 Aug 2024 09:48:39 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id B93F74026C for ; Tue, 13 Aug 2024 18:00:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564813; x=1755100813; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wVGApsrjck0nMaBCYIaLZopBR9ehIe3aokU+k/6N6LU=; b=lk5SLe/1tN5ms0M8A3xsAHUcHqLa5hgjYhL1TNtgXy3qvMqfDFhmbz5x wfWd4ufRC5Y8aUzpnomvCxHBtIneIiVvNxpQzVn3MqGsVTH2+yUVbnO95 0b/p1ddio2Sw1+t/udXxEOghOOpWT3faFFNSmHiAZnpj+S9Elx1wsmIxh qXBnXsLE7wKJO2NqFJawRzGytZu827hxR4ZLOB1qUXJH7dvAosRZzyUzi s76CO6773WJD5OKOGYJvP9Cg2wOfekT7JGp8Ibg4Sx4MoRyhQJbYpxSTa qYjRaFPVBeMvowfwVPfUfyR3UVu8S3ee6kfQIFOnF0U8jcfEyLZkAYttL w==; X-CSE-ConnectionGUID: 9nLLunJMQFOeMiL2LIN3pQ== X-CSE-MsgGUID: IfsSCtU4T8+/vW6WplACpQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987793" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987793" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:13 -0700 X-CSE-ConnectionGUID: O6dknsLER0iGXhrQtVS0EQ== X-CSE-MsgGUID: nv+86FfuTpaYTN/kYC/pHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406088" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:11 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 01/26] cryptodev: remove use of ethdev max queues definition Date: Tue, 13 Aug 2024 16:59:38 +0100 Message-ID: <20240813160003.423935-2-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The number of queue pairs supported by cryptodev should not be dependent on the number of ethdev Rx or Tx queues, so add a new define for cryptodev specifically. Signed-off-by: Bruce Richardson --- config/rte_config.h | 1 + lib/cryptodev/cryptodev_pmd.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rte_config.h b/config/rte_config.h index dd7bb0d35b..d67ff77c71 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -71,6 +71,7 @@ /* cryptodev defines */ #define RTE_CRYPTO_MAX_DEVS 64 +#define RTE_CRYPTO_MAX_QPS_PER_DEV 256 #define RTE_CRYPTODEV_NAME_LEN 64 #define RTE_CRYPTO_CALLBACKS 1 diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c index 87ced122b4..d3263bd907 100644 --- a/lib/cryptodev/cryptodev_pmd.c +++ b/lib/cryptodev/cryptodev_pmd.c @@ -212,8 +212,8 @@ dummy_crypto_dequeue_burst(__rte_unused void *qp, void cryptodev_fp_ops_reset(struct rte_crypto_fp_ops *fp_ops) { - static struct rte_cryptodev_cb_rcu dummy_cb[RTE_MAX_QUEUES_PER_PORT]; - static void *dummy_data[RTE_MAX_QUEUES_PER_PORT]; + static struct rte_cryptodev_cb_rcu dummy_cb[RTE_CRYPTO_MAX_QPS_PER_DEV]; + static void *dummy_data[RTE_CRYPTO_MAX_QPS_PER_DEV]; static const struct rte_crypto_fp_ops dummy = { .enqueue_burst = dummy_crypto_enqueue_burst, .dequeue_burst = dummy_crypto_dequeue_burst, From patchwork Tue Aug 13 15:59:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143124 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A110457BB; Wed, 14 Aug 2024 09:48:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74C31410D5; Wed, 14 Aug 2024 09:48:40 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 4D90A4026C for ; Tue, 13 Aug 2024 18:00:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564815; x=1755100815; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RHts9feM10nfbUB9pkA8cpRSYEwjkHeAbGGhUmyMRqg=; b=UTXrof/ItX76KyK94r2ygOCUjDTmBPOn64Sz1jFh/x27OTRMEs0CKrAy XAYGP3XdVhX0BZstoA0GHOIF2WHk2Kn1NZ7TA8PfbQu8hbH8CZvWUW2LD LaQ3QDcvnTbsGypOUfkbXBpsv7p9guJby0qQ6ovZXCBeRhhiA/hsxILVt t0lnGiK+YljjlszMOwHZd+9RPpMwG8JySGv9jd9rwcdknHre+/jCh3S5z NGMIKrkgT9366Fz+JU+nfw/Nw4zC87tHlq4FdO+5+MQJEQTQoo1OooICe XlHFpOvp60/g6MTuj74+ceNaJT+Z/laN50BStwSRTMlF4OwnT9S27bk2G w==; X-CSE-ConnectionGUID: alXfgK5cR+eMNq3o3xvsEg== X-CSE-MsgGUID: /teBOh71QEudHwkNSJJI+Q== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987797" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987797" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:14 -0700 X-CSE-ConnectionGUID: Uh0L9WY+TiKmrcte9q3wqw== X-CSE-MsgGUID: wLMn6yPPSX2VkhAe1uOhgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406104" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:12 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 02/26] eventdev: remove use of ethev queues define Date: Tue, 13 Aug 2024 16:59:39 +0100 Message-ID: <20240813160003.423935-3-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The max queues per port definition is intended for use for ethdevs, so it's use for a dummy array in eventdev is likely wrong. Since the array is intended to be for eventdev ports, use RTE_EVENT_MAX_PORTS_PER_DEV define instead. Signed-off-by: Bruce Richardson --- lib/eventdev/eventdev_private.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eventdev/eventdev_private.c b/lib/eventdev/eventdev_private.c index 017f97ccab..a84d0a46ac 100644 --- a/lib/eventdev/eventdev_private.c +++ b/lib/eventdev/eventdev_private.c @@ -99,7 +99,7 @@ dummy_event_port_profile_switch(__rte_unused void *port, __rte_unused uint8_t pr void event_dev_fp_ops_reset(struct rte_event_fp_ops *fp_op) { - static void *dummy_data[RTE_MAX_QUEUES_PER_PORT]; + static void *dummy_data[RTE_EVENT_MAX_PORTS_PER_DEV]; static const struct rte_event_fp_ops dummy = { .enqueue = dummy_event_enqueue, .enqueue_burst = dummy_event_enqueue_burst, From patchwork Tue Aug 13 15:59:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143125 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A56B0457BB; Wed, 14 Aug 2024 09:49:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4E86410E7; Wed, 14 Aug 2024 09:48:41 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id BEBE640650 for ; Tue, 13 Aug 2024 18:00:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564816; x=1755100816; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eaLBT7YPLflME8DQVeunhmRGBbn/xW704ox7JEU/ono=; b=KpCu+ZJd1CN89ie2VnWrB4uGzeY+ENzO77aO56k2/SCVtbYMTFFari0L pKfzoEPueCAC2chUlwmnP+inoF/LCwGR5tPgbK619JJ/1pHtxP5II+B4b tjmYvktl1NH88FtkEYyEhdnNTTjmR2B01lRt0+hfIuVSOvRJFguyFQCMz ZszOwD6zEs5RXrFHf0rsCmwJfi0fRX4RDDGV6XWuhGcrD60NYIx6S4Tmk Hj8ndkr+P5I8wDkgM7fzXFzxrirVMHsKN4lUiNsVyVsv/KRB+xE7WWwL/ Tr7BbDarrwJAICnQenCGmRejsmCSi+iqgQ5RtVXPyGOU6VFfk4j7JH+QR A==; X-CSE-ConnectionGUID: QFlOlApsSx6e+TF6PWXSRA== X-CSE-MsgGUID: zxQip5TyQQGmtjow91VAnw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987801" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987801" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:16 -0700 X-CSE-ConnectionGUID: PzHiGsqbSPa692iyU/MJeA== X-CSE-MsgGUID: 93Vdzl1vQwGKXznh3EhE4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406120" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:14 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 03/26] app/test-bbdev: remove use of ethdev queue count value Date: Tue, 13 Aug 2024 16:59:40 +0100 Message-ID: <20240813160003.423935-4-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace the use of RTE_MAX_QUEUES_PER_PORT, which is intended as an ethdev define, with the limit from the bbdev library. Signed-off-by: Bruce Richardson --- app/test-bbdev/test_bbdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c index 0bbce6ca92..2e626efd74 100644 --- a/app/test-bbdev/test_bbdev.c +++ b/app/test-bbdev/test_bbdev.c @@ -297,7 +297,7 @@ test_bbdev_configure_stop_queue(void) "Failed test for rte_bbdev_queue_stop " "invalid dev_id "); - TEST_ASSERT_FAIL(rte_bbdev_queue_stop(dev_id, RTE_MAX_QUEUES_PER_PORT), + TEST_ASSERT_FAIL(rte_bbdev_queue_stop(dev_id, RTE_BBDEV_DEFAULT_MAX_NB_QUEUES), "Failed test for rte_bbdev_queue_stop " "invalid queue_id "); @@ -1176,7 +1176,7 @@ test_bbdev_invalid_driver(void) "invalid dev_id "); TEST_ASSERT_FAIL(rte_bbdev_queue_info_get(dev_id, - RTE_MAX_QUEUES_PER_PORT, &qinfo), + RTE_BBDEV_DEFAULT_MAX_NB_QUEUES, &qinfo), "Failed test for rte_bbdev_info_get: " "invalid queue_id "); From patchwork Tue Aug 13 15:59:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143126 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 41795457BB; Wed, 14 Aug 2024 09:49:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2059C410ED; Wed, 14 Aug 2024 09:48:43 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 43B1D4026C for ; Tue, 13 Aug 2024 18:00:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564818; x=1755100818; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IbyyDSgzCZc/98M6qeRQyBuIHStC65Eo3GEfH4W0/TE=; b=XdY7m4W0D5uW0ZIYS52v02poljIPQrszS7HWgbuHJOZFnuVuXt7Eun/g WKfK/QPtnGt67oacwPHhjP807WVkg49BYgzqpf8PjbFQfhnrZqrgSuLFU sEXyZpgXSThsai4puPIFe5xiP1camQNGKd5qmYb/hPqndVz9DH/BOi2ud 24x4kZHMwQYY7Joo0cfmIY3VhRyBJIiIfHR3kNgNyr7hMhPKTjaZW1VKG azmYWrIfmUtipdZzGep6UenBYhFDQtCpDkkjGPgRRQHDuvzNt3vBDV1KA C+d/qXy+QUjq3iOql4SukfpT8DU6sxv9u3zzVbBIGlyinP1SGf2dOIMRj g==; X-CSE-ConnectionGUID: E+UHGi7URz+cYw7CZXgNyQ== X-CSE-MsgGUID: EbA6IhhHQ1W6ThFLqBtx/A== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987805" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987805" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:17 -0700 X-CSE-ConnectionGUID: b3adrs9vSG+W++7GnnnCGg== X-CSE-MsgGUID: xltLCo1yQuuRCFZcc9Ywuw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406136" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:15 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 04/26] config: add separate defines for max Rx and Tx queues Date: Tue, 13 Aug 2024 16:59:41 +0100 Message-ID: <20240813160003.423935-5-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rather than having a single define for maximum queues per ethernet port, we can set the max values for Rx queues and Tx queue independently. This allows future memory saving for apps which only need large numbers of Rx queues or only large numbers of Tx queues. Signed-off-by: Bruce Richardson --- config/rte_config.h | 2 ++ doc/guides/rel_notes/release_24_11.rst | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/config/rte_config.h b/config/rte_config.h index d67ff77c71..2c11b4eeec 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -65,6 +65,8 @@ /* ether defines */ #define RTE_MAX_QUEUES_PER_PORT 1024 +#define RTE_MAX_ETHPORT_RX_QUEUES 1024 +#define RTE_MAX_ETHPORT_TX_QUEUES 1024 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */ #define RTE_ETHDEV_RXTX_CALLBACKS 1 #define RTE_MAX_MULTI_HOST_CTRLS 4 diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 0ff70d9057..3725c056ba 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -55,6 +55,12 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **New configuration settings for Rx and Tx Ethernet Queues.** + + New defines have been added to DPDK to allow independent tracking of the maximum number of Rx and Tx queues. + These defines as ``RTE_MAX_ETHPORT_RX_QUEUES`` and ``RTE_MAX_ETHPORT_TX_QUEUES``, + and should be used in place of the older macro ``RTE_MAX_QUEUES_PER_PORT``. + Removed Items ------------- From patchwork Tue Aug 13 15:59:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143127 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C9651457BB; Wed, 14 Aug 2024 09:49:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BC82410FA; Wed, 14 Aug 2024 09:48:44 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id C524B40E15 for ; Tue, 13 Aug 2024 18:00:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564819; x=1755100819; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4a8jgN3AMGFE42EWF+IEqpYldxeKjIGCOkjeBWxmSAY=; b=GaKQyqtbN+9SKyK67aUMKsUXfdU/CiM7XcWKRMfsglR8JiG4ECNH7edv 0Rdrq0XCiVfct8K+kPToD/xw1D7qpvyYMxV1BstoZ/GAPwfJyg6aX20fR nBneUiqqoW7JPL2Udgn9CeaR8Xm94a+Eh+QsD5RHNrgg/HT/XSWyTVGHH Jm2P8L2dmMPPO6kG0m4ilYkMWq9a0ZW+DTybrqoOjqiL7WERViVtPKffe kFv6UAUsi9nwLiCkTj0tbUBE+dAwv1Sxy4h7WvYo9o7T0rwxruJiQhk8w mtG7S+6RCle6B9hqM8BsHCYRshw7cP2iKPH3+X5ddji4w48WaS1Hopybh g==; X-CSE-ConnectionGUID: fIP+goznRvOWVP41vS9/7w== X-CSE-MsgGUID: nLzhFB6lTGq2hYJXZLo8rA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987809" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987809" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:19 -0700 X-CSE-ConnectionGUID: aZW3hdFJSxeaI/ruuIfVYw== X-CSE-MsgGUID: BQLXxr66T3m+3Y2sSoGFsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406156" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:17 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 05/26] ethdev: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:42 +0100 Message-ID: <20240813160003.423935-6-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update library to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- lib/ethdev/ethdev_driver.h | 8 ++++---- lib/ethdev/ethdev_private.c | 24 ++++++++++++++---------- lib/ethdev/rte_ethdev.c | 16 +++++++--------- lib/ethdev/rte_ethdev.h | 18 +++++++++--------- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 883e59a927..51ec8e8395 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -84,12 +84,12 @@ struct __rte_cache_aligned rte_eth_dev { * User-supplied functions called from rx_burst to post-process * received packets before passing them to the user */ - RTE_ATOMIC(struct rte_eth_rxtx_callback *) post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; + RTE_ATOMIC(struct rte_eth_rxtx_callback *) post_rx_burst_cbs[RTE_MAX_ETHPORT_RX_QUEUES]; /** * User-supplied functions called from tx_burst to pre-process * received packets before passing them to the driver for transmission */ - RTE_ATOMIC(struct rte_eth_rxtx_callback *) pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; + RTE_ATOMIC(struct rte_eth_rxtx_callback *) pre_tx_burst_cbs[RTE_MAX_ETHPORT_TX_QUEUES]; enum rte_eth_dev_state state; /**< Flag indicating the port state */ void *security_ctx; /**< Context for security ops */ @@ -165,9 +165,9 @@ struct __rte_cache_aligned rte_eth_dev_data { flow_configured : 1; /** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */ - uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT]; + uint8_t rx_queue_state[RTE_MAX_ETHPORT_RX_QUEUES]; /** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */ - uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT]; + uint8_t tx_queue_state[RTE_MAX_ETHPORT_TX_QUEUES]; uint32_t dev_flags; /**< Capabilities */ int numa_node; /**< NUMA node connection */ diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c index 626524558a..e00530f370 100644 --- a/lib/ethdev/ethdev_private.c +++ b/lib/ethdev/ethdev_private.c @@ -190,7 +190,8 @@ struct dummy_queue { bool rx_warn_once; bool tx_warn_once; }; -static struct dummy_queue *dummy_queues_array[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; +static struct dummy_queue *dummy_rxq_array[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES]; +static struct dummy_queue *dummy_txq_array[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES]; static struct dummy_queue per_port_queues[RTE_MAX_ETHPORTS]; RTE_INIT(dummy_queue_init) { @@ -199,8 +200,10 @@ RTE_INIT(dummy_queue_init) for (port_id = 0; port_id < RTE_DIM(per_port_queues); port_id++) { unsigned int q; - for (q = 0; q < RTE_DIM(dummy_queues_array[port_id]); q++) - dummy_queues_array[port_id][q] = &per_port_queues[port_id]; + for (q = 0; q < RTE_DIM(dummy_rxq_array[port_id]); q++) + dummy_rxq_array[port_id][q] = &per_port_queues[port_id]; + for (q = 0; q < RTE_DIM(dummy_txq_array[port_id]); q++) + dummy_txq_array[port_id][q] = &per_port_queues[port_id]; } } @@ -245,7 +248,8 @@ dummy_eth_tx_burst(void *txq, void eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo) { - static RTE_ATOMIC(void *) dummy_data[RTE_MAX_QUEUES_PER_PORT]; + static RTE_ATOMIC(void *) dummy_rx_data[RTE_MAX_ETHPORT_RX_QUEUES]; + static RTE_ATOMIC(void *) dummy_tx_data[RTE_MAX_ETHPORT_TX_QUEUES]; uintptr_t port_id = fpo - rte_eth_fp_ops; per_port_queues[port_id].rx_warn_once = false; @@ -254,12 +258,12 @@ eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo) .rx_pkt_burst = dummy_eth_rx_burst, .tx_pkt_burst = dummy_eth_tx_burst, .rxq = { - .data = (void **)&dummy_queues_array[port_id], - .clbk = dummy_data, + .data = (void **)&dummy_rxq_array[port_id], + .clbk = dummy_rx_data, }, .txq = { - .data = (void **)&dummy_queues_array[port_id], - .clbk = dummy_data, + .data = (void **)&dummy_txq_array[port_id], + .clbk = dummy_tx_data, }, }; } @@ -420,7 +424,7 @@ eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) if (dev->data->rx_queues == NULL && nb_queues != 0) { /* first time configuration */ dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues", sizeof(dev->data->rx_queues[0]) * - RTE_MAX_QUEUES_PER_PORT, + RTE_MAX_ETHPORT_RX_QUEUES, RTE_CACHE_LINE_SIZE); if (dev->data->rx_queues == NULL) { dev->data->nb_rx_queues = 0; @@ -450,7 +454,7 @@ eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) if (dev->data->tx_queues == NULL && nb_queues != 0) { /* first time configuration */ dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues", sizeof(dev->data->tx_queues[0]) * - RTE_MAX_QUEUES_PER_PORT, + RTE_MAX_ETHPORT_TX_QUEUES, RTE_CACHE_LINE_SIZE); if (dev->data->tx_queues == NULL) { dev->data->nb_tx_queues = 0; diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index f1c658f49e..7999327beb 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -1367,18 +1367,18 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, nb_tx_q = RTE_ETH_DEV_FALLBACK_TX_NBQUEUES; } - if (nb_rx_q > RTE_MAX_QUEUES_PER_PORT) { + if (nb_rx_q > RTE_MAX_ETHPORT_RX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Number of Rx queues requested (%u) is greater than max supported(%d)", - nb_rx_q, RTE_MAX_QUEUES_PER_PORT); + nb_rx_q, RTE_MAX_ETHPORT_RX_QUEUES); ret = -EINVAL; goto rollback; } - if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) { + if (nb_tx_q > RTE_MAX_ETHPORT_TX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Number of Tx queues requested (%u) is greater than max supported(%d)", - nb_tx_q, RTE_MAX_QUEUES_PER_PORT); + nb_tx_q, RTE_MAX_ETHPORT_TX_QUEUES); ret = -EINVAL; goto rollback; } @@ -3811,11 +3811,9 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) return eth_err(port_id, diag); } - /* Maximum number of queues should be <= RTE_MAX_QUEUES_PER_PORT */ - dev_info->max_rx_queues = RTE_MIN(dev_info->max_rx_queues, - RTE_MAX_QUEUES_PER_PORT); - dev_info->max_tx_queues = RTE_MIN(dev_info->max_tx_queues, - RTE_MAX_QUEUES_PER_PORT); + /* Maximum number of queues should be <= RTE_MAX_ETHPORT_RX/TX_QUEUES */ + dev_info->max_rx_queues = RTE_MIN(dev_info->max_rx_queues, RTE_MAX_ETHPORT_RX_QUEUES); + dev_info->max_tx_queues = RTE_MIN(dev_info->max_tx_queues, RTE_MAX_ETHPORT_TX_QUEUES); dev_info->driver_name = dev->device->driver->name; dev_info->nb_rx_queues = dev->data->nb_rx_queues; diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 548fada1c7..06d6a3dcd0 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -6090,7 +6090,7 @@ rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id, #ifdef RTE_ETHDEV_DEBUG_RX if (port_id >= RTE_MAX_ETHPORTS || - queue_id >= RTE_MAX_QUEUES_PER_PORT) { + queue_id >= RTE_MAX_ETHPORT_RX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid port_id=%u or queue_id=%u", port_id, queue_id); @@ -6161,7 +6161,7 @@ rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id) #ifdef RTE_ETHDEV_DEBUG_RX if (port_id >= RTE_MAX_ETHPORTS || - queue_id >= RTE_MAX_QUEUES_PER_PORT) { + queue_id >= RTE_MAX_ETHPORT_RX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid port_id=%u or queue_id=%u", port_id, queue_id); @@ -6234,7 +6234,7 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id, #ifdef RTE_ETHDEV_DEBUG_RX if (port_id >= RTE_MAX_ETHPORTS || - queue_id >= RTE_MAX_QUEUES_PER_PORT) { + queue_id >= RTE_MAX_ETHPORT_RX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid port_id=%u or queue_id=%u", port_id, queue_id); @@ -6305,7 +6305,7 @@ static inline int rte_eth_tx_descriptor_status(uint16_t port_id, #ifdef RTE_ETHDEV_DEBUG_TX if (port_id >= RTE_MAX_ETHPORTS || - queue_id >= RTE_MAX_QUEUES_PER_PORT) { + queue_id >= RTE_MAX_ETHPORT_TX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid port_id=%u or queue_id=%u", port_id, queue_id); @@ -6429,7 +6429,7 @@ rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id, #ifdef RTE_ETHDEV_DEBUG_TX if (port_id >= RTE_MAX_ETHPORTS || - queue_id >= RTE_MAX_QUEUES_PER_PORT) { + queue_id >= RTE_MAX_ETHPORT_TX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid port_id=%u or queue_id=%u", port_id, queue_id); @@ -6539,7 +6539,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, #ifdef RTE_ETHDEV_DEBUG_TX if (port_id >= RTE_MAX_ETHPORTS || - queue_id >= RTE_MAX_QUEUES_PER_PORT) { + queue_id >= RTE_MAX_ETHPORT_TX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid port_id=%u or queue_id=%u", port_id, queue_id); @@ -6744,7 +6744,7 @@ rte_eth_recycle_mbufs(uint16_t rx_port_id, uint16_t rx_queue_id, #ifdef RTE_ETHDEV_DEBUG_TX if (tx_port_id >= RTE_MAX_ETHPORTS || - tx_queue_id >= RTE_MAX_QUEUES_PER_PORT) { + tx_queue_id >= RTE_MAX_ETHPORT_TX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid tx_port_id=%u or tx_queue_id=%u", tx_port_id, tx_queue_id); @@ -6770,7 +6770,7 @@ rte_eth_recycle_mbufs(uint16_t rx_port_id, uint16_t rx_queue_id, #ifdef RTE_ETHDEV_DEBUG_RX if (rx_port_id >= RTE_MAX_ETHPORTS || - rx_queue_id >= RTE_MAX_QUEUES_PER_PORT) { + rx_queue_id >= RTE_MAX_ETHPORT_RX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid rx_port_id=%u or rx_queue_id=%u", rx_port_id, rx_queue_id); return 0; @@ -6890,7 +6890,7 @@ rte_eth_tx_queue_count(uint16_t port_id, uint16_t queue_id) goto out; } - if (queue_id >= RTE_MAX_QUEUES_PER_PORT) { + if (queue_id >= RTE_MAX_ETHPORT_TX_QUEUES) { RTE_ETHDEV_LOG_LINE(ERR, "Invalid queue_id=%u for port_id=%u", queue_id, port_id); rc = -EINVAL; From patchwork Tue Aug 13 15:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143128 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EDD3D457BB; Wed, 14 Aug 2024 09:49:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C971B41101; Wed, 14 Aug 2024 09:48:45 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 4F2D240650 for ; Tue, 13 Aug 2024 18:00:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564821; x=1755100821; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6Zxi6Y44KV2J7X4U7FIZmKl3JIwCG/yHvD1nrlUgZDc=; b=UcFsJJg3HHcGkNsuxqKZ9sF82+xGgskduJoz31Zs/srd9KzC9qeTuQeo cE8P/FF6/fT2Ms7Jtjq7q1pcJVcPocsyf6Cq34HpaCoIWOipYs5fyHmN3 2FXX8JRbf61erClTHCMFukzPMUEsuQkQfZE/c2P42Rix2XCJiLYSf0YUX pAwklFZuU6qcIr+WTzf8mLbUh3yotZckQuW18UMWjUJuKCunq0pxI5WL0 QvjCiWtEs0ZOlbJjVPohFBXt32c7P5C5D2JlB5ekvVOHkOrRxYM9WuOcM g7x0lBkzTZOtTAOPtGqPTrgjH/Qwp/baVvBVScYkLk4Xc4qFcqVhFKApd Q==; X-CSE-ConnectionGUID: WJP03qmLRvm0QW8b6dgXeA== X-CSE-MsgGUID: GCXd9hYEQT+GedL8qsKIqg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987814" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987814" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:20 -0700 X-CSE-ConnectionGUID: jMuVm2/TQCiWyVAkPtOmhA== X-CSE-MsgGUID: Qam95EVATZanUtarAvvAaA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406177" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:18 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 06/26] bpf: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:43 +0100 Message-ID: <20240813160003.423935-7-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update library to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- lib/bpf/bpf_pkt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c index aaca935f2d..2c6b0e18f7 100644 --- a/lib/bpf/bpf_pkt.c +++ b/lib/bpf/bpf_pkt.c @@ -503,7 +503,8 @@ bpf_eth_elf_load(struct bpf_eth_cbh *cbh, uint16_t port, uint16_t queue, ftx = NULL; if (prm == NULL || rte_eth_dev_is_valid_port(port) == 0 || - queue >= RTE_MAX_QUEUES_PER_PORT) + queue >= (cbh->type == BPF_ETH_RX ? + RTE_MAX_ETHPORT_RX_QUEUES : RTE_MAX_ETHPORT_TX_QUEUES)) return -EINVAL; if (cbh->type == BPF_ETH_RX) From patchwork Tue Aug 13 15:59:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143129 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 11625457BB; Wed, 14 Aug 2024 09:49:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 258484111C; Wed, 14 Aug 2024 09:48:47 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id BF1144026C for ; Tue, 13 Aug 2024 18:00:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564822; x=1755100822; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qiN5HtTIt5af2brKsa22Lt0vF/KX73ZMLN8YRwhKfQ8=; b=O7JP8RMKUj8SdTKIvMHAG9bTYyBI9gwXfNuPUe61zbKyhpFpVbx7ZBKv WAr50/GGKY30GhRBbIqwLKzrCl93oeYthk04zGiaZaIy7imuMWITr/TyF 5WjylM0M5pZ2WYt8T26+r7ep5jkA+oEXbsXvp9enMBM/q2e5IcvRcPF8l W1wRImy1C+T3Nb00gQ5iz0LM1QCWOFginKzqTigCzLzLVWFzxH35nbfO1 irPfsRxErEEqHsvju5Z8MeCXwM+qgL8SPFTuE0MyeiaviSortgzH0cMYb G2MsHh387YgjpX+lnElffaHaNLiKGomViKGV7hb+mTzmrqo6ejAoMUOGp A==; X-CSE-ConnectionGUID: sWh+x0OhQCWvTGgGCKyipQ== X-CSE-MsgGUID: 2EpwpAdOThewPDaSbNop5g== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987819" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987819" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:22 -0700 X-CSE-ConnectionGUID: YsUcF74cQ76/s9X15ex/yQ== X-CSE-MsgGUID: 3FcbvhOjQ52GqvGUcg3VqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406198" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:20 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 07/26] latencystats: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:44 +0100 Message-ID: <20240813160003.423935-8-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update library to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- lib/latencystats/rte_latencystats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c index 6a261309f9..696bbab3a4 100644 --- a/lib/latencystats/rte_latencystats.c +++ b/lib/latencystats/rte_latencystats.c @@ -60,8 +60,8 @@ struct rxtx_cbs { const struct rte_eth_rxtx_callback *cb; }; -static struct rxtx_cbs rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; -static struct rxtx_cbs tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; +static struct rxtx_cbs rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES]; +static struct rxtx_cbs tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES]; struct latency_stats_nameoff { char name[RTE_ETH_XSTATS_NAME_SIZE]; From patchwork Tue Aug 13 15:59:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143130 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C08ED457BB; Wed, 14 Aug 2024 09:49:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8482D41140; Wed, 14 Aug 2024 09:48:48 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 4B0694026C for ; Tue, 13 Aug 2024 18:00:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564824; x=1755100824; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B6YF2pdG0e2o9qqt+Vsbew5TfMsVHh5z+GVt+Vp6Oao=; b=D5t+VIdd/vO79G3SOQCpoQIg6m8lo80BOYVicnnk/0ygJy01h1bRsfYi 9pGBsCVe1e8rs3xFBidB3C67ugNctvcf0666/SiawDL+2WvKVqQC9xOnR thcz3zugHbp8liU9QkxW1M4eO0ImQ9+ad1Dnht5imRMnaHkIS9ckE9GCL YQSAYAnlnH5MUs6bW5yzXjVDQtNBG/9m+/1bz7/BlV4Zw+NJzTOqPs47z UkQxsykvEHAT1JEymPnrU8ekaBy//6cDG63pBA6nM56M9nHd3WzKYCgNT TV4/xN8TYWdYMPZnplv4n5YNG2nzYTflHOaQ3HIDPoIh3vwsYnvLszrCk A==; X-CSE-ConnectionGUID: UA5qBV7yQWqQ3Wr54CGZZA== X-CSE-MsgGUID: BQSo2pOXSfuq8qcq0qMcMg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987824" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987824" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:23 -0700 X-CSE-ConnectionGUID: SyzkbqzoS/2IccvkdlZmuA== X-CSE-MsgGUID: sZRRhYvFQhO1tNeA0VaxuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406214" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:21 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 08/26] pdump: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:45 +0100 Message-ID: <20240813160003.423935-9-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update library to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- lib/pdump/rte_pdump.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c index 679c3dd0b5..0e0f1088f5 100644 --- a/lib/pdump/rte_pdump.c +++ b/lib/pdump/rte_pdump.c @@ -61,8 +61,8 @@ static struct pdump_rxtx_cbs { const struct rte_bpf *filter; enum pdump_version ver; uint32_t snaplen; -} rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT], -tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; +} rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES], +tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES]; /* @@ -72,8 +72,8 @@ tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; */ static const char MZ_RTE_PDUMP_STATS[] = "rte_pdump_stats"; static struct { - struct rte_pdump_stats rx[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; - struct rte_pdump_stats tx[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; + struct rte_pdump_stats rx[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES]; + struct rte_pdump_stats tx[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES]; const struct rte_memzone *mz; } *pdump_stats; @@ -708,8 +708,8 @@ rte_pdump_disable_by_deviceid(char *device_id, uint16_t queue, } static void -pdump_sum_stats(uint16_t port, uint16_t nq, - struct rte_pdump_stats stats[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT], +pdump_sum_stats(uint16_t nq, + struct rte_pdump_stats *stats, struct rte_pdump_stats *total) { uint64_t *sum = (uint64_t *)total; @@ -718,7 +718,7 @@ pdump_sum_stats(uint16_t port, uint16_t nq, uint16_t qid; for (qid = 0; qid < nq; qid++) { - const RTE_ATOMIC(uint64_t) *perq = (const uint64_t __rte_atomic *)&stats[port][qid]; + const RTE_ATOMIC(uint64_t) *perq = (const uint64_t __rte_atomic *)&stats[qid]; for (i = 0; i < sizeof(*total) / sizeof(uint64_t); i++) { val = rte_atomic_load_explicit(&perq[i], rte_memory_order_relaxed); @@ -762,7 +762,7 @@ rte_pdump_stats(uint16_t port, struct rte_pdump_stats *stats) pdump_stats = mz->addr; } - pdump_sum_stats(port, dev_info.nb_rx_queues, pdump_stats->rx, stats); - pdump_sum_stats(port, dev_info.nb_tx_queues, pdump_stats->tx, stats); + pdump_sum_stats(dev_info.nb_rx_queues, pdump_stats->rx[port], stats); + pdump_sum_stats(dev_info.nb_tx_queues, pdump_stats->tx[port], stats); return 0; } From patchwork Tue Aug 13 15:59:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143131 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82F19457BB; Wed, 14 Aug 2024 09:49:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFE9A410FD; Wed, 14 Aug 2024 09:48:49 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id E63F74065B for ; Tue, 13 Aug 2024 18:00:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564825; x=1755100825; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AEdfU9AujAzeRIR76Xc6yzaERVTrXzbFNX6eRhTuL+c=; b=kgfT61mQSGS+R8QZKCw2BYSYigIOXBKcRjRFnbajN8Pv45ve2eLEr7XK gov7+/YPZLKKXUOvdfi1S/CUBSsLwDM4wgUseGEOwGmDJi7T6ZWw3nss3 95GM+30gYdsU8b5zB9uQGwO/u69YMXvDSWEIFuUEPWXZ0lP7S8FLPwdxA sy0agiwxoZBrbiaX0s8WcIYtTt6hfsPO7bWtSLg7xjoOvohzCEA2PWkKS Xj01eFLtEW3JfPfWQK9sAdylNUr4lucttySFchXicwqvcjSFXbV72ILY0 HWpYWH6VjELMiiOev+ld044oCkQs70XvcN1O76FkQgLCR4B+iArzwFaLA w==; X-CSE-ConnectionGUID: mZZkNY+ATTG6M5ePUfe5iQ== X-CSE-MsgGUID: etI6OdagRka2vpJNM7W5Dw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987830" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987830" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:25 -0700 X-CSE-ConnectionGUID: H1QylbWGQEyPEIoZfDSPZQ== X-CSE-MsgGUID: 3WeWqds0RkWry09zm+Bh5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406242" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 09/26] power: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:46 +0100 Message-ID: <20240813160003.423935-10-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update library to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- lib/power/rte_power_pmd_mgmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c index b1c18a5f56..7fc87b22c1 100644 --- a/lib/power/rte_power_pmd_mgmt.c +++ b/lib/power/rte_power_pmd_mgmt.c @@ -494,7 +494,7 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); - if (queue_id >= RTE_MAX_QUEUES_PER_PORT || lcore_id >= RTE_MAX_LCORE) { + if (queue_id >= RTE_MAX_ETHPORT_RX_QUEUES || lcore_id >= RTE_MAX_LCORE) { ret = -EINVAL; goto end; } @@ -608,7 +608,7 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); - if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_QUEUES_PER_PORT) + if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_ETHPORT_RX_QUEUES) return -EINVAL; /* check if the queue is stopped */ From patchwork Tue Aug 13 15:59:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143132 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 23F7B457BB; Wed, 14 Aug 2024 09:49:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86C0C411F3; Wed, 14 Aug 2024 09:48:51 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 6A92F4065B for ; Tue, 13 Aug 2024 18:00:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564827; x=1755100827; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1+OkBts6jOeLNZV2dzPN18Q+rHlr1In5yrCxxZuOlbg=; b=Uv8xWIK+OaOgyakQUksFBR44JixyrHAEziqx0R1UyBC9sigLHO6YCZcw E8gGVppAdqy4JDDgLP7zfx6AkyU1ojtEY6QP4UoouLFE2zX4QqXlkSs06 5BSFrxydiCIlGq+lz2+Zy1RTZh9NBxePHThEX+5Tazm6zXMW9RqJZrTGl L/kJEQA89li5xYwfxl4nNM3fP1e0A9aWVkbQQ0eglpnLXX92QoZrRCz8v NOQ3q7W/XflfDm2mypY4UvbLO0IRnzzJKgEGEPsQ7XciGM8E1SRmePtaH XmP2WpFOkOO2Gn5C1UIHLDg1HVcYKonux/m/boHAPDCGjwPiANpHIHbg+ A==; X-CSE-ConnectionGUID: EH1Z/jwAQXCHhDfqj3Neyg== X-CSE-MsgGUID: E88SJlsnQvSgPO/2WomTYw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987837" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987837" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:26 -0700 X-CSE-ConnectionGUID: f/6nYLl7SpCnqMybnG+5Tg== X-CSE-MsgGUID: 5v2A+1RaT+GR6OabC3yjyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406271" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:24 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 10/26] net/af_xdp: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:47 +0100 Message-ID: <20240813160003.423935-11-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 0bc0d9a55a..1cc8b40acc 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -185,7 +185,7 @@ struct pmd_internals { }; struct pmd_process_private { - int rxq_xsk_fds[RTE_MAX_QUEUES_PER_PORT]; + int rxq_xsk_fds[RTE_MAX_ETHPORT_RX_QUEUES]; }; #define ETH_AF_XDP_IFACE_ARG "iface" From patchwork Tue Aug 13 15:59:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143133 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1F007457BB; Wed, 14 Aug 2024 09:49:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 918994161A; Wed, 14 Aug 2024 09:48:53 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 05E9740650 for ; Tue, 13 Aug 2024 18:00:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564828; x=1755100828; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vSv4ONvVarrO9dcCpr3scHMazyIpxUT9YUyZ3jNf07g=; b=XgVhEZm8WCFippYG4iPyzdC/vtzIOKkOyrIxBOydOziiQCS3sAEN7/oS 6aUdIU49Hs5TFCEcWDR4YDay2EKZxLV8XTtMf7D3q4QMSXmcpEDewvGyL l4oH9ILnulYjhm4Xv35+ZOLMWleu7YqyNMeLRLwKtYX5r6p5+hX5LtGHn 6OIYi5XFupWedQihKVO2MHdtNQ4qgxKhHgyf4alJ+TrUS3bIdJjb0Mrrc 2hvVAHvDlpaxEQBt1StEgL0Yk0mvMMys57foiq4mb2QXF/Acfyg2kLzyI YLqRdw6Dg8GyBoDaYUJmTiwu/jlbeBacyFyeBDFXiNpKOMnZ73kCTe8l+ w==; X-CSE-ConnectionGUID: KMO8ShV0S3KDNTvSDBDhTg== X-CSE-MsgGUID: qyB/IxLzQFeqGIfuxrf0Jg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987842" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987842" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:28 -0700 X-CSE-ConnectionGUID: ioXj2aHgRGejXe67RJQUnw== X-CSE-MsgGUID: KX4MfZxZQbSLZDLIq6ID6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406313" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:26 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 11/26] net/cnxk: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:48 +0100 Message-ID: <20240813160003.423935-12-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index b1093dd584..b587e32e24 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -16,8 +16,8 @@ cnxk_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) devinfo->min_rx_bufsize = NIX_MIN_HW_FRS + RTE_ETHER_CRC_LEN; devinfo->max_rx_pktlen = max_rx_pktlen; - devinfo->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; - devinfo->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; + devinfo->max_rx_queues = RTE_MAX_ETHPORT_RX_QUEUES; + devinfo->max_tx_queues = RTE_MAX_ETHPORT_TX_QUEUES; devinfo->max_mac_addrs = dev->max_mac_entries; devinfo->max_vfs = pci_dev->max_vfs; devinfo->max_mtu = devinfo->max_rx_pktlen - CNXK_NIX_L2_OVERHEAD; From patchwork Tue Aug 13 15:59:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143134 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3BCB2457BB; Wed, 14 Aug 2024 09:49:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 159D24275B; Wed, 14 Aug 2024 09:48:55 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 9DC254065B for ; Tue, 13 Aug 2024 18:00:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564830; x=1755100830; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1w8ZNS/qn9LHCSFOSK8hNbGd4zhAaqqYB6JX39NsPWE=; b=W6jCRlEYAk99q2Pe15dPCG77SkchyyQYQKrjvlEPZhnG0Vwd9cv4wQBo g8PCdjyXJH3z5Ztr6adEvYNtxxFE/Y0sjc4EF0tkYHbpu1Egb1jThveFc s5sbotLVdV2UlMBX/pXqm+1yfHV3TgxYWGM6LThoYaLmWY146iaQPSoz6 POsao3R7OS/DAMiC9GE65zcg4tvuVvOneP6bqvfWQWcsyD0r7dBCRSA5u +RDlz9Kg5j4oTuL7tmmyU0R6Ipp3tmIA4GbWfRuY1kArsOp43LggidxLg gqlLJiyzRwL6JDClBa5V+PtYv6Z/H5MWiVkCeuCQW4OfxIUUNeJsfH5n7 A==; X-CSE-ConnectionGUID: DUmwihEjTXGBZu/pJ7FdMQ== X-CSE-MsgGUID: AvEoYMuZSGyeEISxhU873g== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987847" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987847" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:29 -0700 X-CSE-ConnectionGUID: 0uZdI+M3QJymeyu9ethVeQ== X-CSE-MsgGUID: kC7XKIKRRhOaf5KM++jpIA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406357" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:28 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 12/26] net/failsafe: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:49 +0100 Message-ID: <20240813160003.423935-13-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:34 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/failsafe/failsafe_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 9c013e0419..12a01f5543 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -1205,8 +1205,8 @@ fs_dev_infos_get(struct rte_eth_dev *dev, infos->min_mtu = RTE_ETHER_MIN_MTU; infos->max_mtu = UINT16_MAX; infos->max_rx_pktlen = UINT32_MAX; - infos->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; - infos->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; + infos->max_rx_queues = RTE_MAX_ETHPORT_RX_QUEUES; + infos->max_tx_queues = RTE_MAX_ETHPORT_TX_QUEUES; infos->max_mac_addrs = FAILSAFE_MAX_ETHADDR; infos->max_hash_mac_addrs = UINT32_MAX; infos->max_vfs = UINT16_MAX; From patchwork Tue Aug 13 15:59:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143135 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E70ED457BB; Wed, 14 Aug 2024 09:50:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B5D54278C; Wed, 14 Aug 2024 09:48:56 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 38F634026C for ; Tue, 13 Aug 2024 18:00:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564832; x=1755100832; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=12bAsIkudbyK9wJGq4mXNPlj3ZV9l7o0z5BgN0wEq3Q=; b=UFGJ1kgzO005gkMaBLzTbBVTdHpOGwKfT0mqiDS3eaWZXe0iu8jb2gtK Qn5ksS8f+yzBh6APsN4+qk7SBfc5FfLK0hCTd98xx20CK0wIo4DbjD2AK vj/2s1o+6L9rkH7iSoJd4HhJqRrAljYi+10altIozmTIBfxyzEv8QsRm7 Vh4RrrKjcgp4ApeqObXAshO9xm7jWvusgL83Jksy/0piFivPCWXvGi9ej g22PkQTSjnaxCTUZmZWX3Mq3ZkwKSGqM+EGBWzRgPsk0gEqIqgvRMlZ0v 6cXFsSHZC2DSS51VlaSgLpirMoho/Jr4M5V7jfFRgLcj8jPhGDKZ4IE1I w==; X-CSE-ConnectionGUID: +OfykwqCQXusyIRWmeur0g== X-CSE-MsgGUID: z/q099LxS7u8jEb7KmErHQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987851" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987851" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:31 -0700 X-CSE-ConnectionGUID: L8Y8n31hTESWXOHYUFGecw== X-CSE-MsgGUID: stQqqbJ3RrGxTi8RO6xYgQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406406" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:29 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 13/26] net/hns3: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:50 +0100 Message-ID: <20240813160003.423935-14-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/hns3/hns3_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_tm.c b/drivers/net/hns3/hns3_tm.c index 92a668538f..713635afd0 100644 --- a/drivers/net/hns3/hns3_tm.c +++ b/drivers/net/hns3/hns3_tm.c @@ -21,7 +21,7 @@ hns3_tm_max_tx_queues_get(struct rte_eth_dev *dev) memset(&dev_info, 0, sizeof(dev_info)); (void)hns3_dev_infos_get(dev, &dev_info); - return RTE_MIN(dev_info.max_tx_queues, RTE_MAX_QUEUES_PER_PORT); + return RTE_MIN(dev_info.max_tx_queues, RTE_MAX_ETHPORT_TX_QUEUES); } void From patchwork Tue Aug 13 15:59:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143136 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D3375457BB; Wed, 14 Aug 2024 09:50:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05E7E4278E; Wed, 14 Aug 2024 09:48:58 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id AA1A440A84 for ; Tue, 13 Aug 2024 18:00:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564833; x=1755100833; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=38cpd3t0NoF+Jf+A4bQsThXnsgSwYkkU5VlVXQvWsYA=; b=WNXlCsXpsPagKgfRbiNGR9WzAQR2VXgptKPlUuWKduz3KlK4rzUMIWas aS92ldT+HbW6WP2Si8fHF7uwM4bGboe/Dzb9asHvrNcv2ktziADztgYaD 8BPchHl7TT0Yq6u9aZMamu0+1lMYXmmAAFDN4+VoAoIy4UK2+4KFNyJCg cTxbUZFD9/u7i+GelJlHLJOTefrLn07Qqoc1v/SV+ZpM5GKH0sKdcZiFT H04PHbKxD+UAtHD64Yt6XVhYwKl6U/WjMRv+p9kdP8Z44p0yZHuaB9mO0 rGVrc5+bwEpG1VzLQKbGH1pLJLhywZW1czqS+F+29vMkTllD/zi5rm0bz g==; X-CSE-ConnectionGUID: XLiB+gDiRz2OtmtKM9GwIg== X-CSE-MsgGUID: JSxsG4tuS9eqVRy7dy84Cg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987855" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987855" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:32 -0700 X-CSE-ConnectionGUID: mVPZewQpQWeN4Ox63Vi9Ow== X-CSE-MsgGUID: 2ANwvzntSma5z2V14JO+iA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406438" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:31 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 14/26] net/mlx5: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:51 +0100 Message-ID: <20240813160003.423935-15-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/mlx5/mlx5_flow.c | 2 +- drivers/net/mlx5/mlx5_flow_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 72fb3a55ba..3eaea66920 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -7344,7 +7344,7 @@ flow_legacy_list_create(struct rte_eth_dev *dev, enum mlx5_flow_type type, struct rte_flow_item items[MLX5_MAX_SPLIT_ITEMS]; uint8_t buffer[2048]; } items_tx; - struct mlx5_rte_flow_item_sq sq_specs[RTE_MAX_QUEUES_PER_PORT]; + struct mlx5_rte_flow_item_sq sq_specs[RTE_MAX_ETHPORT_RX_QUEUES]; struct mlx5_flow_expand_rss *buf = &expand_buffer.buf; struct mlx5_flow_rss_desc *rss_desc; const struct rte_flow_action *p_actions_rx; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index d243b59b71..f9514ddd4f 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -10978,7 +10978,7 @@ flow_hw_create_ctrl_rx_rss_template(struct rte_eth_dev *dev, struct rte_flow_actions_template_attr attr = { .ingress = 1, }; - uint16_t queue[RTE_MAX_QUEUES_PER_PORT]; + uint16_t queue[RTE_MAX_ETHPORT_RX_QUEUES]; struct rte_flow_action_rss rss_conf = { .func = RTE_ETH_HASH_FUNCTION_DEFAULT, .level = 0, From patchwork Tue Aug 13 15:59:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143137 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 63C98457BB; Wed, 14 Aug 2024 09:50:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D17842792; Wed, 14 Aug 2024 09:48:59 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 388E04026C for ; Tue, 13 Aug 2024 18:00:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564835; x=1755100835; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uYe3fbTKtoRviIkBpr7x/0BH+cGV0icFf4gXRPwk4Fw=; b=VqL6u+2mDAKGbW2DHm47sqmRs5tTu6czeGD32wK54n+w8KLQMkGOmD8K cZ+VPnJRjJ+vJ62TKg/ZkrAQelZaDNjv3D/xFCFWVEZqe/JfK6eSrDDO7 3Z3rC7HgSAiJp4/++pLF7QaJw6w12Vb9MeipT764OBEeGF4BSByMosfce 2WBrQvIlPR11J6PaZ6p30BpUzWg4THLxy3qxStAhHXdfIP4b+9I/7gFT/ QgDP2JBdwnc0bbHwYmJqZB91FHz5yFOnz8Ed6+RTbvvzDCgHTX/TBOp7U KplCtcN4RVHQt24psENhbJafKKz44fgYXdwHmwioQulJClTQTVG/ANy7/ g==; X-CSE-ConnectionGUID: 2AUeXVRiR8aMdz/s3QKfTQ== X-CSE-MsgGUID: RsR/PSqDT4y358Z6xQ+eTw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987861" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987861" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:34 -0700 X-CSE-ConnectionGUID: f776EkSHQWKBya/779dlfA== X-CSE-MsgGUID: McTrpzNMRAOX3GTamKiSgA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406476" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:32 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 15/26] net/null: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:52 +0100 Message-ID: <20240813160003.423935-16-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/null/rte_eth_null.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index f4ed3b8a7f..30185e417a 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -53,8 +53,8 @@ struct pmd_internals { unsigned int no_rx; uint16_t port_id; - struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT]; - struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT]; + struct null_queue rx_null_queues[RTE_MAX_ETHPORT_RX_QUEUES]; + struct null_queue tx_null_queues[RTE_MAX_ETHPORT_TX_QUEUES]; struct rte_ether_addr eth_addr; /** Bit mask of RSS offloads, the bit offset also means flow type */ From patchwork Tue Aug 13 15:59:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143138 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF8C9457BB; Wed, 14 Aug 2024 09:50:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6E0042791; Wed, 14 Aug 2024 09:49:00 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id DE24F40E01 for ; Tue, 13 Aug 2024 18:00:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564836; x=1755100836; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YfRpC5PdG4qsuFU6xKhx9YflHX43OVb5Vhy6tYj25FY=; b=QVV7C+XNtX22ibCde2duC7/q4u33h+L2Zb62Db9h1qFIM1ygUkfTmKNZ Aw79mGuVKcXpaksBLiqh0Yh+4EFwX7bPocGvH0tmc8MFYwRJ33DBkZjED sJfBNwF3qT5Rbq7hOIG4tGhO9JnHR5/dZmtLjw5c7vr4nFoDF2/AVC8pr oboVVoKfGPdRynrBOD1UKrfW5wj/ra+12vFZUf7JL0Z2IXAUBAXT80HAx gL893TSPOFgo/ZMzPPF3w0bfb4y7dj1ZpJpUCGrgp8i7KErnAyQkecrjn dXD4xy1ZU3xMYWLjnvdWQgy+W5Or/iSnlWu4FzPYSBjlx8mk04ZG8gFAI w==; X-CSE-ConnectionGUID: jG33DwsmSR2dkGJXIe72JQ== X-CSE-MsgGUID: 8NZetWDqR664qfYSkS4jvw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987865" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987865" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:36 -0700 X-CSE-ConnectionGUID: mFLfCb3sQ+Gh9H0LjRmGDQ== X-CSE-MsgGUID: LKla0710SXi40pt/6Bhi3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406513" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:34 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 16/26] net/sfc: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:53 +0100 Message-ID: <20240813160003.423935-17-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/sfc/sfc_sw_stats.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c index 3ae5023b6f..27892e7d4f 100644 --- a/drivers/net/sfc/sfc_sw_stats.c +++ b/drivers/net/sfc/sfc_sw_stats.c @@ -825,9 +825,11 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa) struct rte_bitmap **queues_bitmap = &sa->sw_stats.queues_bitmap; void **queues_bitmap_mem = &sa->sw_stats.queues_bitmap_mem; uint32_t bmp_size; + uint32_t max_queues = RTE_MAX(RTE_MAX_ETHPORT_RX_QUEUES, + RTE_MAX_ETHPORT_TX_QUEUES); int rc; - bmp_size = rte_bitmap_get_memory_footprint(RTE_MAX_QUEUES_PER_PORT); + bmp_size = rte_bitmap_get_memory_footprint(max_queues); *queues_bitmap_mem = NULL; *queues_bitmap = NULL; @@ -836,7 +838,7 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa) if (*queues_bitmap_mem == NULL) return ENOMEM; - *queues_bitmap = rte_bitmap_init(RTE_MAX_QUEUES_PER_PORT, + *queues_bitmap = rte_bitmap_init(max_queues, *queues_bitmap_mem, bmp_size); if (*queues_bitmap == NULL) { rc = EINVAL; From patchwork Tue Aug 13 15:59:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143139 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5FE19457BB; Wed, 14 Aug 2024 09:50:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4EDED4279B; Wed, 14 Aug 2024 09:49:02 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 77C1F40650 for ; Tue, 13 Aug 2024 18:00:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564838; x=1755100838; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vAnkbV8h1KLVNBLVoLmiGWXNBlOPXdmY+R9t+Y3AOGg=; b=YCLwykI3kPLed4xUJ3PZg4RRC8Wvz7hhOgzcbwMibyFeCc9Gz7dbjiby L72fMbGdz0DxcPCchqaDj+89cwBIe9C2qKFgTCM1iEsK+5k9D1lwSYue+ olaSR7O0kJAAQGhlzVFvseN1OmXXo/ZVFGTvGVe1ZomNsg19Yqj0Aemlj fxPUANARuTCKXOT8GbyM0pIMBvlec7/U6lHwX8ra4NN36SpiCm0utQSyC 2YFJc7JiKhr+NSdd4Gti9fXZBrhdJeVefkSNh6r4gyn/18ZjDnrULVYp6 cGP8onBlMQth5sms94UOQ6Dr+Y/cMK2QGbqF/Pn1RnLM09fF4siLlDAb0 Q==; X-CSE-ConnectionGUID: SFa+X4PyTkO2dbwgGtDszQ== X-CSE-MsgGUID: zAOlJfDATYKhMSwCxDQHwg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987869" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987869" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:37 -0700 X-CSE-ConnectionGUID: EmIi0toPQ/i427EQSEpQzw== X-CSE-MsgGUID: o4GLq1MAT86JLP/A51UNIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406554" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:35 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 17/26] net/thunderx: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:54 +0100 Message-ID: <20240813160003.423935-18-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/thunderx/nicvf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index 609d95dcfa..8c8bec885f 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -907,7 +907,7 @@ nicvf_configure_rss_reta(struct rte_eth_dev *dev) { struct nicvf *nic = nicvf_pmd_priv(dev); unsigned int idx, qmap_size; - uint8_t qmap[RTE_MAX_QUEUES_PER_PORT]; + uint8_t qmap[RTE_MAX_ETHPORT_RX_QUEUES]; uint8_t default_reta[NIC_MAX_RSS_IDR_TBL_SIZE]; if (nic->cpi_alg != CPI_ALG_NONE) From patchwork Tue Aug 13 15:59:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143140 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 95EBB457BB; Wed, 14 Aug 2024 09:50:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B2B7427A1; Wed, 14 Aug 2024 09:49:03 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id ECAB84026C for ; Tue, 13 Aug 2024 18:00:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564839; x=1755100839; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=90InAMdvasV1KnSx1C55buG50wDA5L95Srns7CXBVbo=; b=l/+PsrxTQbrz1XyjOfUeqTYdB+/1bvde9Z8IWXTjQbJ9s8zVikCqgTbX I6+LQQqvHf9vV2GMP8tupaLkhv85TbVjoiNFr4QoK4veKa4wJKGdkSSKj wUAlpxZRgK6y1q6jlMi0PiMGhAbE82bWOHs/eSYcTzuXzpIWXbywSyxqk wllgzwJD/MkS5DCbL9hRAkwHpFWuBlisGq0tKK+lHh+6eDomFV/V8elue cyorbFW8x5ikV1U5zDHjJY38F86l8JPSBPTahs3uvmfbIaDuPEtoEv4/s b3w3wa8INc+43rPvt1D7UI3RfOGnKTziG5+D+2NEAoVreoJxswmA76nxK A==; X-CSE-ConnectionGUID: nPri3YFtRnmiJNgdSfMUbA== X-CSE-MsgGUID: DJ4J5Cw0TDSqmeRWm2/wrA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987873" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987873" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:39 -0700 X-CSE-ConnectionGUID: UFfw5t6RTvymqfati4tS9g== X-CSE-MsgGUID: ukpCkPmmT/ifZ+EevlNWkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406568" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:37 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 18/26] net/vhost: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:55 +0100 Message-ID: <20240813160003.423935-19-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update driver to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- drivers/net/vhost/rte_eth_vhost.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 21bbb008e0..78bc755109 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -117,8 +117,8 @@ static struct rte_eth_link pmd_link = { struct rte_vhost_vring_state { rte_spinlock_t lock; - bool cur[RTE_MAX_QUEUES_PER_PORT * 2]; - bool seen[RTE_MAX_QUEUES_PER_PORT * 2]; + bool cur[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES]; + bool seen[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES]; unsigned int index; unsigned int max_vring; }; @@ -1648,7 +1648,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) if (rte_kvargs_count(kvlist, ETH_VHOST_QUEUES_ARG) == 1) { ret = rte_kvargs_process(kvlist, ETH_VHOST_QUEUES_ARG, &open_int, &queues); - if (ret < 0 || queues > RTE_MAX_QUEUES_PER_PORT) + if (ret < 0 || queues > RTE_MAX_ETHPORT_RX_QUEUES + || queues > RTE_MAX_ETHPORT_TX_QUEUES) goto out_free; } else From patchwork Tue Aug 13 15:59:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143141 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C608D457BB; Wed, 14 Aug 2024 09:50:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABD2742794; Wed, 14 Aug 2024 09:49:04 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 7B3BB4026C for ; Tue, 13 Aug 2024 18:00:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564841; x=1755100841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1SCgeC5P2/LXeUjvatAP/7M6pO6vVMWpLxaL3qEYY1M=; b=HTZEI763wfLvaQUKW1KyQD5gqoZqTUXOwMhBdNmLmePZCyyqKl6s5lrH /ylYFH8MzULYbh/qXHI9x2mDrkyNRzkZSQdvIj5eMLy0Vr0MoxAy2cNel Zz4pXI2fyF6WFIl9Qo2etQURKgzp3Y5IWBBRiTCTMhKfbCL6mCkBz3JLd mvwFqXmdcMavGc6b/L/u0lOgJRz4AHBnXti3Q+WPLUS6hogQH6XC/D2YL dxAs/am8E1SgI5KzeCmszmyhbwVfC95dfuh8MUiJ8NL50ovPzF61mMTQD QWTzkVfSgvxzllNO5j30J6CCV30ud8iXBDafCJ2daObkUWotVzZcc/UZO w==; X-CSE-ConnectionGUID: M9umdCEBQiuZxihObhfgBA== X-CSE-MsgGUID: nnrGON0lQQSjQJBZCo3ZjA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987877" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987877" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:40 -0700 X-CSE-ConnectionGUID: /ANH2LDySOK3JN6qMw8KwA== X-CSE-MsgGUID: brBiJXqyRlqnhnURN8t0cQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406591" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:38 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 19/26] app/dumpcap: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:56 +0100 Message-ID: <20240813160003.423935-20-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update app to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- app/dumpcap/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index 6feb8f5672..fbaaa4fe3f 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -95,7 +95,7 @@ struct interface { struct rte_bpf_prm *bpf_prm; char name[RTE_ETH_NAME_MAX_LEN]; - struct rte_rxtx_callback *rx_cb[RTE_MAX_QUEUES_PER_PORT]; + struct rte_rxtx_callback *rx_cb[RTE_MAX_ETHPORT_RX_QUEUES]; const char *ifname; const char *ifdescr; }; From patchwork Tue Aug 13 15:59:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143142 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A93BC457BB; Wed, 14 Aug 2024 09:50:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E9D9F427AA; Wed, 14 Aug 2024 09:49:05 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 03F6E4026C for ; Tue, 13 Aug 2024 18:00:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564842; x=1755100842; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BYZjZsOQso2TsOSzgi+tAHc9iGs26FKv0IVwN407a/Y=; b=P4yfuyfSzaS/AiZsd8mC94Cjm+f42UM8oBZ9oXYZCyOZtQyAmsRDPlLu ESN+2V1e45F9Sn4cgHIhO5OruYx6sRo6tN+7jVRrl3ra1LDAFRTSRi1Z3 jsWehMkM6d7VnOumQBgOqSoSrAysT0RIUjCWdcnZRPqJYci9yNITBg5sz hU7uMYuJhxylrRcNvqVrRZ44BXV+Z0/5+Rxn0EJsNCjvfqZh1dg8XvtaF mNvojwCPd4P7ZfYYnblXsuulY8YZVIpj35FC4u7l5EU4PYLlw43tTvzXn imsNPYS0Jn+4VJGCQ9QQSuT13V0oTO0Pp6m/qdior2Rsl29BMflW7ZEg1 g==; X-CSE-ConnectionGUID: ZqU4DNDdRGS3otWBs5WQMg== X-CSE-MsgGUID: mu1QseGgTd2mrXh/JFGDxQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987881" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987881" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:42 -0700 X-CSE-ConnectionGUID: OCEAY4YXSj6st8JqZnZj0Q== X-CSE-MsgGUID: EgJiMR38RpqxXbz4F6gTnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406610" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:40 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 20/26] app/test-pmd: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:57 +0100 Message-ID: <20240813160003.423935-21-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update app to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- app/test-pmd/testpmd.c | 7 ++++--- app/test-pmd/testpmd.h | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index b1401136e4..84da9a80f2 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1305,7 +1305,7 @@ check_socket_id(const unsigned int socket_id) queueid_t get_allowed_max_nb_rxq(portid_t *pid) { - queueid_t allowed_max_rxq = RTE_MAX_QUEUES_PER_PORT; + queueid_t allowed_max_rxq = RTE_MAX_ETHPORT_RX_QUEUES; bool max_rxq_valid = false; portid_t pi; struct rte_eth_dev_info dev_info; @@ -1353,7 +1353,7 @@ check_nb_rxq(queueid_t rxq) queueid_t get_allowed_max_nb_txq(portid_t *pid) { - queueid_t allowed_max_txq = RTE_MAX_QUEUES_PER_PORT; + queueid_t allowed_max_txq = RTE_MAX_ETHPORT_TX_QUEUES; bool max_txq_valid = false; portid_t pi; struct rte_eth_dev_info dev_info; @@ -1564,7 +1564,8 @@ check_nb_txd(queueid_t txd) queueid_t get_allowed_max_nb_hairpinq(portid_t *pid) { - queueid_t allowed_max_hairpinq = RTE_MAX_QUEUES_PER_PORT; + queueid_t allowed_max_hairpinq = RTE_MIN(RTE_MAX_ETHPORT_RX_QUEUES, + RTE_MAX_ETHPORT_TX_QUEUES); portid_t pi; struct rte_eth_hairpin_cap cap; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9facd7f281..5e405775b1 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -332,10 +332,10 @@ struct rte_port { uint8_t need_reconfig_queues; /**< need reconfiguring queues or not */ uint8_t rss_flag; /**< enable rss or not */ uint8_t dcb_flag; /**< enable dcb */ - uint16_t nb_rx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue rx desc number */ - uint16_t nb_tx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue tx desc number */ - struct port_rxqueue rxq[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue Rx config and state */ - struct port_txqueue txq[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue Tx config and state */ + uint16_t nb_rx_desc[RTE_MAX_ETHPORT_RX_QUEUES+1]; /**< per queue rx desc number */ + uint16_t nb_tx_desc[RTE_MAX_ETHPORT_TX_QUEUES+1]; /**< per queue tx desc number */ + struct port_rxqueue rxq[RTE_MAX_ETHPORT_RX_QUEUES+1]; /**< per queue Rx config and state */ + struct port_txqueue txq[RTE_MAX_ETHPORT_TX_QUEUES+1]; /**< per queue Tx config and state */ struct rte_ether_addr *mc_addr_pool; /**< pool of multicast addrs */ uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */ queueid_t queue_nb; /**< nb. of queues for flow rules */ @@ -351,14 +351,14 @@ struct rte_port { struct port_indirect_action *actions_list; /**< Associated indirect actions. */ LIST_HEAD(, port_flow_tunnel) flow_tunnel_list; - const struct rte_eth_rxtx_callback *rx_dump_cb[RTE_MAX_QUEUES_PER_PORT+1]; - const struct rte_eth_rxtx_callback *tx_dump_cb[RTE_MAX_QUEUES_PER_PORT+1]; + const struct rte_eth_rxtx_callback *rx_dump_cb[RTE_MAX_ETHPORT_RX_QUEUES+1]; + const struct rte_eth_rxtx_callback *tx_dump_cb[RTE_MAX_ETHPORT_TX_QUEUES+1]; /**< metadata value to insert in Tx packets. */ uint32_t tx_metadata; - const struct rte_eth_rxtx_callback *tx_set_md_cb[RTE_MAX_QUEUES_PER_PORT+1]; + const struct rte_eth_rxtx_callback *tx_set_md_cb[RTE_MAX_ETHPORT_TX_QUEUES+1]; /**< dynamic flags. */ uint64_t mbuf_dynf; - const struct rte_eth_rxtx_callback *tx_set_dynf_cb[RTE_MAX_QUEUES_PER_PORT+1]; + const struct rte_eth_rxtx_callback *tx_set_dynf_cb[RTE_MAX_ETHPORT_TX_QUEUES+1]; struct xstat_display_info xstats_info; }; From patchwork Tue Aug 13 15:59:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143143 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99EDD457BB; Wed, 14 Aug 2024 09:50:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6EBB2427AB; Wed, 14 Aug 2024 09:49:07 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 85C2E4026C for ; Tue, 13 Aug 2024 18:00:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564844; x=1755100844; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XXfsouQjgWtlfNJ49thvdxi/QcVlsNkRuy/fDJh9p8k=; b=Wt/WCUTwNTtabsa6O5uOtMv9Q7adSDJjKNitt0ZUWTFeedi7aek0JT6z BWJCZfHqiogjip1a5W/yDM1zXgnjDU6gO8/yvCO2Um3DlXpT2iH0rphAx t3uvXf+l2zVgrQTuZm+A4phirpZCLZ1mxX01ShCGbgWHY4G0Xu09lb3Qq PEbeFFdmWSzrH5B186rrTEe4hJITY5E1Euh3Wt6r4vJt7tt85MC83sofv y7r5rPINg1/bhTMpJlSqSVDjfLvaW/hIKd2TlDkaAlhHtF51Ud9PgskpC oPAvXZnNTVQsbu/9pY2J2dq2Y4YHMwe3FzBYLbSb8/lrgSfCG6fxlniDg A==; X-CSE-ConnectionGUID: 955uJk5ET0iMYVHileEB4A== X-CSE-MsgGUID: 4MROXYAGRi2Gn1Pv+nBC+Q== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987885" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987885" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:43 -0700 X-CSE-ConnectionGUID: 16hlav8MRriGajvcjQWr4g== X-CSE-MsgGUID: Aqa22d8RQ96xRrSfwEiWvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406636" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:42 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 21/26] examples/ipsec-secgw: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:58 +0100 Message-ID: <20240813160003.423935-22-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update example app to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- examples/ipsec-secgw/ipsec-secgw.c | 2 +- examples/ipsec-secgw/ipsec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index e98ad2572e..fc72e10037 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -1050,7 +1050,7 @@ parse_config(const char *q_arg) uint32_t size; uint32_t max_fld[_NUM_FLD] = { RTE_MAX_ETHPORTS, - RTE_MAX_QUEUES_PER_PORT, + RTE_MAX_ETHPORT_RX_QUEUES, RTE_MAX_LCORE }; diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c index b52b0ffc3d..ff65c1c919 100644 --- a/examples/ipsec-secgw/ipsec.c +++ b/examples/ipsec-secgw/ipsec.c @@ -584,7 +584,7 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa, .rss_key_len = sizeof(rss_key), }; struct rte_eth_dev_info dev_info; - uint16_t queue[RTE_MAX_QUEUES_PER_PORT]; + uint16_t queue[RTE_MAX_ETHPORT_RX_QUEUES]; struct rte_flow_action_rss action_rss; unsigned int i; unsigned int j; From patchwork Tue Aug 13 15:59:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143144 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AE0FC457BB; Wed, 14 Aug 2024 09:50:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45EC4410F6; Wed, 14 Aug 2024 09:49:09 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 0A82340650 for ; Tue, 13 Aug 2024 18:00:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564845; x=1755100845; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1g130S4oFxYeunT7xK8lFqwmUiCMbyMdf+Da1nznpF0=; b=jtrXGMLNKiUp8mpvIBoCH9vMOLaJDW5idyjQ9DNgAJM377NZwsSglys8 ecTHWV+RqM2y6y0pmK20JdxYUlfHw++xJF3fXqwq/awhPbCclW/q9iw4X 9VNM5Fgn+FQkHZAsEMIwot0eJ2fBodfIinhTDBG+TNBSQ26mCLh+plmI2 YSn7vU3HdRIxNwZ9TOoIJT8zqlZt8jQy2I0SmTsamUQPnTR+Mf+4ASahC X3Dp5Dlbn40sFiOKQyIBGdkBDbg42VQG2ZcqjLP42etWRNiriWaIzFLgl qcCt67gHDBTFdxUT76UV0G2xfLvWPQbSDPXrhCC0UMSN78OPLbw++rQQE g==; X-CSE-ConnectionGUID: ojFvtDBAQcyXxpTD8xuNeQ== X-CSE-MsgGUID: AFilDzznRUWOmgF0JJsyRw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987889" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987889" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:45 -0700 X-CSE-ConnectionGUID: ahwxR/ptQcORBvgL70Oj3Q== X-CSE-MsgGUID: /BJsJ3ZPRWKXGC7C5N8YJA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406664" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:43 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 22/26] examples/l3fwd-power: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 16:59:59 +0100 Message-ID: <20240813160003.423935-23-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update example app to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- examples/l3fwd-power/main.c | 2 +- examples/l3fwd-power/perf_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 2bb6b092c3..bf95cdc487 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1660,7 +1660,7 @@ parse_config(const char *q_arg) unsigned size; unsigned int max_fld[_NUM_FLD] = { RTE_MAX_ETHPORTS, - RTE_MAX_QUEUES_PER_PORT, + RTE_MAX_ETHPORT_RX_QUEUES, RTE_MAX_LCORE }; diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c index 6c0f7ea213..479626ffb9 100644 --- a/examples/l3fwd-power/perf_core.c +++ b/examples/l3fwd-power/perf_core.c @@ -134,7 +134,7 @@ parse_perf_config(const char *q_arg) unsigned int size; unsigned int max_fld[_NUM_FLD] = { RTE_MAX_ETHPORTS, - RTE_MAX_QUEUES_PER_PORT, + RTE_MAX_ETHPORT_RX_QUEUES, 255, RTE_MAX_LCORE }; From patchwork Tue Aug 13 16:00:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143145 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C86F0457BB; Wed, 14 Aug 2024 09:50:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E301427B8; Wed, 14 Aug 2024 09:49:10 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 940024065C for ; Tue, 13 Aug 2024 18:00:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564847; x=1755100847; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tu9LG5pWrwLxNyoKt4Qg/irityzAgBv/ue1ckF3qX/c=; b=MmZeALwKXRj0aHR3Wd2XJGTrEJMsZEAGPj5x/NWQAiGITRMVvujUkO+c xBdvnKcgkt6q+BKwUWEl9GMf4UWTUBcl7VXsk3Jsn2s6uepxX3Qi4zsMD +qgnn1SJExNBWQGe249mDzK7JKQxbkIXmCAMA24UrXlQrd7WQfZuPn6bT 77aK+QjimmLGF3qd/1go9U/XmkXSWpSE39YG4DjOcsjxTvdANyTCn5xax Sky7exXTcMSnR9el+PG9UR8GrTlwNLZZEquL8T3uqwct/2pyz8jRacEsh S+K/2LihCWxMTzGr6C9YVled/RbOFIPASnwKdFfnNrWmg+YLfDpKT/1pG A==; X-CSE-ConnectionGUID: cuVsSChNSYi0CsICLHCiWQ== X-CSE-MsgGUID: arkFR+yXTZqdroAIr5ynyQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987893" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987893" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:46 -0700 X-CSE-ConnectionGUID: 6midNjOiQSSD9u5MfpLMQQ== X-CSE-MsgGUID: cNOHjBIgRhKpI5Bmpg0OrQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406691" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:45 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 23/26] examples/l3fwd: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 17:00:00 +0100 Message-ID: <20240813160003.423935-24-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update example app to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- examples/l3fwd/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 01b763e5ba..0d711dec3e 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -502,7 +502,7 @@ parse_config(const char *q_arg) unsigned size; uint16_t max_fld[_NUM_FLD] = { RTE_MAX_ETHPORTS, - RTE_MAX_QUEUES_PER_PORT, + RTE_MAX_ETHPORT_RX_QUEUES, RTE_MAX_LCORE }; From patchwork Tue Aug 13 16:00:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143146 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 97038457BB; Wed, 14 Aug 2024 09:50:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C0ED7427BC; Wed, 14 Aug 2024 09:49:11 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 1D09C4026C for ; Tue, 13 Aug 2024 18:00:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564848; x=1755100848; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vsik0F6ayLvSLIDX0XaFAyvAK7W7MSyu/qYtzAPqMhE=; b=GkQQinhSmudikwR5+fLmadXtxK3Y3gCK/pYg0CQHcnzsWbqMuAXaAH2O 8SB1fYu11aQ1BdU4Ug4e43k99gniEhrtdZ/XYGGKA4FgToQa3uvxFQKg0 vlVcCZLDs5QshdUCXhfIZghqUYY8e/kUOKzczTUBAusIMLEKe/1Cp37MP zzPJOXncCWeT5uJSBIgd6wZahhiE6Fl48CQVmRba/BeaLpJuJOJ4jqXvm R9dv9zNsOXKbC6egdPTGHTEF8csS+1JrgmASY/SR86N/4ZzglihagtvDM UB7WqsP857p6QU7eiFY8aD1g3Bq6JFlqer3ddLVibU9bKt+IBhKNb1TH8 A==; X-CSE-ConnectionGUID: BRdrOMAZSvGBJGLl4Z9c3Q== X-CSE-MsgGUID: y1TNroOBRRyF3GyJgvDltA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987897" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987897" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:48 -0700 X-CSE-ConnectionGUID: cTvCylhJRaSpsdQitRfMMA== X-CSE-MsgGUID: zDycJV5iRhCESztNV+IKVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406708" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:46 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 24/26] examples/vhost: use separate Rx and Tx queue limits Date: Tue, 13 Aug 2024 17:00:01 +0100 Message-ID: <20240813160003.423935-25-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update example app to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and RTE_MAX_ETHPORT_RX_QUEUES rather than the old define RTE_MAX_QUEUES_PER_PORT. Signed-off-by: Bruce Richardson --- examples/vhost/main.c | 2 +- examples/vhost/main.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 4391d88c3d..9c2f3a02eb 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -1891,7 +1891,7 @@ reset_dma(void) for (i = 0; i < RTE_MAX_VHOST_DEVICE; i++) { int j; - for (j = 0; j < RTE_MAX_QUEUES_PER_PORT * 2; j++) { + for (j = 0; j < RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES; j++) { dma_bind[i].dmas[j].dev_id = INVALID_DMA_ID; dma_bind[i].dmas[j].async_enabled = false; } diff --git a/examples/vhost/main.h b/examples/vhost/main.h index c986cbc5a9..374ba30ec6 100644 --- a/examples/vhost/main.h +++ b/examples/vhost/main.h @@ -99,7 +99,7 @@ struct dma_info { }; struct dma_for_vhost { - struct dma_info dmas[RTE_MAX_QUEUES_PER_PORT * 2]; + struct dma_info dmas[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES]; uint32_t async_flag; }; From patchwork Tue Aug 13 16:00:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143147 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 00788457BB; Wed, 14 Aug 2024 09:51:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0685427C0; Wed, 14 Aug 2024 09:49:12 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id A4E5840E15 for ; Tue, 13 Aug 2024 18:00:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564850; x=1755100850; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VRzHJ3f1pJTPvn6cgcKBKSYqrs8+zWaI9ZUTdhDv0QA=; b=E9mrbIHyM+JIt3kkXc51GoekOsUx0bG7Fyza2YMHJm6QTmQbhjRetpyq 6JUitMyie5uXQiBRxurEfVo3BXD4KqcVOZCcMuZcI1LSzuTUAoswlKatM vMdSA+tfKpE2ocMpFxMJxMIQLwTPuI5q1KrV5SlOrj3ofXpZZoqGzZBrS 9PVQRbhGk9EoL2I427ibtrNvcWqcs8pFrXhZZyVzzfNhBHRzGD4XDvnFL SBNnHeHLAHTwxR0l6OfaNV+fNTSB3yHu4z6o5gS67bR1z6TKEnzdyJUhX XV93LKwKXuUzEmhOywxhRHW0D7+Nntl4pu9CDs7swA6WLxe8scDoYQZG8 A==; X-CSE-ConnectionGUID: 5LiwhNGiTa6XPB7gGKK+Tg== X-CSE-MsgGUID: vneqf5tPQFG2nqQF7Bv2Hw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987902" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987902" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:49 -0700 X-CSE-ConnectionGUID: D9ZqVyBIQ7G5C4VZN4FVRA== X-CSE-MsgGUID: s3AhVqFDSYaL3O4YWDYLOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406716" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:48 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [RFC PATCH v2 25/26] config: make queues per port a meson config option Date: Tue, 13 Aug 2024 17:00:02 +0100 Message-ID: <20240813160003.423935-26-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Bruce Richardson The default number of ethernet queues per port is currently set to 1k which is more than enough for most applications, but still is lower than the total number of queues which may be available on modern NICs. Rather than increasing the max queues further, which will increase the memory footprint (since the value is used in array dimensioning), we can instead make the value a meson tunable option - and reduce the default value to 256 in the process. This means that: * most apps which don't need hundreds of queues will see lower mem use. * apps which do need to use thousands of queues can configure DPDK to allow this, without having to modify DPDK files (i.e. rte_config.h) Signed-off-by: Bruce Richardson --- config/meson.build | 2 ++ config/rte_config.h | 3 --- doc/guides/rel_notes/release_24_11.rst | 13 +++++++++++-- meson_options.txt | 4 ++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index 8c8b019c25..fc41354c53 100644 --- a/config/meson.build +++ b/config/meson.build @@ -352,6 +352,8 @@ endforeach # set other values pulled from the build options dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports')) +dpdk_conf.set('RTE_MAX_ETHPORT_RX_QUEUES', get_option('max_ethport_rx_queues')) +dpdk_conf.set('RTE_MAX_ETHPORT_TX_QUEUES', get_option('max_ethport_tx_queues')) dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) dpdk_conf.set('RTE_ENABLE_STDATOMIC', get_option('enable_stdatomic')) dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp')) diff --git a/config/rte_config.h b/config/rte_config.h index 2c11b4eeec..7450e0d648 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -64,9 +64,6 @@ #define RTE_MBUF_DEFAULT_MEMPOOL_OPS "ring_mp_mc" /* ether defines */ -#define RTE_MAX_QUEUES_PER_PORT 1024 -#define RTE_MAX_ETHPORT_RX_QUEUES 1024 -#define RTE_MAX_ETHPORT_TX_QUEUES 1024 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */ #define RTE_ETHDEV_RXTX_CALLBACKS 1 #define RTE_MAX_MULTI_HOST_CTRLS 4 diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 3725c056ba..825cc0fad9 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -58,8 +58,17 @@ New Features * **New configuration settings for Rx and Tx Ethernet Queues.** New defines have been added to DPDK to allow independent tracking of the maximum number of Rx and Tx queues. - These defines as ``RTE_MAX_ETHPORT_RX_QUEUES`` and ``RTE_MAX_ETHPORT_TX_QUEUES``, - and should be used in place of the older macro ``RTE_MAX_QUEUES_PER_PORT``. + These defines are ``RTE_MAX_ETHPORT_RX_QUEUES`` and ``RTE_MAX_ETHPORT_TX_QUEUES``, + and these new defines should be used in place of the older define ``RTE_MAX_QUEUES_PER_PORT``. + Unlike the older define, these new defines are build-time configurable via meson options: + ``max_ethport_rx_queues`` and ``max_ethport_tx_queues``. + +.. note:: + + The default max values for Rx and Tx queue limits are reduced from 1024, in previous releases, + to 256 in this release. + For application that require large numbers of queues, + these defaults can be changed via the meson configuration options described above. Removed Items diff --git a/meson_options.txt b/meson_options.txt index e49b2fc089..a9a7052ba6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -40,6 +40,10 @@ option('machine', type: 'string', value: 'auto', description: 'Alias of cpu_instruction_set.') option('max_ethports', type: 'integer', value: 32, description: 'maximum number of Ethernet devices') +option('max_ethport_rx_queues', type: 'integer', value: 256, description: + 'maximum number of Rx queues on an Ethernet device') +option('max_ethport_tx_queues', type: 'integer', value: 256, description: + 'maximum number of Tx queues on an Ethernet device') option('max_lcores', type: 'string', value: 'default', description: 'Set maximum number of cores/threads supported by EAL; "default" is different per-arch, "detect" detects the number of cores on the build machine.') option('max_numa_nodes', type: 'string', value: 'default', description: From patchwork Tue Aug 13 16:00:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143148 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14C53457BB; Wed, 14 Aug 2024 09:51:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36C28427C6; Wed, 14 Aug 2024 09:49:14 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by mails.dpdk.org (Postfix) with ESMTP id 477964026C for ; Tue, 13 Aug 2024 18:00:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723564852; x=1755100852; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rS+4kds/xKnBQ6M+HMcvDgwJo4imZ/COXWC9r3MBr/g=; b=YNQwT0cp4rwKlRQ699lCGUEC8TZN7o8W6lcONmLge3bd4L6Pdup9nxEx B2wUtDEM7yoJBlFsG9v1tGXwxO5ppoe5aaN8v9QUcwNNI8U74680I47Ae o8CBI+hkpmAoxuZlqUZuxbOLFA3rL6KPrSfxarzxbi0FFrtI3kr6swuZ9 z05fTvAnOYyIT+dZsB0lTiO6cIgJXU7ciw1HXHd8pB7qvbpt7I1XJKXVQ KsmvtKgBDSgCyWTQmuAlljTa0z1h71r9MM9mJNKH+JufMxLKsmWeNQRCt 4ygYTmfaq44liawWt6VPn8Gcm2zYzdE67xfvk1RcCI03cjDW7p3nUDASV A==; X-CSE-ConnectionGUID: NTRaH5lWSSymAd2EJHo3jQ== X-CSE-MsgGUID: d/Xdag7ZRKaDytFvuehtWw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="12987905" X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="12987905" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 09:00:51 -0700 X-CSE-ConnectionGUID: YkqSW+1fSHitccwfEyMQPQ== X-CSE-MsgGUID: ul5vEmOyR+CvxT8CHH2X4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,286,1716274800"; d="scan'208";a="58406722" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa007.fm.intel.com with ESMTP; 13 Aug 2024 09:00:49 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson , Bruce Richardson Subject: [RFC PATCH v2 26/26] config: add computed max queues define for compatibility Date: Tue, 13 Aug 2024 17:00:03 +0100 Message-ID: <20240813160003.423935-27-bruce.richards@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160003.423935-1-bruce.richards@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240813160003.423935-1-bruce.richards@intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 14 Aug 2024 09:48:35 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org End applications may use the RTE_MAX_QUEUES_PER_PORT define in their structure definitions, so keep a define present in DPDK for backward compatibility. Rather than having a hard-coded value, we can use the maximum of the Rx and Tx values as the overall max value. Rather than using a macro which does the MAX() calculation inside it, we can compute the actual value at configuration time and write it using meson. Signed-off-by: Bruce Richardson --- config/meson.build | 8 ++++++++ doc/guides/rel_notes/deprecation.rst | 11 +++++++++++ doc/guides/rel_notes/release_24_11.rst | 8 +++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index fc41354c53..9677636754 100644 --- a/config/meson.build +++ b/config/meson.build @@ -372,6 +372,14 @@ if get_option('mbuf_refcnt_atomic') endif dpdk_conf.set10('RTE_IOVA_IN_MBUF', get_option('enable_iova_as_pa')) +# set old MAX_QUEUES_PER_PORT option for compatibility. Compute +# value as max of Rx and Tx counts +if get_option('max_ethport_rx_queues') > get_option('max_ethport_tx_queues') + dpdk_conf.set('RTE_MAX_QUEUES_PER_PORT', get_option('max_ethport_rx_queues')) +else + dpdk_conf.set('RTE_MAX_QUEUES_PER_PORT', get_option('max_ethport_tx_queues')) +endif + compile_time_cpuflags = [] subdir(arch_subdir) dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 211f59fdc9..e4ba00040f 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -17,6 +17,17 @@ Other API and ABI deprecation notices are to be posted below. Deprecation Notices ------------------- +* config: The define ``RTE_MAX_QUEUES_PER_PORT`` should be considered deprecated + and may be removed in a future release. + Its use in apps should be replaced by ``RTE_MAX_ETHPORT_RX_QUEUES`` or ``RTE_MAX_ETHPORT_TX_QUEUES``, + as appropriate. + +* config: The ``RTE_MAX_QUEUES_PER_PORT`` value is no longer hard-coded to 1024. + Its value is now computed at configuration time to be the maximum of the configured max Rx and Tx queue values, + given by the meson options ``max_ethport_rx_queues`` and ``max_ethport_tx_queues``. + If these are unmodified from the defaults, + the value of ``RTE_MAX_QUEUES_PER_PORT`` will be 256. + * build: The ``enable_kmods`` option is deprecated and will be removed in a future release. Setting/clearing the option has no impact on the build. Instead, kernel modules will be always built for OS's where out-of-tree kernel modules diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 825cc0fad9..130564d38e 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -67,9 +67,15 @@ New Features The default max values for Rx and Tx queue limits are reduced from 1024, in previous releases, to 256 in this release. - For application that require large numbers of queues, + For applications that require large numbers of queues, these defaults can be changed via the meson configuration options described above. +.. note:: + + The define ``RTE_MAX_QUEUES_PER_PORT`` is kept for backward compatibility. + Its value is no longer hard-coded, + but is set, at configuration time, to the maximum of the configured max Rx and Tx queue values. + Removed Items -------------