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 211AF4569C for ; Wed, 24 Jul 2024 13:35:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19E51433E7; Wed, 24 Jul 2024 13:35:25 +0200 (CEST) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by mails.dpdk.org (Postfix) with ESMTP id 92E7042D89 for ; Wed, 24 Jul 2024 13:35:23 +0200 (CEST) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2ef2c56d9dcso38011521fa.2 for ; Wed, 24 Jul 2024 04:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820923; x=1722425723; 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=DCYQjo0gwEotAbeuPzIG4w+XXlxkHjC0cSWamcCDrEg=; b=VeUMz8mkcr/i52rWlRSDDFS1gC9WB2IZLVMqn7vGfX4tFadvO5m0mnqZ5zb5yODpeI Aj5Gn08feuE8soFR+9sCbX2BApdcFHo/867DHZFGWK/EhO+Z90wbq34zpNI40qZRGUdd tmE3icVHhqT7Z15s8gXHGNjiIv99O7IvCWGGVJ57i1olTWAvZ+BGIdqdyEiMj1I4esQ4 BmcdTGphpXzbHQao5y/T/QKqYX8v5jVGYxF5MFtVxQ8mLIbxvEIiRGxmCDWDtQJTlidA oj8g1T8FpBubQchZqnVFQ9CL6p32uFmACgZNVOQf6QjC1Uit1vVsS+pPTuc7VUwpa4J2 T6GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820923; x=1722425723; 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=DCYQjo0gwEotAbeuPzIG4w+XXlxkHjC0cSWamcCDrEg=; b=BgjPF7dpcfv+wgWZkRgDnMPp/vw4QazmG0m6HlgUh0RpdRIyoXdn896F7gFx9YMKoV kmAxBihXITGCNey+EzieT7hegkxfmVpZaFJWS6lih65mMVAETvQwNrdqrdS4re4keCqp IoN/zE0SbJRib6ITN77YMNYKbZQ7vWozzxG6X+hM31HdGec3ivmEMW7GoGCJtmBTp0ob JUzldj6SC38wD6kGdYzpSRsOt4RVSkkzD1IG2Tie4GsIDYaTcQ4Bo8UfGTkmrayBPs/m R4zPLeP8XtuHxDOWIbAQoL8iSGyti26JA/mjOOhRU2hRsc44h11fmhnUnn/AD26ufzpr 36EQ== X-Forwarded-Encrypted: i=1; AJvYcCXFRgVEl1GoyWKplLaL96CC3lb5vQmssCvpU5HnbQxJfp7oxdo1OT9LwIUK0Twh+76Wt4/LE408dywX6o1fOds= X-Gm-Message-State: AOJu0Yz2NRw9K9yf+y4Fgme6wKYYA7fJ/laTazQ8E0I2UxOoCJK150Yq qkZ4wIQgG2Wr2a/GKooDCgUHw/BsvITVmo5bhkaWuClEI01ckky0 X-Google-Smtp-Source: AGHT+IERbiqyrTkV02BINEbMok6uGNUqTyWYcSH5cVFIZHtKkT0+o9BndqkaE/TqLSyTf9FQisKulQ== X-Received: by 2002:a2e:be10:0:b0:2ef:2c2e:598a with SMTP id 38308e7fff4ca-2ef2c2e5b90mr94994681fa.11.1721820922686; Wed, 24 Jul 2024 04:35:22 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f9413823sm25704225e9.47.2024.07.24.04.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:35:22 -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 port ID restriction' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:33:17 +0100 Message-Id: <20240724113318.616754-39-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/28c93c22f7890e8b0adf17b50a2c4b3448c5f27a Thanks. Luca Boccassi --- >From 28c93c22f7890e8b0adf17b50a2c4b3448c5f27a Mon Sep 17 00:00:00 2001 From: Sivaprasad Tummala Date: Tue, 26 Mar 2024 13:55:50 +0100 Subject: [PATCH] examples: fix port ID restriction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 548de9091c85467bd8f05cecf6d32315869d1461 ] Currently application supports port IDs up to 255 irrespective of RTE_MAX_ETHPORTS. The patch fixes these constraints by allowing port IDs up to RTE_MAX_ETHPORTS. 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") Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application") Signed-off-by: Sivaprasad Tummala Acked-by: Konstantin Ananyev Acked-by: Morten Brørup Acked-by: Ferruh Yigit --- examples/ipsec-secgw/ipsec-secgw.c | 4 ++-- examples/l3fwd-graph/main.c | 2 +- examples/l3fwd-power/main.c | 4 ++-- examples/l3fwd-power/perf_core.c | 4 ++-- examples/l3fwd/main.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index cefea36b13..9620d73fc8 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -1049,7 +1049,7 @@ parse_config(const char *q_arg) int32_t i; uint32_t size; uint32_t max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, RTE_MAX_LCORE }; @@ -1082,7 +1082,7 @@ parse_config(const char *q_arg) return -1; } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c index 563acce331..ec4f156881 100644 --- a/examples/l3fwd-graph/main.c +++ b/examples/l3fwd-graph/main.c @@ -354,7 +354,7 @@ parse_config(const char *q_arg) } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index bab35d1839..1bcc61e777 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1780,7 +1780,7 @@ parse_config(const char *q_arg) int i; unsigned size; unsigned int max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, RTE_MAX_LCORE }; @@ -1812,7 +1812,7 @@ parse_config(const char *q_arg) return -1; } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c index fbd7864cb9..e4bdb62121 100644 --- a/examples/l3fwd-power/perf_core.c +++ b/examples/l3fwd-power/perf_core.c @@ -133,7 +133,7 @@ parse_perf_config(const char *q_arg) int i; unsigned int size; unsigned int max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, 255, RTE_MAX_LCORE @@ -168,7 +168,7 @@ parse_perf_config(const char *q_arg) return -1; } prf_lc_prms[nb_prf_lc_prms].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; prf_lc_prms[nb_prf_lc_prms].queue_id = (uint16_t)int_fld[FLD_QUEUE]; prf_lc_prms[nb_prf_lc_prms].high_perf = diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index dca1beabc8..9201019711 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -493,7 +493,7 @@ parse_config(const char *q_arg) int i; unsigned size; uint16_t max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, RTE_MAX_LCORE }; @@ -524,7 +524,7 @@ parse_config(const char *q_arg) return -1; } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:23.360773176 +0100 +++ 0039-examples-fix-port-ID-restriction.patch 2024-07-24 12:29:20.859027902 +0100 @@ -1 +1 @@ -From 548de9091c85467bd8f05cecf6d32315869d1461 Mon Sep 17 00:00:00 2001 +From 28c93c22f7890e8b0adf17b50a2c4b3448c5f27a Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 548de9091c85467bd8f05cecf6d32315869d1461 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -34 +35 @@ -index 5a7e1b220f..e98ad2572e 100644 +index cefea36b13..9620d73fc8 100644 @@ -56 +57 @@ -index 4396e2bb3c..a13dc01138 100644 +index 563acce331..ec4f156881 100644 @@ -59 +60 @@ -@@ -448,7 +448,7 @@ parse_config(const char *q_arg) +@@ -354,7 +354,7 @@ parse_config(const char *q_arg) @@ -69 +70 @@ -index 2976058425..2bb6b092c3 100644 +index bab35d1839..1bcc61e777 100644 @@ -72 +73 @@ -@@ -1659,7 +1659,7 @@ parse_config(const char *q_arg) +@@ -1780,7 +1780,7 @@ parse_config(const char *q_arg) @@ -81 +82 @@ -@@ -1691,7 +1691,7 @@ parse_config(const char *q_arg) +@@ -1812,7 +1812,7 @@ parse_config(const char *q_arg) @@ -91 +92 @@ -index a0112b57ff..6c0f7ea213 100644 +index fbd7864cb9..e4bdb62121 100644 @@ -113 +114 @@ -index ba7083d4f3..01b763e5ba 100644 +index dca1beabc8..9201019711 100644 @@ -116 +117 @@ -@@ -501,7 +501,7 @@ parse_config(const char *q_arg) +@@ -493,7 +493,7 @@ parse_config(const char *q_arg) @@ -125 +126 @@ -@@ -532,7 +532,7 @@ parse_config(const char *q_arg) +@@ -524,7 +524,7 @@ parse_config(const char *q_arg)