From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A8114569C for ; Wed, 24 Jul 2024 13:35:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E1A2433BE; Wed, 24 Jul 2024 13:35:22 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 9D869433D5 for ; Wed, 24 Jul 2024 13:35:20 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3686b285969so3176164f8f.0 for ; Wed, 24 Jul 2024 04:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820920; x=1722425720; 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=jIAVOrYg0lor+30axPr/v/y9lNNtSoKJwq8zv5btH7A=; b=T9lYaGGLlgWozeYogki1+qqXQRM2rmaHcttJZ2bioJmn1R+IIDKayiirJfQcDsJgIF esc4yKEgXFkWBVdUVjGMGnC03/0y/wJkJ69iEOoLUqyIkGegDg4tQbdIv7iPXK+hQz9a zYmqN2pkf0gtOX2D5mR8XOdLwOAQG/NSNtN3BH09F2fzNRyMS1svd6da982J5bD/NPC9 nxKiBhRtsg2K2n3B1DLj70XcRYpEJCKpwRvMNRlgcPAOfAaJADVQcl20PhKvfP0yaPlP MrzG3C8NpHR3zAqnU+0uB5oF+q7JOVTNBHbUrRAWeu0KCGDv/0Mb22Q/9RG4R1XkHBjy fYzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820920; x=1722425720; 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=jIAVOrYg0lor+30axPr/v/y9lNNtSoKJwq8zv5btH7A=; b=qCFkNFO1k6pif4kybgvzSVdD2fB3vBeEZSvIzuFaOQJDdnWRUpz0RyyUzcGp1d1FUv Z89+4nlz7y/8xt1CLGo0JwdjTm3N3jZRdMLUQMIPDwE3CE8+f+/QxGfikXnooFr5pcJw 7A84zDDefRGEHkGXXnjPZSPvkR4zWqHNbqhnXQ6dvDvuzy2v8ADajqyv61jPR2IcQfm5 XAJZlNca3oAb8CQg95iy+I1TIzxXR4MhtONAcE/twlHq8tg3nAOIkMmJNz9PtiNrbIyI aqrmGkPvXFvZo0arxJpxeNlLAFfbdVsSrARUni3G2tXycmfe3UdNlvFyFi50GNVo1+6m Ch1A== X-Forwarded-Encrypted: i=1; AJvYcCVd/Y9zn7tC2BoCzp6Luyn1uLsvq5ekQkUWB5LvU28190/ppxpxfobDjghhHaySWsRUQUI1F8mZRtXdqsAjgTc= X-Gm-Message-State: AOJu0YxgYPpQctJaxtX6q4rDBNSJPTFp3Mj2UEu5RVppBET6awx+iPAM vX1zzENVsTixHlpccJP6oztUNVXxH68K1KSC0q6Olrz2ZFgm8JmL X-Google-Smtp-Source: AGHT+IGTbQObNN4xcA9x6s9F+iZPEU1yPXnzlZGA+oEcFZqqfSjJBex/oHNYRSsJy2CHfxesSjs4Mw== X-Received: by 2002:a5d:5f8d:0:b0:368:7f4f:9ead with SMTP id ffacd0b85a97d-369bae233b5mr10818929f8f.7.1721820919824; Wed, 24 Jul 2024 04:35:19 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f976c8dasm23682105e9.19.2024.07.24.04.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:35:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Sivaprasad Tummala Cc: Konstantin Ananyev , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Ferruh Yigit , dpdk stable Subject: patch 'examples: fix queue ID restriction' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:33:15 +0100 Message-Id: <20240724113318.616754-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240724113318.616754-1-luca.boccassi@gmail.com> References: <20240715152704.2229503-86-luca.boccassi@gmail.com> <20240724113318.616754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3b8becb93e229a66cbf859c3137a6a7803a20edc Thanks. Luca Boccassi --- >From 3b8becb93e229a66cbf859c3137a6a7803a20edc Mon Sep 17 00:00:00 2001 From: Sivaprasad Tummala Date: Tue, 26 Mar 2024 13:55:40 +0100 Subject: [PATCH] examples: fix queue ID restriction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit b23c5bd71aa5b428a404aa036b97fa7bb1a3c98a ] Currently application supports Rx queue IDs up to 255 and max queues of 256 irrespective of device support. This limits the number of active lcores to 256. The patch fixes these constraints by increasing the Rx queue IDs to support up to 65535. Fixes: af75078fece3 ("first public release") Fixes: f88e7c175a68 ("examples/l3fwd-power: add high/regular perf cores options") Fixes: 08bd1a174461 ("examples/l3fwd-graph: add graph-based l3fwd skeleton") Signed-off-by: Sivaprasad Tummala Acked-by: Konstantin Ananyev Acked-by: Morten Brørup Acked-by: Ferruh Yigit --- examples/ipsec-secgw/ipsec-secgw.c | 19 ++++++----- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/ipsec_worker.c | 10 +++--- examples/l3fwd-graph/main.c | 19 +++++------ examples/l3fwd-power/main.c | 49 ++++++++++++++--------------- examples/l3fwd-power/main.h | 2 +- examples/l3fwd-power/perf_core.c | 8 +++-- examples/l3fwd/l3fwd.h | 2 +- examples/l3fwd/l3fwd_acl.c | 4 +-- examples/l3fwd/l3fwd_em.c | 4 +-- examples/l3fwd/l3fwd_event.h | 2 +- examples/l3fwd/l3fwd_fib.c | 4 +-- examples/l3fwd/l3fwd_lpm.c | 5 ++- examples/l3fwd/main.c | 24 +++++++------- 14 files changed, 76 insertions(+), 78 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index e4c3482411..8b0dfe76e7 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -220,7 +220,7 @@ static const char *cfgfile; struct lcore_params { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; uint8_t lcore_id; } __rte_cache_aligned; @@ -695,8 +695,7 @@ ipsec_poll_mode_worker(void) struct rte_mbuf *pkts[MAX_PKT_BURST]; uint32_t lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc; - uint16_t i, nb_rx, portid; - uint8_t queueid; + uint16_t i, nb_rx, portid, queueid; struct lcore_conf *qconf; int32_t rc, socket_id; const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) @@ -743,7 +742,7 @@ ipsec_poll_mode_worker(void) portid = rxql[i].port_id; queueid = rxql[i].queue_id; RTE_LOG(INFO, IPSEC, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } @@ -788,8 +787,7 @@ int check_flow_params(uint16_t fdir_portid, uint8_t fdir_qid) { uint16_t i; - uint16_t portid; - uint8_t queueid; + uint16_t portid, queueid; for (i = 0; i < nb_lcore_params; ++i) { portid = lcore_params_array[i].port_id; @@ -851,7 +849,7 @@ check_poll_mode_params(struct eh_conf *eh_conf) return 0; } -static uint8_t +static uint16_t get_port_nb_rx_queues(const uint16_t port) { int32_t queue = -1; @@ -862,7 +860,7 @@ get_port_nb_rx_queues(const uint16_t port) lcore_params[i].queue_id > queue) queue = lcore_params[i].queue_id; } - return (uint8_t)(++queue); + return (uint16_t)(++queue); } static int32_t @@ -1050,6 +1048,7 @@ parse_config(const char *q_arg) char *str_fld[_NUM_FLD]; int32_t i; uint32_t size; + uint32_t max_fld[_NUM_FLD] = {255, RTE_MAX_QUEUES_PER_PORT, 255}; nb_lcore_params = 0; @@ -1070,7 +1069,7 @@ parse_config(const char *q_arg) for (i = 0; i < _NUM_FLD; i++) { errno = 0; int_fld[i] = strtoul(str_fld[i], &end, 0); - if (errno != 0 || end == str_fld[i] || int_fld[i] > 255) + if (errno != 0 || end == str_fld[i] || int_fld[i] > max_fld[i]) return -1; } if (nb_lcore_params >= MAX_LCORE_PARAMS) { @@ -1081,7 +1080,7 @@ parse_config(const char *q_arg) lcore_params_array[nb_lcore_params].port_id = (uint8_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = - (uint8_t)int_fld[FLD_QUEUE]; + (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = (uint8_t)int_fld[FLD_LCORE]; ++nb_lcore_params; diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h index 2890e6e267..c764c9d7b8 100644 --- a/examples/ipsec-secgw/ipsec.h +++ b/examples/ipsec-secgw/ipsec.h @@ -285,7 +285,7 @@ struct cnt_blk { struct lcore_rx_queue { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; struct rte_security_ctx *sec_ctx; } __rte_cache_aligned; diff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c index 2f02946f86..7e4db87caf 100644 --- a/examples/ipsec-secgw/ipsec_worker.c +++ b/examples/ipsec-secgw/ipsec_worker.c @@ -1598,8 +1598,7 @@ ipsec_poll_mode_wrkr_inl_pr(void) int32_t socket_id; uint32_t lcore_id; int32_t i, nb_rx; - uint16_t portid; - uint8_t queueid; + uint16_t portid, queueid; prev_tsc = 0; lcore_id = rte_lcore_id(); @@ -1633,7 +1632,7 @@ ipsec_poll_mode_wrkr_inl_pr(void) portid = rxql[i].port_id; queueid = rxql[i].queue_id; RTE_LOG(INFO, IPSEC, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } @@ -1729,8 +1728,7 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void) uint32_t i, nb_rx, j; int32_t socket_id; uint32_t lcore_id; - uint16_t portid; - uint8_t queueid; + uint16_t portid, queueid; prev_tsc = 0; lcore_id = rte_lcore_id(); @@ -1764,7 +1762,7 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void) portid = rxql[i].port_id; queueid = rxql[i].queue_id; RTE_LOG(INFO, IPSEC, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c index 6dcb6ee92b..f9ca0ff23b 100644 --- a/examples/l3fwd-graph/main.c +++ b/examples/l3fwd-graph/main.c @@ -78,7 +78,7 @@ static uint32_t enabled_port_mask; struct lcore_rx_queue { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; char node_name[RTE_NODE_NAMESIZE]; }; @@ -96,7 +96,7 @@ static struct lcore_conf lcore_conf[RTE_MAX_LCORE]; struct lcore_params { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; uint8_t lcore_id; } __rte_cache_aligned; @@ -150,14 +150,14 @@ static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = { static int check_lcore_params(void) { - uint8_t queue, lcore; + uint16_t queue, i; int socketid; - uint16_t i; + uint8_t lcore; for (i = 0; i < nb_lcore_params; ++i) { queue = lcore_params[i].queue_id; if (queue >= MAX_RX_QUEUE_PER_PORT) { - printf("Invalid queue number: %hhu\n", queue); + printf("Invalid queue number: %" PRIu16 "\n", queue); return -1; } lcore = lcore_params[i].lcore_id; @@ -202,7 +202,7 @@ check_port_config(void) return 0; } -static uint8_t +static uint16_t get_port_n_rx_queues(const uint16_t port) { int queue = -1; @@ -220,7 +220,7 @@ get_port_n_rx_queues(const uint16_t port) } } - return (uint8_t)(++queue); + return (uint16_t)(++queue); } static int @@ -356,7 +356,7 @@ parse_config(const char *q_arg) lcore_params_array[nb_lcore_params].port_id = (uint8_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = - (uint8_t)int_fld[FLD_QUEUE]; + (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = (uint8_t)int_fld[FLD_LCORE]; ++nb_lcore_params; @@ -746,7 +746,8 @@ main(int argc, char **argv) "ethdev_tx-*", "pkt_drop", }; - uint8_t nb_rx_queue, queue, socketid; + uint8_t socketid; + uint16_t nb_rx_queue, queue; struct rte_graph_param graph_conf; struct rte_eth_dev_info dev_info; uint32_t nb_ports, nb_conf = 0; diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index fd3ade330f..9f60b784df 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -228,7 +228,7 @@ enum freq_scale_hint_t struct lcore_rx_queue { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; enum freq_scale_hint_t freq_up_hint; uint32_t zero_rx_packet_count; uint32_t idle_hint; @@ -860,7 +860,7 @@ sleep_until_rx_interrupt(int num, int lcore) struct rte_epoll_event event[num]; int n, i; uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; void *data; if (status[lcore].wakeup) { @@ -872,9 +872,9 @@ sleep_until_rx_interrupt(int num, int lcore) n = rte_epoll_wait(RTE_EPOLL_PER_THREAD, event, num, 10); for (i = 0; i < n; i++) { data = event[i].epdata.data; - port_id = ((uintptr_t)data) >> CHAR_BIT; + port_id = ((uintptr_t)data) >> (sizeof(uint16_t) * CHAR_BIT); queue_id = ((uintptr_t)data) & - RTE_LEN2MASK(CHAR_BIT, uint8_t); + RTE_LEN2MASK((sizeof(uint16_t) * CHAR_BIT), uint16_t); RTE_LOG(INFO, L3FWD_POWER, "lcore %u is waked up from rx interrupt on" " port %d queue %d\n", @@ -889,7 +889,7 @@ static void turn_on_off_intr(struct lcore_conf *qconf, bool on) { int i; struct lcore_rx_queue *rx_queue; - uint8_t queue_id; + uint16_t queue_id; uint16_t port_id; for (i = 0; i < qconf->n_rx_queue; ++i) { @@ -909,7 +909,7 @@ static void turn_on_off_intr(struct lcore_conf *qconf, bool on) static int event_register(struct lcore_conf *qconf) { struct lcore_rx_queue *rx_queue; - uint8_t queueid; + uint16_t queueid; uint16_t portid; uint32_t data; int ret; @@ -919,7 +919,7 @@ static int event_register(struct lcore_conf *qconf) rx_queue = &(qconf->rx_queue_list[i]); portid = rx_queue->port_id; queueid = rx_queue->queue_id; - data = portid << CHAR_BIT | queueid; + data = portid << (sizeof(uint16_t) * CHAR_BIT) | queueid; ret = rte_eth_dev_rx_intr_ctl_q(portid, queueid, RTE_EPOLL_PER_THREAD, @@ -939,8 +939,7 @@ static int main_intr_loop(__rte_unused void *dummy) unsigned int lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc; int i, j, nb_rx; - uint8_t queueid; - uint16_t portid; + uint16_t portid, queueid; struct lcore_conf *qconf; struct lcore_rx_queue *rx_queue; uint32_t lcore_rx_idle_count = 0; @@ -968,7 +967,7 @@ static int main_intr_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD_POWER, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } @@ -1105,8 +1104,7 @@ main_telemetry_loop(__rte_unused void *dummy) unsigned int lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc, prev_tel_tsc; int i, j, nb_rx; - uint8_t queueid; - uint16_t portid; + uint16_t portid, queueid; struct lcore_conf *qconf; struct lcore_rx_queue *rx_queue; uint64_t ep_nep[2] = {0}, fp_nfp[2] = {0}; @@ -1136,7 +1134,7 @@ main_telemetry_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD_POWER, " -- lcoreid=%u portid=%u " - "rxqueueid=%hhu\n", lcore_id, portid, queueid); + "rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } while (!is_done()) { @@ -1330,8 +1328,7 @@ main_legacy_loop(__rte_unused void *dummy) uint64_t prev_tsc, diff_tsc, cur_tsc, tim_res_tsc, hz; uint64_t prev_tsc_power = 0, cur_tsc_power, diff_tsc_power; int i, j, nb_rx; - uint8_t queueid; - uint16_t portid; + uint16_t portid, queueid; struct lcore_conf *qconf; struct lcore_rx_queue *rx_queue; enum freq_scale_hint_t lcore_scaleup_hint; @@ -1359,7 +1356,7 @@ main_legacy_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD_POWER, " -- lcoreid=%u portid=%u " - "rxqueueid=%hhu\n", lcore_id, portid, queueid); + "rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } /* add into event wait list */ @@ -1524,14 +1521,14 @@ start_rx: static int check_lcore_params(void) { - uint8_t queue, lcore; - uint16_t i; + uint16_t queue, i; + uint8_t lcore; int socketid; for (i = 0; i < nb_lcore_params; ++i) { queue = lcore_params[i].queue_id; if (queue >= MAX_RX_QUEUE_PER_PORT) { - printf("invalid queue number: %hhu\n", queue); + printf("invalid queue number: %" PRIu16 "\n", queue); return -1; } lcore = lcore_params[i].lcore_id; @@ -1576,7 +1573,7 @@ check_port_config(void) return 0; } -static uint8_t +static uint16_t get_port_n_rx_queues(const uint16_t port) { int queue = -1; @@ -1587,7 +1584,7 @@ get_port_n_rx_queues(const uint16_t port) lcore_params[i].queue_id > queue) queue = lcore_params[i].queue_id; } - return (uint8_t)(++queue); + return (uint16_t)(++queue); } static int @@ -1782,6 +1779,7 @@ parse_config(const char *q_arg) char *str_fld[_NUM_FLD]; int i; unsigned size; + unsigned int max_fld[_NUM_FLD] = {255, RTE_MAX_QUEUES_PER_PORT, 255}; nb_lcore_params = 0; @@ -1801,8 +1799,7 @@ parse_config(const char *q_arg) for (i = 0; i < _NUM_FLD; i++){ errno = 0; int_fld[i] = strtoul(str_fld[i], &end, 0); - if (errno != 0 || end == str_fld[i] || int_fld[i] > - 255) + if (errno != 0 || end == str_fld[i] || int_fld[i] > max_fld[i]) return -1; } if (nb_lcore_params >= MAX_LCORE_PARAMS) { @@ -1813,7 +1810,7 @@ parse_config(const char *q_arg) lcore_params_array[nb_lcore_params].port_id = (uint8_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = - (uint8_t)int_fld[FLD_QUEUE]; + (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = (uint8_t)int_fld[FLD_LCORE]; ++nb_lcore_params; @@ -2719,8 +2716,8 @@ main(int argc, char **argv) uint64_t hz; uint32_t n_tx_queue, nb_lcores; uint32_t dev_rxq_num, dev_txq_num; - uint8_t nb_rx_queue, queue, socketid; - uint16_t portid; + uint8_t socketid; + uint16_t portid, nb_rx_queue, queue; const char *ptr_strings[NUM_TELSTATS]; /* init EAL */ diff --git a/examples/l3fwd-power/main.h b/examples/l3fwd-power/main.h index 258de98f5b..40b5194726 100644 --- a/examples/l3fwd-power/main.h +++ b/examples/l3fwd-power/main.h @@ -9,7 +9,7 @@ #define MAX_LCORE_PARAMS 1024 struct lcore_params { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; uint8_t lcore_id; } __rte_cache_aligned; diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c index 41ef6d0c9a..f34442b9d0 100644 --- a/examples/l3fwd-power/perf_core.c +++ b/examples/l3fwd-power/perf_core.c @@ -22,7 +22,7 @@ static uint16_t nb_hp_lcores; struct perf_lcore_params { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; uint8_t high_perf; uint8_t lcore_idx; } __rte_cache_aligned; @@ -132,6 +132,7 @@ parse_perf_config(const char *q_arg) char *str_fld[_NUM_FLD]; int i; unsigned int size; + unsigned int max_fld[_NUM_FLD] = {255, RTE_MAX_QUEUES_PER_PORT, 255, 255}; nb_prf_lc_prms = 0; @@ -152,7 +153,8 @@ parse_perf_config(const char *q_arg) for (i = 0; i < _NUM_FLD; i++) { errno = 0; int_fld[i] = strtoul(str_fld[i], &end, 0); - if (errno != 0 || end == str_fld[i] || int_fld[i] > 255) + if (errno != 0 || end == str_fld[i] || int_fld[i] > max_fld[i]) + return -1; } if (nb_prf_lc_prms >= MAX_LCORE_PARAMS) { @@ -163,7 +165,7 @@ parse_perf_config(const char *q_arg) prf_lc_prms[nb_prf_lc_prms].port_id = (uint8_t)int_fld[FLD_PORT]; prf_lc_prms[nb_prf_lc_prms].queue_id = - (uint8_t)int_fld[FLD_QUEUE]; + (uint16_t)int_fld[FLD_QUEUE]; prf_lc_prms[nb_prf_lc_prms].high_perf = !!(uint8_t)int_fld[FLD_LCORE_HP]; prf_lc_prms[nb_prf_lc_prms].lcore_idx = diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index b55855c932..e774623b57 100644 --- a/examples/l3fwd/l3fwd.h +++ b/examples/l3fwd/l3fwd.h @@ -74,7 +74,7 @@ struct mbuf_table { struct lcore_rx_queue { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; } __rte_cache_aligned; struct lcore_conf { diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c index a1d87f4a40..31798ccb10 100644 --- a/examples/l3fwd/l3fwd_acl.c +++ b/examples/l3fwd/l3fwd_acl.c @@ -998,7 +998,7 @@ acl_main_loop(__rte_unused void *dummy) uint64_t prev_tsc, diff_tsc, cur_tsc; int i, nb_rx; uint16_t portid; - uint8_t queueid; + uint16_t queueid; struct lcore_conf *qconf; int socketid; const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) @@ -1021,7 +1021,7 @@ acl_main_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index 35de31157e..e298fef523 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -584,7 +584,7 @@ em_main_loop(__rte_unused void *dummy) unsigned lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc; int i, nb_rx; - uint8_t queueid; + uint16_t queueid; uint16_t portid; struct lcore_conf *qconf; const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / @@ -607,7 +607,7 @@ em_main_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h index e21817c36b..a7af23b8a0 100644 --- a/examples/l3fwd/l3fwd_event.h +++ b/examples/l3fwd/l3fwd_event.h @@ -76,8 +76,8 @@ struct l3fwd_event_resources { uint8_t deq_depth; uint8_t has_burst; uint8_t enabled; - uint8_t eth_rx_queues; uint8_t vector_enabled; + uint16_t eth_rx_queues; uint16_t vector_size; uint64_t vector_tmo_ns; }; diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c index 18398492ae..10fa121942 100644 --- a/examples/l3fwd/l3fwd_fib.c +++ b/examples/l3fwd/l3fwd_fib.c @@ -186,7 +186,7 @@ fib_main_loop(__rte_unused void *dummy) uint64_t prev_tsc, diff_tsc, cur_tsc; int i, nb_rx; uint16_t portid; - uint8_t queueid; + uint16_t queueid; struct lcore_conf *qconf; const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US; @@ -208,7 +208,7 @@ fib_main_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 5172979c72..54b059fe2a 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -148,8 +148,7 @@ lpm_main_loop(__rte_unused void *dummy) unsigned lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc; int i, nb_rx; - uint16_t portid; - uint8_t queueid; + uint16_t portid, queueid; struct lcore_conf *qconf; const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US; @@ -171,7 +170,7 @@ lpm_main_loop(__rte_unused void *dummy) portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id; RTE_LOG(INFO, L3FWD, - " -- lcoreid=%u portid=%u rxqueueid=%hhu\n", + " -- lcoreid=%u portid=%u rxqueueid=%" PRIu16 "\n", lcore_id, portid, queueid); } diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 329427ae4f..b6b105d42b 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -96,7 +96,7 @@ struct parm_cfg parm_config; struct lcore_params { uint16_t port_id; - uint8_t queue_id; + uint16_t queue_id; uint8_t lcore_id; } __rte_cache_aligned; @@ -288,14 +288,14 @@ setup_l3fwd_lookup_tables(void) static int check_lcore_params(void) { - uint8_t queue, lcore; - uint16_t i; + uint16_t queue, i; + uint8_t lcore; int socketid; for (i = 0; i < nb_lcore_params; ++i) { queue = lcore_params[i].queue_id; if (queue >= MAX_RX_QUEUE_PER_PORT) { - printf("invalid queue number: %hhu\n", queue); + printf("invalid queue number: %" PRIu16 "\n", queue); return -1; } lcore = lcore_params[i].lcore_id; @@ -332,7 +332,7 @@ check_port_config(void) return 0; } -static uint8_t +static uint16_t get_port_n_rx_queues(const uint16_t port) { int queue = -1; @@ -348,7 +348,7 @@ get_port_n_rx_queues(const uint16_t port) lcore_params[i].port_id); } } - return (uint8_t)(++queue); + return (uint16_t)(++queue); } static int @@ -492,6 +492,7 @@ parse_config(const char *q_arg) char *str_fld[_NUM_FLD]; int i; unsigned size; + uint16_t max_fld[_NUM_FLD] = {255, RTE_MAX_QUEUES_PER_PORT, 255}; nb_lcore_params = 0; @@ -510,7 +511,7 @@ parse_config(const char *q_arg) for (i = 0; i < _NUM_FLD; i++){ errno = 0; int_fld[i] = strtoul(str_fld[i], &end, 0); - if (errno != 0 || end == str_fld[i] || int_fld[i] > 255) + if (errno != 0 || end == str_fld[i] || int_fld[i] > max_fld[i]) return -1; } if (nb_lcore_params >= MAX_LCORE_PARAMS) { @@ -521,7 +522,7 @@ parse_config(const char *q_arg) lcore_params_array[nb_lcore_params].port_id = (uint8_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = - (uint8_t)int_fld[FLD_QUEUE]; + (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = (uint8_t)int_fld[FLD_LCORE]; ++nb_lcore_params; @@ -619,7 +620,7 @@ parse_event_eth_rx_queues(const char *eth_rx_queues) { struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc(); char *end = NULL; - uint8_t num_eth_rx_queues; + uint16_t num_eth_rx_queues; /* parse decimal string */ num_eth_rx_queues = strtoul(eth_rx_queues, &end, 10); @@ -1169,7 +1170,8 @@ config_port_max_pkt_len(struct rte_eth_conf *conf, static void l3fwd_poll_resource_setup(void) { - uint8_t nb_rx_queue, queue, socketid; + uint8_t socketid; + uint16_t nb_rx_queue, queue; struct rte_eth_dev_info dev_info; uint32_t n_tx_queue, nb_lcores; struct rte_eth_txconf *txconf; @@ -1466,7 +1468,7 @@ main(int argc, char **argv) struct lcore_conf *qconf; uint16_t queueid, portid; unsigned int lcore_id; - uint8_t queue; + uint16_t queue; int i, ret; /* init EAL */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:23.257571784 +0100 +++ 0037-examples-fix-queue-ID-restriction.patch 2024-07-24 12:29:20.835027419 +0100 @@ -1 +1 @@ -From b23c5bd71aa5b428a404aa036b97fa7bb1a3c98a Mon Sep 17 00:00:00 2001 +From 3b8becb93e229a66cbf859c3137a6a7803a20edc Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit b23c5bd71aa5b428a404aa036b97fa7bb1a3c98a ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -43 +44 @@ -index d7c18bea34..8292a262cd 100644 +index e4c3482411..8b0dfe76e7 100644 @@ -48 +49 @@ - struct __rte_cache_aligned lcore_params { + struct lcore_params { @@ -53 +54 @@ - }; + } __rte_cache_aligned; @@ -129 +130 @@ -index 36b6164ab2..6f45fdb166 100644 +index 2890e6e267..c764c9d7b8 100644 @@ -134 +135 @@ - struct __rte_cache_aligned lcore_rx_queue { + struct lcore_rx_queue { @@ -138,2 +139,2 @@ - void *sec_ctx; - }; + struct rte_security_ctx *sec_ctx; + } __rte_cache_aligned; @@ -142 +143 @@ -index 8d122e8519..c9c43ebd2b 100644 +index 2f02946f86..7e4db87caf 100644 @@ -184 +185 @@ -index ec4d8c94c5..0866822e93 100644 +index 6dcb6ee92b..f9ca0ff23b 100644 @@ -187 +188 @@ -@@ -90,7 +90,7 @@ static int pcap_trace_enable; +@@ -78,7 +78,7 @@ static uint32_t enabled_port_mask; @@ -196 +197 @@ -@@ -110,7 +110,7 @@ static struct lcore_conf lcore_conf[RTE_MAX_LCORE]; +@@ -96,7 +96,7 @@ static struct lcore_conf lcore_conf[RTE_MAX_LCORE]; @@ -198 +199 @@ - struct __rte_cache_aligned lcore_params { + struct lcore_params { @@ -203 +204 @@ - }; + } __rte_cache_aligned; @@ -205 +206 @@ -@@ -205,14 +205,14 @@ check_worker_model_params(void) +@@ -150,14 +150,14 @@ static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = { @@ -223 +224 @@ -@@ -257,7 +257,7 @@ check_port_config(void) +@@ -202,7 +202,7 @@ check_port_config(void) @@ -232 +233 @@ -@@ -275,7 +275,7 @@ get_port_n_rx_queues(const uint16_t port) +@@ -220,7 +220,7 @@ get_port_n_rx_queues(const uint16_t port) @@ -241 +242 @@ -@@ -450,7 +450,7 @@ parse_config(const char *q_arg) +@@ -356,7 +356,7 @@ parse_config(const char *q_arg) @@ -250 +251 @@ -@@ -1011,7 +1011,8 @@ main(int argc, char **argv) +@@ -746,7 +746,8 @@ main(int argc, char **argv) @@ -261 +262 @@ -index fba11da7ca..74e906cb5d 100644 +index fd3ade330f..9f60b784df 100644 @@ -264 +265 @@ -@@ -214,7 +214,7 @@ enum freq_scale_hint_t +@@ -228,7 +228,7 @@ enum freq_scale_hint_t @@ -266 +267 @@ - struct __rte_cache_aligned lcore_rx_queue { + struct lcore_rx_queue { @@ -273 +274 @@ -@@ -838,7 +838,7 @@ sleep_until_rx_interrupt(int num, int lcore) +@@ -860,7 +860,7 @@ sleep_until_rx_interrupt(int num, int lcore) @@ -282 +283 @@ -@@ -850,9 +850,9 @@ sleep_until_rx_interrupt(int num, int lcore) +@@ -872,9 +872,9 @@ sleep_until_rx_interrupt(int num, int lcore) @@ -294 +295 @@ -@@ -867,7 +867,7 @@ static void turn_on_off_intr(struct lcore_conf *qconf, bool on) +@@ -889,7 +889,7 @@ static void turn_on_off_intr(struct lcore_conf *qconf, bool on) @@ -303 +304 @@ -@@ -887,7 +887,7 @@ static void turn_on_off_intr(struct lcore_conf *qconf, bool on) +@@ -909,7 +909,7 @@ static void turn_on_off_intr(struct lcore_conf *qconf, bool on) @@ -312 +313 @@ -@@ -897,7 +897,7 @@ static int event_register(struct lcore_conf *qconf) +@@ -919,7 +919,7 @@ static int event_register(struct lcore_conf *qconf) @@ -321 +322 @@ -@@ -917,8 +917,7 @@ static int main_intr_loop(__rte_unused void *dummy) +@@ -939,8 +939,7 @@ static int main_intr_loop(__rte_unused void *dummy) @@ -331 +332 @@ -@@ -946,7 +945,7 @@ static int main_intr_loop(__rte_unused void *dummy) +@@ -968,7 +967,7 @@ static int main_intr_loop(__rte_unused void *dummy) @@ -340 +341 @@ -@@ -1083,8 +1082,7 @@ main_telemetry_loop(__rte_unused void *dummy) +@@ -1105,8 +1104,7 @@ main_telemetry_loop(__rte_unused void *dummy) @@ -350 +351 @@ -@@ -1114,7 +1112,7 @@ main_telemetry_loop(__rte_unused void *dummy) +@@ -1136,7 +1134,7 @@ main_telemetry_loop(__rte_unused void *dummy) @@ -359 +360 @@ -@@ -1205,8 +1203,7 @@ main_legacy_loop(__rte_unused void *dummy) +@@ -1330,8 +1328,7 @@ main_legacy_loop(__rte_unused void *dummy) @@ -369 +370 @@ -@@ -1234,7 +1231,7 @@ main_legacy_loop(__rte_unused void *dummy) +@@ -1359,7 +1356,7 @@ main_legacy_loop(__rte_unused void *dummy) @@ -378 +379 @@ -@@ -1399,14 +1396,14 @@ start_rx: +@@ -1524,14 +1521,14 @@ start_rx: @@ -396 +397 @@ -@@ -1451,7 +1448,7 @@ check_port_config(void) +@@ -1576,7 +1573,7 @@ check_port_config(void) @@ -405 +406 @@ -@@ -1462,7 +1459,7 @@ get_port_n_rx_queues(const uint16_t port) +@@ -1587,7 +1584,7 @@ get_port_n_rx_queues(const uint16_t port) @@ -414 +415 @@ -@@ -1661,6 +1658,7 @@ parse_config(const char *q_arg) +@@ -1782,6 +1779,7 @@ parse_config(const char *q_arg) @@ -422 +423 @@ -@@ -1680,8 +1678,7 @@ parse_config(const char *q_arg) +@@ -1801,8 +1799,7 @@ parse_config(const char *q_arg) @@ -432 +433 @@ -@@ -1692,7 +1689,7 @@ parse_config(const char *q_arg) +@@ -1813,7 +1810,7 @@ parse_config(const char *q_arg) @@ -441 +442 @@ -@@ -2501,8 +2498,8 @@ main(int argc, char **argv) +@@ -2719,8 +2716,8 @@ main(int argc, char **argv) @@ -453 +454 @@ -index e85e14bd9d..378f54794c 100644 +index 258de98f5b..40b5194726 100644 @@ -458 +459 @@ - struct __rte_cache_aligned lcore_params { + struct lcore_params { @@ -463 +464 @@ - }; + } __rte_cache_aligned; @@ -466 +467 @@ -index c8fc69e6d3..77248889c0 100644 +index 41ef6d0c9a..f34442b9d0 100644 @@ -471 +472 @@ - struct __rte_cache_aligned perf_lcore_params { + struct perf_lcore_params { @@ -477 +478 @@ - }; + } __rte_cache_aligned; @@ -506 +507 @@ -index f51da43319..93ce652d02 100644 +index b55855c932..e774623b57 100644 @@ -511 +512 @@ - struct __rte_cache_aligned lcore_rx_queue { + struct lcore_rx_queue { @@ -515 +516 @@ - }; + } __rte_cache_aligned; @@ -517 +518 @@ - struct __rte_cache_aligned lcore_conf { + struct lcore_conf { @@ -519 +520 @@ -index 2109ab0a8c..b635011ef7 100644 +index a1d87f4a40..31798ccb10 100644 @@ -522 +523 @@ -@@ -1061,7 +1061,7 @@ acl_main_loop(__rte_unused void *dummy) +@@ -998,7 +998,7 @@ acl_main_loop(__rte_unused void *dummy) @@ -531 +532 @@ -@@ -1084,7 +1084,7 @@ acl_main_loop(__rte_unused void *dummy) +@@ -1021,7 +1021,7 @@ acl_main_loop(__rte_unused void *dummy) @@ -541 +542 @@ -index d98e66ea2c..31a7e05e39 100644 +index 35de31157e..e298fef523 100644 @@ -544 +545 @@ -@@ -586,7 +586,7 @@ em_main_loop(__rte_unused void *dummy) +@@ -584,7 +584,7 @@ em_main_loop(__rte_unused void *dummy) @@ -553 +554 @@ -@@ -609,7 +609,7 @@ em_main_loop(__rte_unused void *dummy) +@@ -607,7 +607,7 @@ em_main_loop(__rte_unused void *dummy) @@ -563 +564 @@ -index 9aad358003..c6a4a89127 100644 +index e21817c36b..a7af23b8a0 100644 @@ -566 +567 @@ -@@ -78,8 +78,8 @@ struct l3fwd_event_resources { +@@ -76,8 +76,8 @@ struct l3fwd_event_resources { @@ -577 +578 @@ -index 6a21984415..f38b19af3f 100644 +index 18398492ae..10fa121942 100644 @@ -599 +600 @@ -index a484a33089..e8fd95aae9 100644 +index 5172979c72..54b059fe2a 100644 @@ -622 +623 @@ -index ad28ba9d2e..f5f5f1a7fb 100644 +index 329427ae4f..b6b105d42b 100644 @@ -625 +626 @@ -@@ -98,7 +98,7 @@ struct parm_cfg parm_config; +@@ -96,7 +96,7 @@ struct parm_cfg parm_config; @@ -627 +628 @@ - struct __rte_cache_aligned lcore_params { + struct lcore_params { @@ -632 +633 @@ - }; + } __rte_cache_aligned; @@ -634 +635 @@ -@@ -292,14 +292,14 @@ setup_l3fwd_lookup_tables(void) +@@ -288,14 +288,14 @@ setup_l3fwd_lookup_tables(void) @@ -652 +653 @@ -@@ -336,7 +336,7 @@ check_port_config(void) +@@ -332,7 +332,7 @@ check_port_config(void) @@ -661 +662 @@ -@@ -352,7 +352,7 @@ get_port_n_rx_queues(const uint16_t port) +@@ -348,7 +348,7 @@ get_port_n_rx_queues(const uint16_t port) @@ -670 +671 @@ -@@ -500,6 +500,7 @@ parse_config(const char *q_arg) +@@ -492,6 +492,7 @@ parse_config(const char *q_arg) @@ -678 +679 @@ -@@ -518,7 +519,7 @@ parse_config(const char *q_arg) +@@ -510,7 +511,7 @@ parse_config(const char *q_arg) @@ -687 +688 @@ -@@ -529,7 +530,7 @@ parse_config(const char *q_arg) +@@ -521,7 +522,7 @@ parse_config(const char *q_arg) @@ -696 +697 @@ -@@ -630,7 +631,7 @@ parse_event_eth_rx_queues(const char *eth_rx_queues) +@@ -619,7 +620,7 @@ parse_event_eth_rx_queues(const char *eth_rx_queues) @@ -705 +706 @@ -@@ -1211,7 +1212,8 @@ config_port_max_pkt_len(struct rte_eth_conf *conf, +@@ -1169,7 +1170,8 @@ config_port_max_pkt_len(struct rte_eth_conf *conf, @@ -715 +716 @@ -@@ -1535,7 +1537,7 @@ main(int argc, char **argv) +@@ -1466,7 +1468,7 @@ main(int argc, char **argv) @@ -721 +722 @@ - int ret; + int i, ret;