From patchwork Wed Aug 14 10:49:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143149 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 8FC3D457C0; Wed, 14 Aug 2024 12:50:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BF91427C5; Wed, 14 Aug 2024 12:50:08 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 5E0B6427AA for ; Wed, 14 Aug 2024 12:50:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632607; x=1755168607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oVsJTAwexNx87C6MkVqgWRgzO5+E7NfKiKWb8zUehAs=; b=h9o0MNZXGF8Pa5iD+fTJmUKDwU2+xfmBxr8xF3lqe+YHYWWZ8faEVold CrA1+EA4Op9PMfka8FD5WKfyiS40/pGVsOJ6RIOG+qHDY82DSi2iJdDl4 sr+iPXjmZgc97JDhX7l5NuutbOhpaAPIHk3vh15ybCD8/NRwq2kz3Hi6D trNy327lsbGrW0ScjLBQ3xCvmMEG9GDOKIuMVIC/xXm31j+q8ZcrYtlnW j3+qMMqukEvMaRPon8b5AfPoUgOIEcgCViRwaM2ebeN2yXzAi8UUa3LnX xY2PPqU7wJJROL/czHA3pJCwKf/sy0OiajPsIp8i9MoI20s1hGCIUmsHN g==; X-CSE-ConnectionGUID: m126Ehc6Sl6wSbC6QX2Yvw== X-CSE-MsgGUID: hp/gh6P0S0ODHxAXfhkXVQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360218" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360218" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:06 -0700 X-CSE-ConnectionGUID: +kGYrtbXSg6m2yVf9nCeQw== X-CSE-MsgGUID: lcuo3wP/RUac3VQEckQ1Yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481588" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:05 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 01/26] cryptodev: remove use of ethdev max queues definition Date: Wed, 14 Aug 2024 11:49:07 +0100 Message-ID: <20240814104933.14062-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143150 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 00ACF457C0; Wed, 14 Aug 2024 12:50:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E36B7427D4; Wed, 14 Aug 2024 12:50:16 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 4DE1E427D4 for ; Wed, 14 Aug 2024 12:50: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=1723632615; x=1755168615; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bzct8BkttPc4RqlSslY0ls+QWP29qVM1onnjoAtkhGQ=; b=dKgnhKlSD9cjumcL5d0LLBFm7sLVYXvmx9cuEcLf4Ke07fyyhnGnzH8F 7O0lGL4N9F5aLUK7ZxAgSzAdPUg5dOwSB8Wqy/bQyfu/srn4Kh/Q5QSo9 P2VXj3WWhfQ82Xj1BIG0XhPbLF6CDDB3NU3BPwNm9WMJSG1KZFoda9IM7 gxT4Fp3NA6ESvANIROb2Js8HPH2OQfM2mCQUjvjyLjBN8tM7v6urcnz14 fdgt+XJqGoGc05CK3p85g8BI1ELK5HOWqYN/EUwm8PcQvn2ryKr631DJZ WHqGEaUbOaXg8dYqvTGpu/tQ6HBlRMmszQxu8jngVaAioffARADMM0PYv Q==; X-CSE-ConnectionGUID: iApW3x34TD+lgK6lq1YL3g== X-CSE-MsgGUID: YxVgtnmvQ5+xoX1WjyTREQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360235" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360235" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:14 -0700 X-CSE-ConnectionGUID: o23ozdBCSYunOyP40mx6HA== X-CSE-MsgGUID: kLPzFnE4RX2iPufgQ5uu/g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481624" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:13 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 02/26] eventdev: remove use of ethev queues define Date: Wed, 14 Aug 2024 11:49:08 +0100 Message-ID: <20240814104933.14062-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143151 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 42E00457C0; Wed, 14 Aug 2024 12:50:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3241A427E3; Wed, 14 Aug 2024 12:50:22 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 5F31E427D2 for ; Wed, 14 Aug 2024 12:50: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=1723632620; x=1755168620; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rnNuCy2j8PSoqBgN6jvgOPdMzNyVlFUBF/71oeNTmOA=; b=hmWCNBPUtU2o5ezu6Wyi8O6gf1Lf6KVIX1DedtkyOKbv3sv2QDuhUcCr CnCIHtGb9E+7fLv6QkKFtyNTuEiE9iikaGPjmL+JEZTlw7DDEXIic34d9 XAwfLQydLv0B8xssxOw809krcMiHDIp8LE/DKyENZbQK0x5F+9R1Wa6E0 WXzJ8dqQy9LXGLhcz8xr+y7a95bJZLj//ZjhTUCpek3RWn4h2lZ0gs7O8 pIr/JfLW6meSEQqgQg8srRcpf2pS4Jiz7JRWdbfMQ1MqRxZxdb/RfuSbi PrM7c7mafr+X9OsdJuz0M+0Jz3sh+J8LlEyFRU9ERvkBfxbAkpNg9ecXO w==; X-CSE-ConnectionGUID: XbomhQcCSxSQbFAkYT3xmg== X-CSE-MsgGUID: IEOVsXyES7e0P3aGBuwY0g== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360249" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360249" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:20 -0700 X-CSE-ConnectionGUID: 8hUStLG0SOeoOtjs2ST79A== X-CSE-MsgGUID: rO9DolfWQkau+Gx5kZtM0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481647" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:19 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 03/26] app/test-bbdev: remove use of ethdev queue count value Date: Wed, 14 Aug 2024 11:49:09 +0100 Message-ID: <20240814104933.14062-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143152 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 AB1A3457C0; Wed, 14 Aug 2024 12:50:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F586427DE; Wed, 14 Aug 2024 12:50:25 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 1484D427DC for ; Wed, 14 Aug 2024 12:50:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632623; x=1755168623; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5Vnm5SiSCHYGCVFdDCBLwbHND/v2Y8Y9N80oH3NoRgs=; b=bqfJvTwUwr6RzKg8F/1+q5WKcPnD7sPdXhL6JalQxziBfFHTAnrk9o49 aUrxNVLliziy0/WkxdaXc6U7BARV47LBmfh8UEmnuG6RzZJ7DNmsd9wah A2nfkPEjFEl7uI3WSJoXRG7Nwm1fxpKiSDr6J1irERtgT9N20Sqt8+K/m pBD5xuy339tTHiRUhx/9acqQABoyXro0OlyzAMblzgrhXNKSigk82vug3 V4hG9LuZeneBh+ZUJ5JdTakVziHpLd7gqDnexSCrUMxAMVSoJvF4VcngO JOiwU1/sjEQWv32+4wyczQPJVewwpylyUJWOxXDtQBd4vD0qvqLwVGccQ Q==; X-CSE-ConnectionGUID: AagTOcyIQeqR28JPoXqMeQ== X-CSE-MsgGUID: 57vhaBt8RcCP/B+LCrvrrg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360257" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360257" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:22 -0700 X-CSE-ConnectionGUID: 4orn4ngxQXunSEcawBIkLA== X-CSE-MsgGUID: UQF+VhncTXaq89rHlxNl+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481659" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:22 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 04/26] config: add separate defines for max Rx and Tx queues Date: Wed, 14 Aug 2024 11:49:10 +0100 Message-ID: <20240814104933.14062-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143153 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 D7F56457C0; Wed, 14 Aug 2024 12:50:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B298642D27; Wed, 14 Aug 2024 12:50:26 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 74E91427DC for ; Wed, 14 Aug 2024 12:50: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=1723632624; x=1755168624; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XdZBnuHwj10DAd6oLEoigRUrOh6I3Fsw+L2bcove6/M=; b=Qpvul8g/1Jr/4A1jz/4BgB2aSQWsyctNxLzzMHMXk6plcPIb5Fp5m2Cd QeTp+lQ/5APL8kiCEXoiQmwagjLKemqRROSz/mYxP7Jx0WQM+kMjJ9NLs Gm5zLEi0BGQY7xSofdTLv8IICq0nZ2SrfQPvJBWEeo+qrwvSp1ddlD+bd VQMy6Qob6T9YzzQYkpRzjpFLQU5ZIsxwFm5xbJL3g5dXxZn4XDWvbED14 U++EtKkSzEEbH982fXm6tSg41jpkSr71EFqfBV8AJhlEfEvxyIMJsNLj2 EC6xPZ1rJ0EyFXoq9H91vs8Ij+JIZTu/U/Ot54Ix15RPEStk6T0Q0HbBM Q==; X-CSE-ConnectionGUID: eChWSzaIR3S75MyeC3b/dA== X-CSE-MsgGUID: TldbazGhRc2fTb40NzX7fA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360262" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360262" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:24 -0700 X-CSE-ConnectionGUID: Mp8nJHB1QyatcbRbjwgJZQ== X-CSE-MsgGUID: bVLBZMRMTImvLJ3A494d1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481668" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 05/26] ethdev: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:11 +0100 Message-ID: <20240814104933.14062-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143154 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 4238E457C0; Wed, 14 Aug 2024 12:50:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB67742D76; Wed, 14 Aug 2024 12:50:28 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id CFFEA427E1 for ; Wed, 14 Aug 2024 12:50:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632626; x=1755168626; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W0/cSgOkquWz7axNybt8MM8q0O37h/YqBaBk67VpJyE=; b=TR/j/03LcmMUZnJ8z7aPvPKuAwatRvjbqHxsxgUx7+DqY9zKOkRHfIOn 3QPrCI7YyjVFUy+oueXMbKrW+2tt8IKSh5MZsS/Wp12LaBQSPKt0vW3qv RGKT2YiD/qNvn0eT9BdyZKbhVOKHrIM/81VAHrwHRAoBb4KI+Pf8Y2WzF k7pyYjXlAlMaGvNrmS41kN/o7LhYO3dV5SnsRKuAWkXkika5Rqsragn4l mba+506xW3YFi61HTV+eQ+FUJY9P7n7fr8+iHifb2oKXpL4LukiJESwEt WEG0mJws5PqWuI+kqbF1nyeYDolVL83oCmdHdWcOZiy+yXrQhbF2Vdr2I A==; X-CSE-ConnectionGUID: Jr4baivlS66BfUtXW7W+Qg== X-CSE-MsgGUID: sq7Kt3oXTNyQFw8pUEiGLA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360267" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360267" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:25 -0700 X-CSE-ConnectionGUID: maCiFxwfRze+qW7xmqUlgw== X-CSE-MsgGUID: OA+Vsby7RvO8aGDxTq/b9A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481677" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:24 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 06/26] bpf: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:12 +0100 Message-ID: <20240814104933.14062-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143155 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 F0790457C0; Wed, 14 Aug 2024 12:50:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E568642D83; Wed, 14 Aug 2024 12:50:29 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 4F03142D35 for ; Wed, 14 Aug 2024 12:50: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=1723632627; x=1755168627; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ey14Wp3sJ8mOesvYAfLh1st9ErklXMQwScIalda58js=; b=cyCEgzqZrDeoXT9Ick5XvfhcSd8Z6pa33x42UMU/t/7PAKmu2yFQXvAm 9R9X+hsZRJ1kQfelkedH5UojTaxCip23uR86ArfvDLNcL1dofeHOikkAa LvdPZ+jWT9TsJ+9xKr+5gKM53k6Dshajv3cDogSIWU00CkXm0Dgk7apjj 3fHAqOR4FiCeSB0JWOjIkLtRHw4Hmea6czdxKl30jwhT4iawwawtoJc2t JeH8c6JDfWg+6eJWaLPiB5AZ8Xouaq36fiKB5ZqaEYURAOjs+cgGJuu9I rHpxBgEAk15ICeE5a6GgUBjUi8IoHvwsALT2/bGwNrwOHXZERmN/JIlD9 w==; X-CSE-ConnectionGUID: DnX2hJuwTo+KJgQR9hIsVg== X-CSE-MsgGUID: D6qus/d8Rv2N9qcCV1uPFw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360273" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360273" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:27 -0700 X-CSE-ConnectionGUID: rupa5i5kQkaBIWbhujjwhQ== X-CSE-MsgGUID: W0KpAmyVQQu5y0KSAH3X4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481688" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:26 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 07/26] latencystats: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:13 +0100 Message-ID: <20240814104933.14062-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143156 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 46EF1457C0; Wed, 14 Aug 2024 12:50:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23F6842D89; Wed, 14 Aug 2024 12:50:31 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id CEBBF42D7B for ; Wed, 14 Aug 2024 12:50:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632629; x=1755168629; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ehx/ElS3/RsGdvk2LE1AqLlLf+7+uNPGvdPYq/gozio=; b=gNf2biw6FMTSQ0mK8nGp2vy7IK2O1rAq4V51DGzMe4ln8MbK4okn+1+q XuuO72PtFWa/miVCL8d9iuoe/TZD03R9Hu32fxLzN2a4exvD7iGjRCrQl mYaqWx5M5W2hpeM1SnAA8uqmolGNa6/KePfnHPYCu7ZTmvxhZ7irnaL0g y4xWBjuCnsvhNZht1gRvViaKaHQv2XmeCFYBozqLNE0HPQCv8QtHmE95h bYjIIKtIMleVkU+jCJbGyvRhaamX0HMojil4R2Sf2YDhnAfcKims7T/pe +YyARpS3SNxlZ5ZZgRYHWrZGBLxpB49uU7XY7iVEm9DpmabN+uUSAHtXy A==; X-CSE-ConnectionGUID: K9P+kHAIQgaVDpReK7sIeg== X-CSE-MsgGUID: Uk6I9TSDQt2rhBDv5X5nYA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360288" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360288" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:28 -0700 X-CSE-ConnectionGUID: vQlIPWXeR6iU0h+3SiKTgQ== X-CSE-MsgGUID: woJDqxsRRiu/prjjq9cxMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481695" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:27 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 08/26] pdump: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:14 +0100 Message-ID: <20240814104933.14062-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143157 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 61362457C0; Wed, 14 Aug 2024 12:51:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6825C42D97; Wed, 14 Aug 2024 12:50:32 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 44C8C42D89 for ; Wed, 14 Aug 2024 12:50:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632630; x=1755168630; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DHKa4ooDrL2yRUQri++6B4gB2Pxb2BN4n/Ie9MBImTU=; b=K0Qr94QBOtcSVIgf1+Qbo/1Gwxnm5YIFL1sU3ExBoTHnWRZVM71q8oZR gas9wYP8buAU9l76Pmp0xtwGFyR86QmcDabiBbQpjDqnGutS4tga4fQgr uXzBdH4p+t8Hi31ZFAEgKFcGwEPooY+U0E98fIDAPWGvObVSRbDxnN1ou BNUc5KtcvTngabXH+9eH4Ha3FYDxQMmKv14oaD3kyweNQPYnb58E/F1IU iTWHh7oRZ8Xg7nlD25y8wl0C/Y0yi3PU/a9gWSdlvYMDZKANOMfq5q0AC QgBKTUYYErE/JH5vcds7Vzoba0f64/Za+CkZhxPyhLulL5DOuNBGwYJbx w==; X-CSE-ConnectionGUID: pKpXHSkeS9uslEmEcalUog== X-CSE-MsgGUID: /287TeCTSCy5hgGzYElKqQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360294" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360294" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:30 -0700 X-CSE-ConnectionGUID: //JMEOPMQSqxFgSqsXZ4aw== X-CSE-MsgGUID: 0UaXYhiIQpmn0W/gs56nVg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481703" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:29 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 09/26] power: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:15 +0100 Message-ID: <20240814104933.14062-10-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143158 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 0CD49457C0; Wed, 14 Aug 2024 12:51:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7C7D427AA; Wed, 14 Aug 2024 12:50:34 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id ADE7542D91 for ; Wed, 14 Aug 2024 12:50: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=1723632632; x=1755168632; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rPDEjrW5CIProqAoRtk6UF4BP1CH+fFx0rYBbDb3rqE=; b=U9D6HCJPuaKgsc7tkoT+KUrISQQTpTgjwl/oJbvApG/bcVTqP6BQ+NKy f/UguXXTCm6f8DgSVWd6Bf9xH89Q69wZOa0MYxehN17M/RO33uAX/HyoI 2b5ytHE69YP1RT48VLyTG8VPthlKu/bitR3U2Al98yBojvBRf9AfT82wE W3KLZHVQdoyYmFtu9mMpDsx397f92eRO6cMJKLo+chwNheQVjMPwkNodk u6Bz4dGgDSkaMRlSzvCLqxghpHuFKf6Xv4xLUovahH3KJn4+PUUD9VAjx isZx6PNuV5g/xVewfGTvCuGz5QBol6MCh7S8GY1ipqlfKftv7D0c6RTpo A==; X-CSE-ConnectionGUID: 6vgI1teWQIu8P+ISinO/Zg== X-CSE-MsgGUID: 7rP1G8lzQ8SKQ0CHkJ0jQA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360301" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360301" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:31 -0700 X-CSE-ConnectionGUID: Tt8k5D+xS86ayqJ9mehVSg== X-CSE-MsgGUID: J4QulTf+TBm939VvWoGUDA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481713" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:30 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 10/26] net/af_xdp: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:16 +0100 Message-ID: <20240814104933.14062-11-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143159 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 24C73457C0; Wed, 14 Aug 2024 12:51:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B47242DBB; Wed, 14 Aug 2024 12:50:36 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 3952B42DA3 for ; Wed, 14 Aug 2024 12:50:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632633; x=1755168633; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uv6bco8l6BpJUxRkzjzy5e8D4MGy5Zs/cqZarlX1tH4=; b=auSKo5uxDVzRvvRzqwr6jmwZrjuAqcZnjwDOg5XXmvNx8zOoMeDu+CBQ fFMM5N+OPX27myE0DvOe4qzsxvBCBScDLWxUg0e4UhEoxIG9aWeKvGWlA 9e3IPtu3ssrAsQHX1ri4ePBqAW1zP0xC/jvSrIuJ2Gy/UN2+ayKGrDHZu XC9jjow8l007jrhq6i1jso5mU+xTtJFQkhfdssw5VEQIYNE4TNVcCRG6e 9RIlJgk03qgfFfAsG8hn5exAEfOaNguCF575b9MCSIQ4bJMdCJhtfCRfM XWVWPIO6g24JAYB02xFX2kB02wdWfinYC+DGyFSrYErsfuZYZGIlDySYh w==; X-CSE-ConnectionGUID: VDUZP95HR8SBvdWudO+jiA== X-CSE-MsgGUID: n3nG4LJnRKGWmAJ1VjnBzw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360307" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360307" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:33 -0700 X-CSE-ConnectionGUID: Ff3d54ajSwK4/zcNjmP4ag== X-CSE-MsgGUID: 2Kh42cZJThqu4erN2fNPnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481722" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:32 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 11/26] net/cnxk: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:17 +0100 Message-ID: <20240814104933.14062-12-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143160 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 108CD457C0; Wed, 14 Aug 2024 12:51:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6540442DC3; Wed, 14 Aug 2024 12:50:37 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id A7FB542D7F for ; Wed, 14 Aug 2024 12:50: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=1723632635; x=1755168635; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OU4baj+hGRtYk8IhAJDFmzmT6iK8gF+6zvwAK/xPhRc=; b=bx6rtY/FfcxCX6F18xSvercf7pmGw0gnWFEpWTiU3DIXbXKIAtGrCM7c bOkstZFS0CDcQaVXpdDOzmK30igthsooULAqIWlLfvqHdf76n6KZkZqxh /vDuLvUBK9Op94dmVlyRcrhap6Ud7icEPp8zjzqxNmJFYwuSYVcS9h9vU nTo/Cor7gx6M3AW2f6Tq1ocXlHWBBzTEjzEuigDyzM2ehkjkkNU11dzWS 01ExRq7IU350hswPIlbbH0/rtjswQCNEBSh51Gn21DRS+f4n6wa9IJNcu 0DmAJjFcYKNhGycE/IzSQiKiFgmj8UuTN0ZKFf21SdKLk+axaZrVVRiQU g==; X-CSE-ConnectionGUID: Rce0TC0kTxSMh/LBSIRSSQ== X-CSE-MsgGUID: KFqqQ0U8RRGXUndrYou94w== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360314" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360314" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:34 -0700 X-CSE-ConnectionGUID: Y8VJDOPBSxSLR1tUxRRXPg== X-CSE-MsgGUID: jqdebkmcRResexvQf1HsOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481729" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:33 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 12/26] net/failsafe: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:18 +0100 Message-ID: <20240814104933.14062-13-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143161 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 8D64C457C0; Wed, 14 Aug 2024 12:51:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A20EB42DB0; Wed, 14 Aug 2024 12:50:39 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 1A18042DAC for ; Wed, 14 Aug 2024 12:50: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=1723632636; x=1755168636; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4F7P8MVvHuwsYOw/Y3ImLTDM/WvCATRhf1OIGc8gilo=; b=cUaTO0XaqL0Gga4LZYA4rZHLfU5M12Rzl8DVaRa5jhn/N9pl1Fr/q8Hk tqwEDDH2D9ONr3X7Uq1P2P4pUVBbM7oL4r2DGCB6DwmcXpsmlbqIUSkmx KBeCOX/6Qzq5ZHID+DciKyrn3IWA+y3dg4Cceb0qVHtPgZOH72NEvHKPS w8YL0eiZtuOmYISpvzx2jaLER5wB8FwsE+cmVV5XP1H/anqHNpIxWqyJS xMu/gVyH3tK+nGhRZ+kN8PqJdhF6PFQty6aiecnJZmHxKZrzyurcipfpb 3QfQ5vVssD4HCcWSJzt/Hm8jcjB0NQP08OcO7VQytWUgu1P+Vi5oVGpJ/ Q==; X-CSE-ConnectionGUID: nX/icBSvR9epqWwKaPThSg== X-CSE-MsgGUID: UOAfauxTQ/iZoxTCANexEg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360321" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360321" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:36 -0700 X-CSE-ConnectionGUID: Zt0uyX4FSq2tYHWkcNXxdg== X-CSE-MsgGUID: +nXIuTsXTomQDLag9r/euw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481737" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:35 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 13/26] net/hns3: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:19 +0100 Message-ID: <20240814104933.14062-14-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143162 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 D3171457C0; Wed, 14 Aug 2024 12:51:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AED5A42DD3; Wed, 14 Aug 2024 12:50:40 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 877CC42DC7 for ; Wed, 14 Aug 2024 12:50: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=1723632638; x=1755168638; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tl9YqIebl3lDHLNYHLdgRa86MBUeFY40sR+CTe6s6IQ=; b=CatEDGAFxoRv/Otf/ZYOySPxBaGwAcV0/jcUWQRcQKH2zqqPRfGyFwVw 7bbTbAM5OMti6K7/DfLcPHHuFwkUlbjNDHFNojd8WAm8BgTtncsW0Et3r C2FudVVFy2a02YPBxy7P9ZIBW9YUmjpTk2w0OstAVY8WEqtsFPgaCT165 8UyRd6v4HzKB0MstvcznhihYXMMr3H0ptbg/XN3ZHCBBa6bHX0waS40Z/ mS8aqUjKHRB9foNq52OGxgCVRz+LOCL1kR803pjs+w3qvwTMbxkhALUGn +VULZOSxeV831hG3QNjlUo2r4dTsNXh9pVmh9ADvVqm6OQ0Z3lxVHinGE g==; X-CSE-ConnectionGUID: xKKXL3pVS4eGusW0HfzzRg== X-CSE-MsgGUID: DXPSMKLKTrSW3gnsgVAWNQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360326" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360326" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:37 -0700 X-CSE-ConnectionGUID: hj5W9wMWRkqm5j9JjJXRfA== X-CSE-MsgGUID: uN4Pem1EQdaWDFNUQFYCuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481741" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:36 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 14/26] net/mlx5: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:20 +0100 Message-ID: <20240814104933.14062-15-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143163 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 5ECAB457C0; Wed, 14 Aug 2024 12:51:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C29A442DCE; Wed, 14 Aug 2024 12:50:41 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id F17A942D91 for ; Wed, 14 Aug 2024 12:50: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=1723632639; x=1755168639; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8Huakc2EqMrv01bgXBh09bZjZL8DUciuMgwjKIZXvVk=; b=klecPCLLTK+PAyJTiWAVV9Zcm2oJYL9bTSjSvr+3t5BnO/vwdwDrrUVL v/wvKcTy3LAFPv9lxjhXFk1XqV7lSbgrX1uEn5QlUs6mzC0MPdR/AQyD7 UPhH+Qw6pRXw3qRn5M7gbyLhOHTpSy+qL9Vn5574bL6PsozC8cNlGEGqs wKnn0n6ccMR0IQVXuV5+ObVl+qaruV640HkGij1g4TOXaIwNSWwuyZSUc rGTUA6FWfpAbxISfPWDPgBUkdGM9zQRFhtXwueJExu0n9P0oXnhyQ/CI3 JfLuZCvFlU9mpdKUF96T9OdqdGf8qtAGsiFnlI7TUfHWV0MADNhcEMwNJ Q==; X-CSE-ConnectionGUID: vkj1dmpISKiPgjG4FoK3eA== X-CSE-MsgGUID: odl+ULkfQtqoTzUNjaRYvA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360333" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360333" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:38 -0700 X-CSE-ConnectionGUID: eVCmvz5HSEStjbuNRvJ52g== X-CSE-MsgGUID: zrxlWa6wSuqlXbqC3qMGxg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481746" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:38 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 15/26] net/null: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:21 +0100 Message-ID: <20240814104933.14062-16-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143164 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 E90A7457C0; Wed, 14 Aug 2024 12:51:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 156E042DDC; Wed, 14 Aug 2024 12:50:43 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 7A85942D90 for ; Wed, 14 Aug 2024 12:50: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=1723632640; x=1755168640; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mdz+2zjQJzJ1Ft52hQmGU/XWBMgBZj3Lwlb/j2syexQ=; b=N2ubEK6i8M42pPBhxyujIxMysQeUKP4o92yq+oTiQeKhS/8P4gshDlU9 Cjps60jmROjjlJopeLIM5cbGZ7Ft7TS1Z1VQ6lgErgGeg7P28mgE9eOw3 cYZcLUvdTuZh1nhreJobGarG075IcqzETHR0gozNgKkC3Ws2AyQLSg84j 6JacKMg7wplkJ5alAJx5YDazJkJbH1zdFrV6JTKVaumO4UPfbSkcKvWnR A31rQXqZP91egx+/5Co8PCqCk1a4znkw4z3VwPB2nBJbUWdV53XZz8KV4 jk/xVyvQP17vek9OM3qH+aaCufRS18b7nQETCL0lvsOW7nFgj64BBJcEI g==; X-CSE-ConnectionGUID: bjFestcuQG2DX5obSlB57A== X-CSE-MsgGUID: D+ITLG/VRe+HpFby54PCdg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360339" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360339" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:40 -0700 X-CSE-ConnectionGUID: Aek2cBD2RCWvutJpNDOSFQ== X-CSE-MsgGUID: hsDaIUrQR2C7DJEQ1Wehgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481750" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:39 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 16/26] net/sfc: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:22 +0100 Message-ID: <20240814104933.14062-17-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143165 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 37BCD457C0; Wed, 14 Aug 2024 12:51:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CBC6442E0C; Wed, 14 Aug 2024 12:50:44 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id E48AF42DD6 for ; Wed, 14 Aug 2024 12:50: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=1723632642; x=1755168642; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gcuF6vvKC/p04Dc99dj1QGv0vNruGnvRUQxpIvuXx8w=; b=LHXK8jzMUtn0RoTdstbWvS+Znu7F1El1IYqwK6xK++MB0rLSPElEj6c5 Ad6ZURvd+KASNnIpMVfN8joDzjELCbH1rw9DCV5lJI8sd7Kz2uluWn/t2 VHOkjT5ApBbY4VY3oOEXmotmnVTIJI/v/4jZr9gOaprxKTALtPOs3SQFD 1IjfrfxXQlnqpWkfQ5xJmBr+EI/YCHdqKqnnDnMSKozMr8wO1d+IdMso4 GA/CJMrszbqn016XmrXPT5AVVjc+MrZ4X8f6YWeINAn70msYa1o8gCk6i LzBAuM0aHmx6DClHuq99y7WrrcGQaDrFhpG+jwC9MslF3YwNvLygYvz5S w==; X-CSE-ConnectionGUID: 7Yz/YtPyQNm6WrEw09UH6w== X-CSE-MsgGUID: bv2yBIMfRjK5VicNWlLifg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360345" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360345" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:41 -0700 X-CSE-ConnectionGUID: SzOQzK93Sl+KL0ejwLnKxg== X-CSE-MsgGUID: e9RK+DIQSRK/Rrh80eqriA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481755" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:41 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 17/26] net/thunderx: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:23 +0100 Message-ID: <20240814104933.14062-18-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143166 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 B9953457C0; Wed, 14 Aug 2024 12:51:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CDD042E15; Wed, 14 Aug 2024 12:50:46 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 6043542DDF for ; Wed, 14 Aug 2024 12:50: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=1723632643; x=1755168643; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/XxQ9+HkEyqD7bMD/jB+55AUfCdWjQjgElBvVKPWS84=; b=fYwzexw9pwf8cHaYQH97qzE5w98w4n/EoDgv4npvpDWZAltiQOeirfbQ yK3tChaG2+JS6GEYleaFH51FYwgHrR7T6uxn5aAzQvOIJsCKMMI5YyXOG YtqUEXHvEsjMp7iYj7MK2RASFpzvT+Uo38/1EN4VSz3XML5Jofu1YwEk5 BLU9JtAQF2mSoCiM9admnFH+BJ00j5i9DVVgsqg3dPRtrLE1HcMsfdLLW d/pBXZXpQs/+406m5PD/a12M/mAIssEcv97JTqakyCjYwXubiZLq2y4DZ QoQArScHl410xzPGhOJ2X7MjpxXqsaExduqj57rA/AtizUrHPQjDpuLGm w==; X-CSE-ConnectionGUID: WgTLdpYsSvWXwE5bW3pOfg== X-CSE-MsgGUID: Zp0Oz2luTLuJs4/gTixa5Q== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360349" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360349" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:43 -0700 X-CSE-ConnectionGUID: vKl518EjSTGudGbdKsgE/Q== X-CSE-MsgGUID: H5we3bETSv+qPwiFtzPtCw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481760" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:42 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 18/26] net/vhost: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:24 +0100 Message-ID: <20240814104933.14062-19-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143167 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 D0C5F457C0; Wed, 14 Aug 2024 12:52:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2B9542DE4; Wed, 14 Aug 2024 12:50:47 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id D282042E10 for ; Wed, 14 Aug 2024 12:50: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=1723632645; x=1755168645; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=17secMHMGKoq+KGHU4O8QvcEXWZWAnaLexRVHDbDxPQ=; b=HkbiOA6NqBusYoxXyosw+tUmmBqjj0q43Vi512dTfIVJIZqxzAb3HDCO mxgwUMVqNQwrodY8lnZw5R9vGk0IvW6OmqPsQTRZeda470Rq+y4jn9KW2 raQ67Z/UDtIUKk0fxaO1CWQ1dUpPuhEFgi/j3gN/4OEb3EEY7gzM/N8Gn bsjBijMCp1La7mAdZus3Boi8K6S7hYLZnAjwmU/aJcW9H3ZfrOZjj+CzL T00z3qZFLyhdlk3nu472i8m5dDiX3epjG6gxS/qJ/jrXt/neZcJEL5stX tdYhPTCCtuWrSPYjU5mOaOKLV9jxM3C7gH8MbWmWHwccqVdgdo4oSxZuk A==; X-CSE-ConnectionGUID: 0OhZ6rkBTxG34AfUzli0xg== X-CSE-MsgGUID: yMVy4PnxSUiVaYpiyqN+kw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360357" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360357" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:44 -0700 X-CSE-ConnectionGUID: qwXbPSxzRUqMy3vpDE1yOg== X-CSE-MsgGUID: ft7lDJCoSsyeLFJWmGD2qw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481769" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:43 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 19/26] app/dumpcap: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:25 +0100 Message-ID: <20240814104933.14062-20-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143168 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 E85CC457C0; Wed, 14 Aug 2024 12:52:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F339842E44; Wed, 14 Aug 2024 12:50:48 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 4EA4B42E1C for ; Wed, 14 Aug 2024 12:50: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=1723632646; x=1755168646; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B7X4teW8wanFonofbILw8xeu5uk9bP2aJxc0Nj2MLuY=; b=P3RQlN4rNID4JqO04S+1+Yi+27Gk1NRrUvjx+o9M3mXv7USIsUSJo0c+ 9d1aWTijS2W4yj7hcTu28CAYwzhX7xTPW9d8GeXJpmEC78+NwRaUSz8Tw H35ZxXt5EM5eZN8JCLnpO6OZ/K28IjMAoc2QlaDzKfjt6hne6MRQKx+Bz Ti/PhatJmunasMNox+cPsetVZLslXbyW7zwGkfXslM0IZyzy1sjTq2e3G ftOovcA7vY2b1/P4NT/S9D8U61cwIlHef9mmtTfv/LUPupiTq4If+m6// 1CdbK0IrSsCB7299Xx/49LDtPe6iKCNabaeYGTXoGyqIEcxPs61vY3rW5 Q==; X-CSE-ConnectionGUID: rO8oO7zDT2S/8FvpX/Zq9A== X-CSE-MsgGUID: Ar/AtvJ+QQWKxE7N0jR+/w== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360368" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360368" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:46 -0700 X-CSE-ConnectionGUID: csnPcIaNQEeGq+HdPT2fUA== X-CSE-MsgGUID: hsvq20L+RVi0LZssclqSFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481777" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:45 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 20/26] app/test-pmd: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:26 +0100 Message-ID: <20240814104933.14062-21-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143169 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 0963F457C0; Wed, 14 Aug 2024 12:52:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2A3A842E49; Wed, 14 Aug 2024 12:50:50 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id BA67342DFA for ; Wed, 14 Aug 2024 12:50: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=1723632648; x=1755168648; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C7J/ReBtl28YEwkPnECWBetJhrkmGO9MXA0vlFoorso=; b=VJowQLFTE58oLoL5WD8rhes8fFfdiiJKJeL7qkxMPqf3j+Bu5pFQyngV ufEAifhe/P7NyD22Jm3ePg3/W55ZyX0S5NNnP6LusNofrox9KdooOFasH g2LicG3vAX6wQJzdMXE+2mNEfhNnDc/GBvDJstghkNlKqR/Us12SHDZLh +R4/P7s9wJ9HeRIiauEYBDlPE9Cl04fP6F7r+4lbUCf+d//nSp7vWqn++ Hjopk4hZOFPJAf8cR6cviaPHDtfcCbU/6M7+5NNExGRGqa6JYUB70H2fj BZaExcsU3zLB+Qekgf9jAqJRnChTbvhhftb0FZjAi4IZZjCtwMsh3Gfbl w==; X-CSE-ConnectionGUID: YKJjv9h1SZubEtaKJwviJA== X-CSE-MsgGUID: jRvPIpPgQ266PFnllMxcTw== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360378" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360378" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:47 -0700 X-CSE-ConnectionGUID: XnTcvb7vSAC5Cp6JxwctvA== X-CSE-MsgGUID: +C+OgpZRT+aKnkrcdYbf3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481786" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:46 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 21/26] examples/ipsec-secgw: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:27 +0100 Message-ID: <20240814104933.14062-22-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143170 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 9557B457C0; Wed, 14 Aug 2024 12:52:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0E3742D6A; Wed, 14 Aug 2024 12:50:53 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 3F13242E46 for ; Wed, 14 Aug 2024 12:50: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=1723632649; x=1755168649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rnJvdTYfN60v3FP/ZyrCuqiRI7hUoWntXF/97IQe82Q=; b=B0Qpv36tdSYc+xnsNL4Y73chcWadnw5AUPfzsGiuHtCpX9tc5rjWAgaa g3ZVqw/+LhYy0qvuxYEOeUxgETwzyWzV8FqDxeoS+lWP12tpAG3IM1zlW b6UabJ0sFAPAlcy82631ym/NSYNfhqRVItSzWT+CS/oH+dzgGvHVJQMtI DnUvDiVtbBaIdwOmzd8UL/W1EAclQW7rk+f5ICHNq89/f2BheU1alJ3pb qzwEskNBHw+zOmoL9ncII3pqgKEGD30YL++cpUjC7JFpRQbT7vX7WWjdt ZyjDOypHXnZjHcOzdLp8lMfehoN6UzW+3eQE/V9nHZonZjKg9QX9YCtmP Q==; X-CSE-ConnectionGUID: QN1Uda0mRfaJooAohxIrag== X-CSE-MsgGUID: dCEDD8FBQUSpTwpstZqxnA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360391" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360391" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:49 -0700 X-CSE-ConnectionGUID: vLv+v6juSYaoWZQc8ODMeg== X-CSE-MsgGUID: lHqUDXWMT0qL8s8RFPwbPQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481792" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:48 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 22/26] examples/l3fwd-power: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:28 +0100 Message-ID: <20240814104933.14062-23-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143171 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 9E7DC457C0; Wed, 14 Aug 2024 12:52:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E21D440274; Wed, 14 Aug 2024 12:50:54 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id A8C0642E45 for ; Wed, 14 Aug 2024 12:50:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632651; x=1755168651; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=p6kROirfN4sTNph9PulI4CGYkGAru5dgH2GM7vJZVx4=; b=GrVfoD5/CGeCnFKo35OPEvS8t2geQWUFpvVkjx5I3vJh8a/FRz11irki uoruqS2uVMEi3FkSCae4ofzYZm3qC9CYUeIOlMOsdPcmbvj7rAj/PX46G PeO+SU65J2rCk7BqOmnFjgFQsQCTVjk3OL8PgYt2Ktw0o1JSDfhfTmN84 33XltZw9SqSdcB40OSMZlJmSmb01nlimiLQOSYvk/MRCnnymwp06vRxqw B4TMC8sFe39W/G4//MurH9M6TcZvlKtSCGPV+7blTaXdh+fFEn8kPU/zB UNt6eTFV2HT+ZW495MmETBetWX+wUz8iFzzIXm9AOA9rUQvy1IoAcNvzf Q==; X-CSE-ConnectionGUID: IuZbaIaNRHCKBIHMWU1QbA== X-CSE-MsgGUID: IW1DB56XT2eA3SzujPNPcQ== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360403" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360403" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:50 -0700 X-CSE-ConnectionGUID: VuQbpKHNRImfIhwG8BzJlQ== X-CSE-MsgGUID: psm90lZGTuCqrfNvqmuvkA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481798" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:49 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 23/26] examples/l3fwd: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:29 +0100 Message-ID: <20240814104933.14062-24-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143172 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 B5695457C0; Wed, 14 Aug 2024 12:52:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 370E042E5F; Wed, 14 Aug 2024 12:50:56 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 3844A42E57 for ; Wed, 14 Aug 2024 12:50:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632652; x=1755168652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IjC3B5WvwoeLgZFJ+nk0OH7u64E5kytBvzrlKB67EHs=; b=TK2M1LN7Qm8McnjVIDCwv4DDwatO6DFov/iJellXNCIl9e2Yjo/+IAKg xSI6Sb/7u+GoamvSxF87I2eCUf5a3eHbveR0aFxcZiBY/lcxE9X9xB4iq tyklu4PENgXAElgykAuK1NVcKCS68OxJaJv4OK3vGJ3gC6sQLCJpCiSKV M145lmdYbreNOklGt3q9r90M9fAWNAR1MbaGYiDjbbLIae4G8WpfMflHt GFoqnW7F+jaMEynrr/6voetGyetoN+tChZ5ZxH1UzkOVoTIx1A6eI9ff+ GE7qVsMEWoKY0mXBC3NQteTYUcnJhGPDYv+pRW6dvE0EWXHeajUvtjFXe g==; X-CSE-ConnectionGUID: JhVp/v1cRKOkDAqEGMLFgw== X-CSE-MsgGUID: WBZ9AD4iSlSU0q3XEs9LrA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360413" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360413" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:52 -0700 X-CSE-ConnectionGUID: ET2CvJuURQiLDQ8ZqlzsgQ== X-CSE-MsgGUID: y/2JEA5wQ+ap9q7NIcZW9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481804" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:51 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 24/26] examples/vhost: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:30 +0100 Message-ID: <20240814104933.14062-25-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143173 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 A22E8457C0; Wed, 14 Aug 2024 12:52:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EB2142E5B; Wed, 14 Aug 2024 12:50:57 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 9976E42E5A for ; Wed, 14 Aug 2024 12:50:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632654; x=1755168654; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D5HglSYmmiS+oUwwoQIHKX5BPiTtkVErKa5HeMrdEk8=; b=m8qqW7K7VCAacZg5sHkhlQH3h8aFJov9UU/ksIlS6aC0LJY9oG29QTnn v/BMY1CKGzvk8IVSuzc4NYxTEg3LHDQu7/vV+YV2U7bkvdFF8x4weBU1J tLvCPr+hyxiB8bSWe6TO5u8xeEGXlBzmtofLUe3OwAVd1E8bTUoOY6FrI DhmcfSemz3Jci7GSEKNUn2u5AQxjY6AJ67elsiiCN6GvM5a9OidbIdkCc xuD8XwEcLo6OaTSWsgl6AzcXWNLwcsY0nnvmP4DVr358g/hZcOqSu97Ti cDYGBpUXGd2HsHxONDfMCnZjfELfra9e3hkdeOeULH3OroAyeHVfFkMQH A==; X-CSE-ConnectionGUID: +Nvi13sATyer/TI5yvIOvA== X-CSE-MsgGUID: 8AOOZbRvTO+8axs6Ut15rA== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360420" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360420" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:53 -0700 X-CSE-ConnectionGUID: rnMqr2UYTVaazL2+sNsEgA== X-CSE-MsgGUID: L4xtMUqiSwKpfRlXLSWfpA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481808" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:52 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 25/26] config: make queues per port a meson config option Date: Wed, 14 Aug 2024 11:49:31 +0100 Message-ID: <20240814104933.14062-26-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 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 Acked-by: Morten Brørup --- 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 Wed Aug 14 10:49:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 143174 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 41CC8457C0; Wed, 14 Aug 2024 12:52:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA1AC42E63; Wed, 14 Aug 2024 12:50:58 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 16C0C42E58 for ; Wed, 14 Aug 2024 12:50:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723632655; x=1755168655; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O7LokkuhvGyQHb2ayGHmERCDEXiNaNjhDprVaf4Mj6c=; b=i3Hvqdk7g7UzVJAzFFndzYj6NmQhL/d0hrfEcLONiDaCox6HNCvBYA4q dEe4YN5uUOlwr4+OUTqxNJzs3qtG/MKABoWWeaYiVyIKFweY9r/pCz+c9 Vsb1fQgOWuQ8LXDCdUAU5c8/3wT4a/ifVrrzz7u8B39a2FvBddOgy50LM gl7NTcIYzZrjoACPPQvhj3cz3i9sqggNy475dQB0EdWDORjomi6NvZmRx 3ef+baAeR6+P81j6nY7b9isAbhwR5ua0VA3q4wCzDZg7iAyTZfC31+S3+ oeoCTrcoY8wfFbWEiWNlPPa+IzfF18Y9np6syHAQwUT6jVXfesjl2DIW2 A==; X-CSE-ConnectionGUID: uxi7KJGqRN+DpLolkU4DKA== X-CSE-MsgGUID: j35yuWkrTLaV4VVKsULcNg== X-IronPort-AV: E=McAfee;i="6700,10204,11163"; a="44360424" X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="44360424" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2024 03:50:55 -0700 X-CSE-ConnectionGUID: 1aRj9PO8QluKNiCeCUgsgQ== X-CSE-MsgGUID: YRF5/HFWQpG7P8UitgJYMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,145,1716274800"; d="scan'208";a="96481812" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa001.jf.intel.com with ESMTP; 14 Aug 2024 03:50:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson Subject: [PATCH v3 26/26] config: add computed max queues define for compatibility Date: Wed, 14 Aug 2024 11:49:32 +0100 Message-ID: <20240814104933.14062-27-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Morten Brørup --- 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 -------------