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 F2227489EF for ; Mon, 27 Oct 2025 17:21:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC9134028B; Mon, 27 Oct 2025 17:21:00 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id BB06F4028B for ; Mon, 27 Oct 2025 17:20:59 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so30442895e9.0 for ; Mon, 27 Oct 2025 09:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582059; x=1762186859; 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=qAdIBl934VCPXcysGVp5nrhdsYGmafhwbhd9L/7I9N4=; b=AXDAZhMcWE37oal8kLDycD/TWCVc9W8d9UkCn6UA2/1wYH4pfaQ5PUB8QT4vgQLmYI 6+T2bx3yrt9DGqfQvxup77RIu4Ru0ondmWEb7u5nvVjWZ0V0Zzf+yhHzzFrpqjVg50P+ QYxhLGkkngOzvY2sFMihMNYcwT10mJ0k7KzzsxPn5z+KNHYXxhET81rRc/6XQ8CqCcBU lIS2MyYoav1BCtdibGNplk9vI1phITPiAnidc0bGNi3ybZ+inap2mXqw1pIMuhAUg9wm 0Oi7vDf6Y0PEHMxiXmBk5Xw6iymQHa0zkbtuSmwW/sshB+oH7Xo5YfJt4spYesXhAlOY t7+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582059; x=1762186859; 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=qAdIBl934VCPXcysGVp5nrhdsYGmafhwbhd9L/7I9N4=; b=U4YhfJW9X+HunYZtdCyLAsUkvWxKnYfivEQ4J4zrwN4VZyoHX402KMfd47wYKI/9Zv mhTD3Ffr4+IpH5Zw5CI4HtCJqlc8t+vDXT52XiYpf+4dqgHbTePaJiRQBtnwEclxOxmS KUXCMu9IpEmKOyCZnK2hD28AAdvlU5X/9IPXON3FZohkLfidUmhuVLOwRAjwBl+PuHbj GO5dZ4768FrWE451yGwqUs/sRCHp8Qxd/vwU3tKvG71VfdQo0S0lN90n7tQmNxHwBj5L ZPx40htvUNVLgMdj+qX8HfSG13LYHLuws/bkxh9mJWz6lTdeSSqo6OG/DXtSpQD2ON59 F8fg== X-Gm-Message-State: AOJu0YyB+U2kkiacCE1UoAOHqGbj0wSj/YX5b+w94TMUlYb+fJouOMbT qg2sjdWnERbWYcmbN3aPYxwnGIUmVPuJhcDSZWNyAyXorjS6/CMH6JFCXC6m+A== X-Gm-Gg: ASbGnctHuC2QsXd9fjwnRsicxGNEF3Qmqxtr/4Xph5+G831FdNN0mvqAeoHtYETcr9F ktPhZ+K/HAgMHBwnMDB03U3CMxYe05+tz1UQnAc+xYvnEX7Sqq4EgPQcNvywE5H9plEVr5zwlON 8bvC1N5pzWDcVWu1YMV8EIxjkP62Ugk/XLVZ+pjDxXMzxFEpJMdy39teJwJcgDBxLaL8FjaTzzz AEJB53NrwM+w285J4iiEermNLtKWlJ6LiOXWZ5NzJgSnjPBow/OXUVrfP4GaslsFxJz+EW+syvx u360HGDwF0zaGK8IO+08Wkv5OhV5erTK7GmmYA7o2J/R1G6FlttXMPoCVWp5lXDrJpL+Rs1oQKZ 2baMiRxV+dvrkJmFnO1le2Z5LHU55D3H3zfOUiKTRDe7ehUABZ/pbYLZyZ1iG9Mh6yzGhred9Ix oQmP0JkGo05iLfoft4 X-Google-Smtp-Source: AGHT+IERjdHX2qL6GpRcRxGxfiBRM9Hb3mpyYrYshVPM3nA4PBHRXUKE+5phIWLYY3zBfRlHCIuC8A== X-Received: by 2002:a05:600c:620f:b0:471:b5d:2db9 with SMTP id 5b1f17b1804b1-47717e40da6mr1889325e9.21.1761582059185; Mon, 27 Oct 2025 09:20:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-475dd48a07dsm144673875e9.17.2025.10.27.09.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:20:58 -0700 (PDT) From: luca.boccassi@gmail.com To: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Cc: dpdk stable Subject: patch 'app/testpmd: validate DSCP and VLAN for meter creation' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:18:54 +0000 Message-ID: <20251027162001.3710450-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/29/25. 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/def7b6f7e5cabc671b488d6d410cda7f1c8d70ce Thanks. Luca Boccassi --- >From def7b6f7e5cabc671b488d6d410cda7f1c8d70ce Mon Sep 17 00:00:00 2001 From: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Date: Thu, 28 Aug 2025 01:29:01 -0400 Subject: [PATCH] app/testpmd: validate DSCP and VLAN for meter creation [ upstream commit 00092e969aad2fb2a2017b7eec86f033d4527950 ] Add validation mechanism for meter creation. The maximum possible entries are [ ...] [ ... ]. Currently, testpmd allows any input table entries for DSCP and VLAN tables. This patch validates the maximum possible DSCP and VLAN table entries for meter creation. Fixes: 9f5488e326d3b ("app/testpmd: support different input color method") Signed-off-by: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> --- app/test-pmd/cmdline_mtr.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c index e16c5b268f..0c5897ada8 100644 --- a/app/test-pmd/cmdline_mtr.c +++ b/app/test-pmd/cmdline_mtr.c @@ -85,15 +85,35 @@ parse_uint(uint64_t *value, const char *str) return 0; } +static int +validate_input_color_table_entries(char *str) +{ + char *saveptr; + char *token = strtok_r(str, PARSE_DELIMITER, &saveptr); + for (int i = 0; token != NULL; i++) { + if (i > ((MAX_DSCP_TABLE_ENTRIES + MAX_VLAN_TABLE_ENTRIES) - 1)) + return -1; + token = strtok_r(NULL, PARSE_DELIMITER, &saveptr); + } + return 0; +} + static int parse_input_color_table_entries(char *str, enum rte_color **dscp_table, enum rte_color **vlan_table) { enum rte_color *vlan, *dscp; - char *token; + char *token, *saveptr; + char *temp_str = strdup(str); int i = 0; - token = strtok_r(str, PARSE_DELIMITER, &str); + if (validate_input_color_table_entries(temp_str)) { + free(temp_str); + return -1; + } + free(temp_str); + + token = strtok_r(str, PARSE_DELIMITER, &saveptr); if (token == NULL) return 0; @@ -117,7 +137,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table, if (i == MAX_DSCP_TABLE_ENTRIES) break; - token = strtok_r(str, PARSE_DELIMITER, &str); + token = strtok_r(NULL, PARSE_DELIMITER, &saveptr); if (token == NULL) { free(dscp); return -1; @@ -126,7 +146,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table, *dscp_table = dscp; - token = strtok_r(str, PARSE_DELIMITER, &str); + token = strtok_r(NULL, PARSE_DELIMITER, &saveptr); if (token == NULL) return 0; @@ -154,7 +174,7 @@ parse_input_color_table_entries(char *str, enum rte_color **dscp_table, if (i == MAX_VLAN_TABLE_ENTRIES) break; - token = strtok_r(str, PARSE_DELIMITER, &str); + token = strtok_r(NULL, PARSE_DELIMITER, &saveptr); if (token == NULL) { free(vlan); free(*dscp_table); -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:35.428776298 +0000 +++ 0016-app-testpmd-validate-DSCP-and-VLAN-for-meter-creatio.patch 2025-10-27 15:54:34.739948146 +0000 @@ -1 +1 @@ -From 00092e969aad2fb2a2017b7eec86f033d4527950 Mon Sep 17 00:00:00 2001 +From def7b6f7e5cabc671b488d6d410cda7f1c8d70ce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 00092e969aad2fb2a2017b7eec86f033d4527950 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org