From patchwork Tue Apr 16 15:19:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 139420 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 DCFA543E83; Tue, 16 Apr 2024 17:21:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 49ADB402BD; Tue, 16 Apr 2024 17:21:31 +0200 (CEST) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id 8A5EF40262 for ; Tue, 16 Apr 2024 17:21:28 +0200 (CEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1e4f341330fso37590795ad.0 for ; Tue, 16 Apr 2024 08:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1713280887; x=1713885687; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QW+HKNGxUagYmmYl1XJKUzn5fTnWCQoUK/WJxFrsHPQ=; b=1udf59DM88ZS61n7pjfZjutgXwB04riOqpwozQRjKImZStcDRovLwZdEHRC1Vd2k6r j+dfTlx1PgVhWoHCRaVNEJsejVWbdgPLSqcY0jvmQizbTJZa/mxYh64nazxpR1TTwy0Y d6J0gZLd48k0TMQHfpe0u1QBmM4egNWBuvC2YZlc4BswVjWO1e65HEA6GHliVBu3ynxr xyw5YWbUKEoV0AbMUJJGghD7CGyf6Nr4vfezIcM6Phcpz2pQPpcuFvdcyJ5y2+7OXh84 E8k2lxM5I9Xujfn+SmXtl5G6ue92Iy0mR7XYWQOdBcENrwQAwA2rXKhljQ+JikNQehUA /fUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713280887; x=1713885687; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QW+HKNGxUagYmmYl1XJKUzn5fTnWCQoUK/WJxFrsHPQ=; b=ZXN9uDQUdgLEsX3a1R15qSe3NBlyVJ8VoaoauAdj1M2V1GTNXm6llJ0UcRHa00R0Xp r8OPYMTroI/EcbB3fq8ye3nKa9vVsPqVsI21HIYrtyhRB1uTUon9pEbAfE1zRLpUeqvj vwh0anpm9Mbbnw7FvTXXxRpwr5i3bUZU6OvrP/q1NqL7LajeXxI1D8MRwgx3SGg3/gRg p1EnEonZGERwsCXPlUSbADaaGLy60TMKtPlGbfCTKrN4ZEWFv5vYIfK8zrsECm/pBSZ+ V4S3ahLjuyYYmrj29PaDTIyIGtPng/uFfh/+sGDxjHISSqrSB8+vw2xECPX896oBWawl Hrrw== X-Gm-Message-State: AOJu0YwEytdNz+Eegro5NFte0vRYimUKUU8T+LDo3kItjxde0u3qSdQb DbOH6TqPyvpwqESuwTy51gQYa+HaeOI03muPJmOWExK4j8+Yw+Vm7Mu/ZILJlYcU4cp/9glUKAk i X-Google-Smtp-Source: AGHT+IEYO2TlGDuFAVEp7WCSJj4rdeqGgFd8p1qKBKBCd10HEPMBjvuxpn2TMn5wZ83v5/UEeHTPrQ== X-Received: by 2002:a17:902:e809:b0:1e3:d470:823d with SMTP id u9-20020a170902e80900b001e3d470823dmr13153592plg.21.1713280887628; Tue, 16 Apr 2024 08:21:27 -0700 (PDT) Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id l17-20020a170903245100b001e80154a400sm213348pls.126.2024.04.16.08.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 08:21:27 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 1/5] cocci: add script to use RTE_DIM Date: Tue, 16 Apr 2024 08:19:27 -0700 Message-ID: <20240416152124.69590-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240416152124.69590-1-stephen@networkplumber.org> References: <20240416152124.69590-1-stephen@networkplumber.org> 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 New script to find RTE_DIM should be used. Signed-off-by: Stephen Hemminger --- devtools/cocci/rte-dim.cocci | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 devtools/cocci/rte-dim.cocci diff --git a/devtools/cocci/rte-dim.cocci b/devtools/cocci/rte-dim.cocci new file mode 100644 index 0000000000..e7fcadec98 --- /dev/null +++ b/devtools/cocci/rte-dim.cocci @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: BSD-3-Clause +// Use RTE_DIM macro instead of dividing sizeof array with sizeof an elmemnt +// +// Based of Linux kernela array_size.cocci +// +@@ +type T; +T[] E; +@@ +( +| +- (sizeof(E)/sizeof(E[...])) ++ RTE_DIM(E) +| +- (sizeof(E)/sizeof(*E)) ++ RTE_DIM(E) +| +- (sizeof(E)/sizeof(T)) ++ RTE_DIM(E) +| +- RTE_DIM((E)) ++ RTE_DIM(E) +) From patchwork Tue Apr 16 15:19:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 139421 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 8A5FB43E83; Tue, 16 Apr 2024 17:21:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3DD614067E; Tue, 16 Apr 2024 17:21:33 +0200 (CEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id 0AE3F4028B for ; Tue, 16 Apr 2024 17:21:30 +0200 (CEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1e36b7e7dd2so36423785ad.1 for ; Tue, 16 Apr 2024 08:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1713280889; x=1713885689; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SXf8rsNlxTg2W7+ABh5D0c+4+ybfcOuKiyiT8vTpnzs=; b=KdvOpikWXenNLfG42RXHFtDv/xH1qwf1/JVnyL1J6LOlvKWt2ORI6SbGXPUNZejr5G ZeF//l5FKBByskKTPMy9P8rDmaQ8RJL5LTaPt3BwWRJALN+y37D0hpeC7vNOw0G4EPBc mrRnYnbvf/XMRGATf5KoXFkfcWzV+vrzLrH7DfRvoN6/Xqp3IRLpJJngyW69AEwEdAR8 tlcXlp74d/L04lfXznJcjZyMdZ4U+s8tD17yg3sXlQ9gXlqCUDAIysx0Rc5zei/qfPZr XYWqXJI1YNigsf+GwCROIzXvEyYl++28U9DalvBrVC0QaCBQ7g0BuArgAVao76sKcdqP 1H5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713280889; x=1713885689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SXf8rsNlxTg2W7+ABh5D0c+4+ybfcOuKiyiT8vTpnzs=; b=gJFTPDh7rdiOQZv/atMzlgoIvjorAtjR13e8GCdVl9dim7nX0rEpK3snBr2l1e2pm0 bgu34/w/0II5WWYp+/vGiWkVw4MLoqsNszMNRRP+x+Os5qxL7oE6r5j2xYXvKNhFu2rA vxPa9qfs+LfRjpvkRXp7CnwJA/n6w1Wg66zqc+lTJMlIuITqzEMyPMZgJjTpzKKXqOP6 rUCxoeb5XiYT6FHxSOLtzI9NoaEBwGgjqM6GfUBT8O/95bQN7lGTF8sj5aREu0k4HUVA SwTgIP+1rXyCPgHSiEZIgwIAQKMy+jaGt37NZCvPekYpCVSv2hDDsVopGXdMAZ7a368D t6zw== X-Gm-Message-State: AOJu0YyqUHLaPfZtQSkjeCOBNVRS7CidGh9/neet3o3YP9ePxH1uneoA 5PdD9qLbC6hVoQYoL4+y0QopW8hTRUuBnWGlMyy1Vj2AIhs3G/vjDs0RfXD0paps6pC+U8Bvo0e N X-Google-Smtp-Source: AGHT+IEmu1MPAYs31frjDXDcqX7oeXbghW4k2rZFPUqk+Tl8kcKlei7pwxzjYSu96mnorR2oqgC7gA== X-Received: by 2002:a17:902:d50a:b0:1e5:b82:3c24 with SMTP id b10-20020a170902d50a00b001e50b823c24mr13677225plg.53.1713280889183; Tue, 16 Apr 2024 08:21:29 -0700 (PDT) Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id l17-20020a170903245100b001e80154a400sm213348pls.126.2024.04.16.08.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 08:21:28 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Wisam Jaddo , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Akhil Goyal , Anoob Joseph Subject: [PATCH 2/5] app: use RTE_DIM Date: Tue, 16 Apr 2024 08:19:28 -0700 Message-ID: <20240416152124.69590-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240416152124.69590-1-stephen@networkplumber.org> References: <20240416152124.69590-1-stephen@networkplumber.org> 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 Use RTE_DIM instead of computing directly with sizeof. Patch automatically generated via cocci/rte_dim.cocci. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff Acked-by: Akhil Goyal --- app/test-flow-perf/main.c | 4 +-- app/test/test_ethdev_link.c | 3 +- app/test/test_security_inline_macsec.c | 47 +++++++++++++------------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index e224ef6798..e9ef1ae04c 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -965,9 +965,7 @@ args_parse(int argc, char **argv) "meter-profile") == 0) { i = 0; token = strsep(&optarg, ",\0"); - while (token != NULL && i < sizeof( - meter_profile_values) / - sizeof(uint64_t)) { + while (token != NULL && i < RTE_DIM(meter_profile_values)) { meter_profile_values[i++] = atol(token); token = strsep(&optarg, ",\0"); } diff --git a/app/test/test_ethdev_link.c b/app/test/test_ethdev_link.c index f063a5fe26..e305df71be 100644 --- a/app/test/test_ethdev_link.c +++ b/app/test/test_ethdev_link.c @@ -135,8 +135,7 @@ test_link_speed_all_values(void) { "Invalid", 50505 } }; - for (i = 0; i < sizeof(speed_str_map) / sizeof(struct link_speed_t); - i++) { + for (i = 0; i < RTE_DIM(speed_str_map); i++) { speed = rte_eth_link_speed_to_str(speed_str_map[i].link_speed); TEST_ASSERT_BUFFERS_ARE_EQUAL(speed_str_map[i].value, speed, strlen(speed_str_map[i].value), diff --git a/app/test/test_security_inline_macsec.c b/app/test/test_security_inline_macsec.c index f11e9da8c3..26f7504dc2 100644 --- a/app/test/test_security_inline_macsec.c +++ b/app/test/test_security_inline_macsec.c @@ -1294,7 +1294,7 @@ test_inline_macsec_encap_all(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; err = test_macsec(&cur_td, MCS_ENCAP, &opts); @@ -1332,7 +1332,7 @@ test_inline_macsec_decap_all(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; err = test_macsec(&cur_td, MCS_DECAP, &opts); @@ -1371,7 +1371,7 @@ test_inline_macsec_auth_only_all(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_integrity_vectors) / sizeof((list_mcs_integrity_vectors)[0])); + size = RTE_DIM(list_mcs_integrity_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_integrity_vectors[i]; @@ -1410,7 +1410,7 @@ test_inline_macsec_verify_only_all(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_integrity_vectors) / sizeof((list_mcs_integrity_vectors)[0])); + size = RTE_DIM(list_mcs_integrity_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_integrity_vectors[i]; @@ -1451,7 +1451,7 @@ test_inline_macsec_encap_decap_all(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; @@ -1492,7 +1492,7 @@ test_inline_macsec_auth_verify_all(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_integrity_vectors) / sizeof((list_mcs_integrity_vectors)[0])); + size = RTE_DIM(list_mcs_integrity_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_integrity_vectors[i]; @@ -1578,7 +1578,7 @@ test_inline_macsec_with_vlan(void) opts.nb_td = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_vlan_vectors) / sizeof((list_mcs_vlan_vectors)[0])); + size = RTE_DIM(list_mcs_vlan_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_vlan_vectors[i]; @@ -1653,7 +1653,7 @@ test_inline_macsec_pkt_drop(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_err_cipher_vectors) / sizeof((list_mcs_err_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_err_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_err_cipher_vectors[i]; @@ -1693,8 +1693,7 @@ test_inline_macsec_untagged_rx(void) opts.mtu = RTE_ETHER_MTU; opts.check_untagged_rx = 1; - size = (sizeof(list_mcs_untagged_cipher_vectors) / - sizeof((list_mcs_untagged_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_untagged_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_untagged_cipher_vectors[i]; @@ -1747,7 +1746,7 @@ test_inline_macsec_bad_tag_rx(void) opts.mtu = RTE_ETHER_MTU; opts.check_bad_tag_cnt = 1; - size = (sizeof(list_mcs_bad_tag_vectors) / sizeof((list_mcs_bad_tag_vectors)[0])); + size = RTE_DIM(list_mcs_bad_tag_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_bad_tag_vectors[i]; @@ -1786,7 +1785,7 @@ test_inline_macsec_sa_not_in_use(void) opts.mtu = RTE_ETHER_MTU; opts.check_sa_not_in_use = 1; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; @@ -1825,7 +1824,7 @@ test_inline_macsec_decap_stats(void) opts.mtu = RTE_ETHER_MTU; opts.check_decap_stats = 1; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; @@ -1866,7 +1865,7 @@ test_inline_macsec_verify_only_stats(void) opts.mtu = RTE_ETHER_MTU; opts.check_verify_only_stats = 1; - size = (sizeof(list_mcs_integrity_vectors) / sizeof((list_mcs_integrity_vectors)[0])); + size = RTE_DIM(list_mcs_integrity_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_integrity_vectors[i]; @@ -1906,7 +1905,7 @@ test_inline_macsec_pkts_invalid_stats(void) opts.sectag_insert_mode = 1; opts.mtu = RTE_ETHER_MTU; - size = (sizeof(list_mcs_err_cipher_vectors) / sizeof((list_mcs_err_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_err_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_err_cipher_vectors[i]; @@ -1943,7 +1942,7 @@ test_inline_macsec_pkts_unchecked_stats(void) opts.mtu = RTE_ETHER_MTU; opts.check_pkts_unchecked_stats = 1; - size = (sizeof(list_mcs_integrity_vectors) / sizeof((list_mcs_integrity_vectors)[0])); + size = RTE_DIM(list_mcs_integrity_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_integrity_vectors[i]; @@ -1982,7 +1981,7 @@ test_inline_macsec_out_pkts_untagged(void) opts.mtu = RTE_ETHER_MTU; opts.check_out_pkts_untagged = 1; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; err = test_macsec(&cur_td, MCS_ENCAP, &opts); @@ -2020,7 +2019,7 @@ test_inline_macsec_out_pkts_toolong(void) opts.mtu = 50; opts.check_out_pkts_toolong = 1; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; err = test_macsec(&cur_td, MCS_ENCAP, &opts); @@ -2058,7 +2057,7 @@ test_inline_macsec_encap_stats(void) opts.mtu = RTE_ETHER_MTU; opts.check_encap_stats = 1; - size = (sizeof(list_mcs_cipher_vectors) / sizeof((list_mcs_cipher_vectors)[0])); + size = RTE_DIM(list_mcs_cipher_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_cipher_vectors[i]; err = test_macsec(&cur_td, MCS_ENCAP, &opts); @@ -2095,7 +2094,7 @@ test_inline_macsec_auth_only_stats(void) opts.mtu = RTE_ETHER_MTU; opts.check_auth_only_stats = 1; - size = (sizeof(list_mcs_integrity_vectors) / sizeof((list_mcs_integrity_vectors)[0])); + size = RTE_DIM(list_mcs_integrity_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_integrity_vectors[i]; @@ -2146,7 +2145,7 @@ test_inline_macsec_interrupts_all(void) rte_eth_dev_callback_register(port_id, RTE_ETH_EVENT_MACSEC, test_macsec_event_callback, &err_vector); - size = (sizeof(list_mcs_intr_test_vectors) / sizeof((list_mcs_intr_test_vectors)[0])); + size = RTE_DIM(list_mcs_intr_test_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_intr_test_vectors[i]; @@ -2194,7 +2193,7 @@ test_inline_macsec_rekey_tx(void) opts.mtu = RTE_ETHER_MTU; opts.rekey_en = 1; - size = (sizeof(list_mcs_rekey_vectors) / sizeof((list_mcs_rekey_vectors)[0])); + size = RTE_DIM(list_mcs_rekey_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_rekey_vectors[i]; @@ -2236,7 +2235,7 @@ test_inline_macsec_rekey_rx(void) opts.mtu = RTE_ETHER_MTU; opts.rekey_en = 1; - size = (sizeof(list_mcs_rekey_vectors) / sizeof((list_mcs_rekey_vectors)[0])); + size = RTE_DIM(list_mcs_rekey_vectors); for (i = 0; i < size; i++) { cur_td = &list_mcs_rekey_vectors[i]; opts.rekey_td = &list_mcs_rekey_vectors[++i]; @@ -2277,7 +2276,7 @@ test_inline_macsec_anti_replay(void) opts.sectag_insert_mode = 1; opts.replay_protect = 1; - size = (sizeof(list_mcs_anti_replay_vectors) / sizeof((list_mcs_anti_replay_vectors)[0])); + size = RTE_DIM(list_mcs_anti_replay_vectors); for (j = 0; j < 2; j++) { opts.replay_win_sz = replay_win_sz[j]; From patchwork Tue Apr 16 15:19:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 139422 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 1612443E83; Tue, 16 Apr 2024 17:21:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B240440685; Tue, 16 Apr 2024 17:21:34 +0200 (CEST) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mails.dpdk.org (Postfix) with ESMTP id 460A0402B5 for ; Tue, 16 Apr 2024 17:21:31 +0200 (CEST) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1e4266673bbso39309775ad.2 for ; Tue, 16 Apr 2024 08:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1713280890; x=1713885690; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nav7lAK0ucJlwAFMTsmjceBYo6WiazFyW76X9yQMvpU=; b=hxOfXWiADxS5mduRgiiX/+cgni+0cf4JMvsELUByZEm3mU6JLy7wguDuQgX1EoAu4z rnoReM2S0St7QtZRWF5Mw/E/nqyP27ZNvXWi6jAMW2Jm729BLjRjGl6evhhvnrE5Y6Pe cKuH9Xd0xOv/v8Wut7uK0+WSpoF3HaYilWxPDYyQe4MHOKlgAwRrH9Byo/4JHAnNztyK AiGQ4TMhv7uLMcgJq7CCZTivpHtesBQumyU6XTinPg8yz+3tDtMNsr++HNAU+CEjb03w 2VvKz+Eg2zBb4uPa8wX7/seNTef7cWtxEUtDPznBZY7eDV1qMoK3mLez6+RJRTAht1Gf ZgMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713280890; x=1713885690; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nav7lAK0ucJlwAFMTsmjceBYo6WiazFyW76X9yQMvpU=; b=mOro/Fb8OCgAx3ymjADEK/2AOm5/CZW6MD/5f6NZ249YDSxW64wGl93fzacRSPyUiS IZhslucjfbHRZOseNS9nHUSH5aHEN/j1TBa12fVafRF9hpYAPb4iUh+u5UTg0Qxbh9YJ Qx2kGOcWIbsTTPZC1jlnIAkmHCb7dPv4tUFNeTGiMBNti7m+eP0DjhAetyShpRBJkj2g xeMwjEr7AnPJRniPggh8wuXJ2MGfjJY/jhB9+JhYmprBW0SNWoLpK424L4SwWnEH8v/u SKBwGmlWwohkTwFMOnICctnL7VezyVeCFc78Npkker5vRSyKaJAagkHOzgcan/ynGvxq 9+sw== X-Gm-Message-State: AOJu0Yw/riMjnDYlf+zja4AS2mmAYobcUn2kBdcBp91DNa+KICyOm57B QNbgDLTQkkIrBR6CN8SIkCuwQSfVpLbDLg3M5hMuxENofYX1QU6aK9HtHhBax3Okb6a4EAXYoeg f X-Google-Smtp-Source: AGHT+IHGr0QwOViUNzymIeVr3Hl4r1/9VC6CiT3NyLmJAVRlFWJlXrFvub9BRac3t5F+nh9omn5D0Q== X-Received: by 2002:a17:903:22c5:b0:1e4:55d8:e74c with SMTP id y5-20020a17090322c500b001e455d8e74cmr17111141plg.2.1713280890499; Tue, 16 Apr 2024 08:21:30 -0700 (PDT) Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id l17-20020a170903245100b001e80154a400sm213348pls.126.2024.04.16.08.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 08:21:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Reshma Pattan Subject: [PATCH 3/5] lib: use RTE_DIM Date: Tue, 16 Apr 2024 08:19:29 -0700 Message-ID: <20240416152124.69590-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240416152124.69590-1-stephen@networkplumber.org> References: <20240416152124.69590-1-stephen@networkplumber.org> 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 Use RTE_DIM instead of computing directly with sizeof. Patch automatically generated via cocci/rte_dim.cocci. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- lib/cmdline/cmdline_vt100.c | 4 +++- lib/latencystats/rte_latencystats.c | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/cmdline/cmdline_vt100.c b/lib/cmdline/cmdline_vt100.c index 4c9a46c953..61a2ecdd72 100644 --- a/lib/cmdline/cmdline_vt100.c +++ b/lib/cmdline/cmdline_vt100.c @@ -8,6 +8,8 @@ #include #include +#include + #include "cmdline_vt100.h" const char *cmdline_vt100_commands[] = { @@ -56,7 +58,7 @@ match_command(char *buf, unsigned int size) size_t cmdlen; unsigned int i = 0; - for (i=0 ; i X-Patchwork-Id: 139423 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 1260343E83; Tue, 16 Apr 2024 17:22:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FDDD402F0; Tue, 16 Apr 2024 17:21:36 +0200 (CEST) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mails.dpdk.org (Postfix) with ESMTP id 1C2FF402E0 for ; Tue, 16 Apr 2024 17:21:32 +0200 (CEST) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1e36b7e7dd2so36424095ad.1 for ; Tue, 16 Apr 2024 08:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1713280891; x=1713885691; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=poe1UA5TLQv/cPBViZsC1ncTG6aaoX/Gm7LOuF3bCs8=; b=hkthoLBWifqp0BhEU8nnbddIgemD/stqd4wNpSOJTlElXqBxEu3hhfFWat0O+x2WsD 8Qg9qTiFwIDR7PQKiDd7E+jIKKwEFqbIxNs3q+yH/aRQwcSN6wQbUISIeP33ZfhSqiRM ja3tEyeiMGdDPqQqHFLG/6TZ4Td6RWuI2As7Ak7PHcMwBWwS13n5QwEnSjFd2DLkvl08 KJsCjyR1vbs0oM/2W38sCtWcruVY62l66E3fzxghyzyeiCojucNd+0hcn0VpnrpOvO+t lDQrSLHmzfdBbnrjwv8yV3ellDdg1rcxznwASex6Y4nzzaOsdDLx0ogaC2+AhVn6fymH a6Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713280891; x=1713885691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=poe1UA5TLQv/cPBViZsC1ncTG6aaoX/Gm7LOuF3bCs8=; b=KmKlrQG6/wDe9RR0rg48ZBQdddgMZLKHBNxfJkcFnSduURYzU882oh0Tdf+WRbyxqF Aw/d8Bvc4H5cVRznFbeE2PrcyDhMC+Q8Ck+rGjqPRwHh21fE4HbOxNhVrBq/qHLw1k1a ulDlyTPfs4NFzr2LLZyLIqn+v3PmiX5X9C4+xmOlfp85j4b4zI4ElIt7kQQ43kUajKC3 YN4TMGwi2agEU8B4YVuLJuvbd6g1qJj5X+zXgQkKpISUuZiuTlk/ldqDHlsHg2EDFaY7 tHrk1sjyEqbWqnB+ehWznqMaKVOit2e3qME9BLslI29DMsauRK4mQlpWZXnbMHMxP4ZH 8C5Q== X-Gm-Message-State: AOJu0YzsDGSxaJooeulgFF7YZy8bpgrCyy6fEoJ1PIZJEhBmX/9923up LIWIr1qDobaJLGzIh1rvMop5tMqX+sflWyKpoXJ40fV92IjyQQ5b8wVol+ekue9aeysBwc6pbB8 G X-Google-Smtp-Source: AGHT+IEfvQBobVT6i8GhrvcDEtxvahQ5iwlLJaTwSbPGw/2WYyDGGZTA0d4xvI2IP7OojwiptMJmhg== X-Received: by 2002:a17:902:e5c1:b0:1df:f681:3cd8 with SMTP id u1-20020a170902e5c100b001dff6813cd8mr14143551plf.12.1713280891307; Tue, 16 Apr 2024 08:21:31 -0700 (PDT) Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id l17-20020a170903245100b001e80154a400sm213348pls.126.2024.04.16.08.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 08:21:30 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 4/5] examples _use RTE_DIM Date: Tue, 16 Apr 2024 08:19:30 -0700 Message-ID: <20240416152124.69590-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240416152124.69590-1-stephen@networkplumber.org> References: <20240416152124.69590-1-stephen@networkplumber.org> 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 Use RTE_DIM instead of computing directly with sizeof. Patch automatically generated via cocci/rte_dim.cocci. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- examples/l3fwd/main.c | 3 +-- examples/qos_sched/init.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 8d32ae1dd5..3960d85202 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -116,8 +116,7 @@ static struct lcore_params lcore_params_array_default[] = { }; static struct lcore_params * lcore_params = lcore_params_array_default; -static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) / - sizeof(lcore_params_array_default[0]); +static uint16_t nb_lcore_params = RTE_DIM(lcore_params_array_default); static struct rte_eth_conf port_conf = { .rxmode = { diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c index d8abae635a..75629e36ea 100644 --- a/examples/qos_sched/init.c +++ b/examples/qos_sched/init.c @@ -206,8 +206,7 @@ struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS] = { .n_pipes_per_subport_enabled = 4096, .qsize = {64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64}, .pipe_profiles = pipe_profiles, - .n_pipe_profiles = sizeof(pipe_profiles) / - sizeof(struct rte_sched_pipe_params), + .n_pipe_profiles = RTE_DIM(pipe_profiles), .n_max_pipe_profiles = MAX_SCHED_PIPE_PROFILES, .cman_params = NULL, }, From patchwork Tue Apr 16 15:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 139424 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 AB41243E83; Tue, 16 Apr 2024 17:22:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C894340695; Tue, 16 Apr 2024 17:21:37 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id 36EA84067B for ; Tue, 16 Apr 2024 17:21:33 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6ee0642f718so3297513b3a.0 for ; Tue, 16 Apr 2024 08:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1713280892; x=1713885692; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xFZldrBvv+o0NLX2Xm+UCWEaTVh0OLbH05xGTJHlD4M=; b=YH6kuDAPNZLwB37zAOvIlHeNKJrVSXjAmEn5BmHWsKLeak6Qx0YBkLIeNqIzNvsJCi jFXzWw/UHCsRFCq0jO91WzZMb6SgFtviIhB1RPZYYUKMQ+LqyNEbMPICscTASYhzcLB3 +Yx15GRYIQ4MUOB+h3LJX6+aBPev4NJgmzYfZ6rCSp564C3fGRApTznExbmX+s6ePyPx /7Vvoa1xE1KxZG5ptkfcsEly/UTvSYp4aKNUt4W0Xqx9DKTBJnqYRgHLqZSUOkDGfDHl L8p+zC84G5ojQ//81EnMUmtaQmNgto3RCNTZ88NuTbXtf35hbA5VSwCwllMSIpPlodmw BrPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713280892; x=1713885692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xFZldrBvv+o0NLX2Xm+UCWEaTVh0OLbH05xGTJHlD4M=; b=YLMuWu1mOAkE+tpVoKfbvjVpgTIW7DHGRBFcI1C+eAjfpz7wCL0//mJLW2mppm7tmY vbokOgpKV0i8O5Oq7A089jtN8jZLXMEaitWG/Nph1zz/rKord7e9CzfFkMhOGhp4AAF6 NvjLlbpoPuLiIQVGuEShQKmVBHKDjL96SGpgqSC7u5UbRhkO6qpjI4durASuL0d8mGN4 G2Rc5S+smLDW6waBzVqdH+HYEMwra9EbvM07JLgBfKl7/j36iCNFUgOSa0kVUefpYZ6m K7QGvzUKf1DElD77sQW9yNMnBYM6cKNWwxV3lrxmlBkLSki8/xN2IE3FscW+Fut2fldD tlJw== X-Gm-Message-State: AOJu0YzLErREeCRGtqz+vuCY3wFXsfTl7S9TeMKSiI+oZfs3C4sBm6/i DFo72vB7EqjYVhclf6XTlKE1LV8xs4JvQP90QnvYvHO+ExCvuMecX6RYBox8el6whdLQJOY1yZ0 S X-Google-Smtp-Source: AGHT+IERUeJkvIVFCx70AvXeDofc/4dmErq/+Uy//MGXbKt4jdjf+fsQbmUVS9Xcpas8YDjFG25myA== X-Received: by 2002:a17:902:b716:b0:1e2:a5db:30d1 with SMTP id d22-20020a170902b71600b001e2a5db30d1mr2573009pls.13.1713280892321; Tue, 16 Apr 2024 08:21:32 -0700 (PDT) Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id l17-20020a170903245100b001e80154a400sm213348pls.126.2024.04.16.08.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 08:21:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Shepard Siegel , Ed Czeck , John Miller , Ajit Khaparde , Somnath Kotur , Jingjing Wu , Rosen Xu , Jiawen Wu , Harman Kalra , Jian Wang Subject: [PATCH 5/5] drivers/net: use RTE_DIM Date: Tue, 16 Apr 2024 08:19:31 -0700 Message-ID: <20240416152124.69590-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240416152124.69590-1-stephen@networkplumber.org> References: <20240416152124.69590-1-stephen@networkplumber.org> 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 Use RTE_DIM instead of computing directly with sizeof. Patch automatically generated via cocci/rte_dim.cocci. Code in base/ subdirectory manually excluded. Signed-off-by: Stephen Hemminger --- drivers/net/ark/ark_pktchkr.c | 2 +- drivers/net/ark/ark_pktgen.c | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 12 ++++++------ drivers/net/e1000/em_rxtx.c | 3 +-- drivers/net/iavf/iavf_ipsec_crypto.c | 3 +-- drivers/net/igc/igc_ethdev.c | 3 +-- drivers/net/ipn3ke/ipn3ke_tm.c | 3 +-- drivers/net/ngbe/ngbe_ethdev.c | 6 ++---- drivers/net/octeontx/octeontx_stats.h | 3 +-- drivers/net/txgbe/txgbe_ethdev.c | 9 +++------ drivers/net/txgbe/txgbe_ethdev_vf.c | 3 +-- 11 files changed, 19 insertions(+), 30 deletions(-) diff --git a/drivers/net/ark/ark_pktchkr.c b/drivers/net/ark/ark_pktchkr.c index e1f336c73c..63c298fca8 100644 --- a/drivers/net/ark/ark_pktchkr.c +++ b/drivers/net/ark/ark_pktchkr.c @@ -320,7 +320,7 @@ options(const char *id) { unsigned int i; - for (i = 0; i < sizeof(toptions) / sizeof(struct OPTIONS); i++) { + for (i = 0; i < RTE_DIM(toptions); i++) { if (strcmp(id, toptions[i].opt) == 0) return &toptions[i]; } diff --git a/drivers/net/ark/ark_pktgen.c b/drivers/net/ark/ark_pktgen.c index 69ff7072b2..98e692c3ad 100644 --- a/drivers/net/ark/ark_pktgen.c +++ b/drivers/net/ark/ark_pktgen.c @@ -297,7 +297,7 @@ options(const char *id) { unsigned int i; - for (i = 0; i < sizeof(toptions) / sizeof(struct OPTIONS); i++) { + for (i = 0; i < RTE_DIM(toptions); i++) { if (strcmp(id, toptions[i].opt) == 0) return &toptions[i]; } diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 6ea7089a3f..68d7382806 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -72,13 +72,13 @@ const char *media_type[] = { "Unknown", "Twisted Pair", "Direct Attached Copper", "Fiber" }; -#define MAX_MEDIA_TYPE (sizeof(media_type) / sizeof(const char *)) +#define MAX_MEDIA_TYPE RTE_DIM(media_type) const char *link_status_str[] = { "Down. No link or cable detected.", "Down. No link, but a cable has been detected.", "Up.", }; -#define MAX_LINK_STR (sizeof(link_status_str) / sizeof(const char *)) +#define MAX_LINK_STR RTE_DIM(link_status_str) const char *fec_mode[] = { "No active FEC", @@ -90,13 +90,13 @@ const char *fec_mode[] = { "FEC RS(272,257)" }; -#define MAX_FEC_MODE (sizeof(fec_mode) / sizeof(const char *)) +#define MAX_FEC_MODE RTE_DIM(fec_mode) const char *signal_mode[] = { "NRZ", "PAM4", "PAM4_112" }; -#define MAX_SIG_MODE (sizeof(signal_mode) / sizeof(const char *)) +#define MAX_SIG_MODE RTE_DIM(signal_mode) /* multi-purpose multi-key table container. * Add a unique entry for a new PHY attribs as per HW CAS. @@ -226,7 +226,7 @@ struct link_speeds2_tbl { }, }; -#define BNXT_SPEEDS2_TBL_SZ (sizeof(link_speeds2_tbl) / sizeof(*link_speeds2_tbl)) +#define BNXT_SPEEDS2_TBL_SZ RTE_DIM(link_speeds2_tbl) /* In hwrm_phy_qcfg reports trained up speeds in link_speed(offset:0x8[31:16]) */ struct link_speeds_tbl { @@ -269,7 +269,7 @@ struct link_speeds_tbl { }, }; -#define BNXT_SPEEDS_TBL_SZ (sizeof(link_speeds_tbl) / sizeof(*link_speeds_tbl)) +#define BNXT_SPEEDS_TBL_SZ RTE_DIM(link_speeds_tbl) static const char *bnxt_get_xcvr_type(uint32_t xcvr_identifier_type_tx_lpi_timer) { diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index df5fbb7823..59d7793787 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1666,8 +1666,7 @@ em_rctl_bsize(__rte_unused enum e1000_mac_type hwtyp, uint32_t *bufsz) * *************************************************************** */ - for (i = 0; i != sizeof(bufsz_to_rctl) / sizeof(bufsz_to_rctl[0]); - i++) { + for (i = 0; i != RTE_DIM(bufsz_to_rctl); i++) { if (rctl_bsize >= bufsz_to_rctl[i].bufsz) { *bufsz = bufsz_to_rctl[i].bufsz; return bufsz_to_rctl[i].rctl; diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/iavf/iavf_ipsec_crypto.c index 6fd45ff45f..d3ce666ef0 100644 --- a/drivers/net/iavf/iavf_ipsec_crypto.c +++ b/drivers/net/iavf/iavf_ipsec_crypto.c @@ -1483,8 +1483,7 @@ iavf_ipsec_crypto_capabilities_get(void *device) * crypto capabilities, except for last element of the array which is * the null termination */ - for (i = 0; i < ((sizeof(iavf_security_capabilities) / - sizeof(iavf_security_capabilities[0])) - 1); i++) { + for (i = 0; i < (RTE_DIM(iavf_security_capabilities) - 1); i++) { iavf_security_capabilities[i].crypto_capabilities = iavf_sctx->crypto_capabilities; } diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 87d7f7caa0..28682c42ae 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -188,8 +188,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { offsetof(struct igc_hw_stats, icrxdmtc)}, }; -#define IGC_NB_XSTATS (sizeof(rte_igc_stats_strings) / \ - sizeof(rte_igc_stats_strings[0])) +#define IGC_NB_XSTATS RTE_DIM(rte_igc_stats_strings) static int eth_igc_configure(struct rte_eth_dev *dev); static int eth_igc_link_update(struct rte_eth_dev *dev, int wait_to_complete); diff --git a/drivers/net/ipn3ke/ipn3ke_tm.c b/drivers/net/ipn3ke/ipn3ke_tm.c index 0260227900..54687ce637 100644 --- a/drivers/net/ipn3ke/ipn3ke_tm.c +++ b/drivers/net/ipn3ke/ipn3ke_tm.c @@ -67,8 +67,7 @@ struct ipn3ke_tm_shaper_params_range_type ipn3ke_tm_shaper_params_rang[] = { {512, 1023, 15, 32768, 67108864, 134086656}, }; -#define IPN3KE_TM_SHAPER_RANGE_NUM (sizeof(ipn3ke_tm_shaper_params_rang) / \ - sizeof(struct ipn3ke_tm_shaper_params_range_type)) +#define IPN3KE_TM_SHAPER_RANGE_NUM RTE_DIM(ipn3ke_tm_shaper_params_rang) #define IPN3KE_TM_SHAPER_COMMITTED_RATE_MAX \ (ipn3ke_tm_shaper_params_rang[IPN3KE_TM_SHAPER_RANGE_NUM - 1].high) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 4cd07a0030..f10b9647fa 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -238,8 +238,7 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = { HW_XSTAT_NAME(rx_xoff_packets, "rx_flow_control_xoff_packets"), }; -#define NGBE_NB_HW_STATS (sizeof(rte_ngbe_stats_strings) / \ - sizeof(rte_ngbe_stats_strings[0])) +#define NGBE_NB_HW_STATS RTE_DIM(rte_ngbe_stats_strings) /* Per-queue statistics */ #define QP_XSTAT(m) {#m, offsetof(struct ngbe_hw_stats, qp[0].m)} @@ -251,8 +250,7 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_qp_strings[] = { QP_XSTAT(rx_qp_mc_packets), }; -#define NGBE_NB_QP_STATS (sizeof(rte_ngbe_qp_strings) / \ - sizeof(rte_ngbe_qp_strings[0])) +#define NGBE_NB_QP_STATS RTE_DIM(rte_ngbe_qp_strings) static inline int32_t ngbe_pf_reset_hw(struct ngbe_hw *hw) diff --git a/drivers/net/octeontx/octeontx_stats.h b/drivers/net/octeontx/octeontx_stats.h index 73ef5e93bb..746205bb85 100644 --- a/drivers/net/octeontx/octeontx_stats.h +++ b/drivers/net/octeontx/octeontx_stats.h @@ -36,6 +36,5 @@ struct octeontx_xstats octeontx_bgx_xstats[] = { BGX_XSTAT(tx_pause_packets), }; -#define NUM_BGX_XSTAT \ - (sizeof(octeontx_bgx_xstats) / sizeof(struct octeontx_xstats)) +#define NUM_BGX_XSTAT RTE_DIM(octeontx_bgx_xstats) #endif /* __OCTEONTX_STATS_H__ */ diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index b75e8898e2..fbf261bd0b 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -269,8 +269,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { HW_XSTAT_NAME(rx_xoff_packets, "rx_flow_control_xoff_packets"), }; -#define TXGBE_NB_HW_STATS (sizeof(rte_txgbe_stats_strings) / \ - sizeof(rte_txgbe_stats_strings[0])) +#define TXGBE_NB_HW_STATS RTE_DIM(rte_txgbe_stats_strings) /* Per-priority statistics */ #define UP_XSTAT(m) {#m, offsetof(struct txgbe_hw_stats, up[0].m)} @@ -290,8 +289,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_up_strings[] = { UP_XSTAT(tx_up_xon2off_packets), }; -#define TXGBE_NB_UP_STATS (sizeof(rte_txgbe_up_strings) / \ - sizeof(rte_txgbe_up_strings[0])) +#define TXGBE_NB_UP_STATS RTE_DIM(rte_txgbe_up_strings) /* Per-queue statistics */ #define QP_XSTAT(m) {#m, offsetof(struct txgbe_hw_stats, qp[0].m)} @@ -303,8 +301,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_qp_strings[] = { QP_XSTAT(rx_qp_mc_packets), }; -#define TXGBE_NB_QP_STATS (sizeof(rte_txgbe_qp_strings) / \ - sizeof(rte_txgbe_qp_strings[0])) +#define TXGBE_NB_QP_STATS RTE_DIM(rte_txgbe_qp_strings) static inline int txgbe_is_sfp(struct txgbe_hw *hw) diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index f1341fbf7e..be96519b97 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -112,8 +112,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbevf_stats_strings[] = { offsetof(struct txgbevf_hw_stats, qp[7].vfmprc)} }; -#define TXGBEVF_NB_XSTATS (sizeof(rte_txgbevf_stats_strings) / \ - sizeof(rte_txgbevf_stats_strings[0])) +#define TXGBEVF_NB_XSTATS RTE_DIM(rte_txgbevf_stats_strings) /* * Negotiate mailbox API version with the PF.