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 133BAA04FD for ; Tue, 12 Jul 2022 21:24:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E74E40F1A; Tue, 12 Jul 2022 21:24:08 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id B526B40F1A for ; Tue, 12 Jul 2022 21:24:07 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id f2so12527323wrr.6 for ; Tue, 12 Jul 2022 12:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+L/OG6gHtsHxfg5wJrVd6eUSmB3Rf1X6R1sIJgG4gZE=; b=kgdrgTDQxMPVam71B3p25omWZrxa0lk8xJVpvcyzRtyH7PnOlU8I++hSi/t+3tqzw2 ryhmrTcO53/kQlQ2t9vOQOPfzzcWpVXkqXf/wDYcse2SA0WpsosViwJqtpWfwwGzS2fb PqTi4Qkq9+CJqTS3/EURrOio+werjJYWAecJDjJbhFGPJBYUkA20EhHIiB9waI8vvih2 X1uU7DC8TT18myKixiUdJJ+gQ/zkN8nTxiNxD3CcX0y+L1TVRFF444Xy9xtTL6ZpwPGk S0XrrKKv+NCqFqCN4j35yLB6PRFbDiczSV2vXsWioLKxbhZOufKSB/Ggt+9SZFhk+GC9 Gm8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+L/OG6gHtsHxfg5wJrVd6eUSmB3Rf1X6R1sIJgG4gZE=; b=hw9zmBL4p3PrBzzIxxSIV65961MC9UYPLV4wL2po9TKAdWCKmzmaK4NmbzjvbzPVCo pYFasXDetMa0ah8+qmXi2JBk5bJ+VDiEaK7BpQRvpHoJX/GC6Q/Cf5OeV3I1LgPWus2s waELrJaZMWo4NgEKNf/yeSEZXGa8ubucD21dje8CAZKFvP6Qt0qKoXPliPiCUEh/esO3 NssdZ+iopdzRNO7REJh7o9HPjf/yYAieb8cyTGgbSPvp+WUpWjtAfv8Wlle7hui5qrtB yzRDyfaT4tqASS436fp2MFlfELDPipLQppHdO3Irf5fqGbMIA0Up8WNClGM/iDCmxGb3 eS7A== X-Gm-Message-State: AJIora/HE+HDNlrOf0WS3sfu4QA5ebkItDnFkoh1NSaCI0q6FrkJCKlb gYlG5IigMVSj6ROkqd6jkTBKB+9Hms4p3Q== X-Google-Smtp-Source: AGRyM1seFclLzFR+V+OEYDTztLgd8X5U/pLRl9HYh5ZFgauqiUXQdcwNPJMy89Ax8ZVyi8RS0MwIfQ== X-Received: by 2002:adf:f34c:0:b0:21d:6705:87dd with SMTP id e12-20020adff34c000000b0021d670587ddmr23051330wrp.430.1657653847368; Tue, 12 Jul 2022 12:24:07 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c4f9400b0039c5ab7167dsm13726359wmq.48.2022.07.12.12.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 12:24:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Aman Singh , Andrew Rybchenko , dpdk stable Subject: patch 'app/testpmd: fix GTP PSC raw processing' has been queued to stable release 21.11.2 Date: Tue, 12 Jul 2022 20:23:49 +0100 Message-Id: <20220712192349.4174428-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712192349.4174428-1-luca.boccassi@gmail.com> References: <20220706203506.3422496-31-luca.boccassi@gmail.com> <20220712192349.4174428-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 21.11.2 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/14/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/84b2018842a8d34406f277e586dcda56a5b017ab Thanks. Luca Boccassi --- >From 84b2018842a8d34406f277e586dcda56a5b017ab Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Wed, 6 Jul 2022 19:11:50 +0300 Subject: [PATCH] app/testpmd: fix GTP PSC raw processing [ upstream commit a942222d56faf55b770a66be177590ed2d96584f ] Fix GTP PSP extension size initialization. Clear input buffer. Fixes: c65282c9aa31 ("app/testpmd: fix GTP PSC raw processing") Signed-off-by: Gregory Etelson Acked-by: Aman Singh Reviewed-by: Andrew Rybchenko --- app/test-pmd/cmdline_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index e21e0326d9..5c4544a753 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -9210,10 +9210,12 @@ cmd_set_raw_parsed(const struct buffer *in) const struct rte_flow_item_gtp_psc *opt = item->spec; struct rte_gtp_psc_generic_hdr *hdr; - - *total_size += RTE_ALIGN(sizeof(hdr), + size_t hdr_size = RTE_ALIGN(sizeof(*hdr), sizeof(int32_t)); + + *total_size += hdr_size; hdr = (typeof(hdr))(data_tail - (*total_size)); + memset(hdr, 0, hdr_size); *hdr = opt->hdr; hdr->ext_hdr_len = 1; gtp_psc = i; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-12 20:22:33.916944453 +0100 +++ 0006-app-testpmd-fix-GTP-PSC-raw-processing.patch 2022-07-12 20:22:33.725247488 +0100 @@ -1 +1 @@ -From a942222d56faf55b770a66be177590ed2d96584f Mon Sep 17 00:00:00 2001 +From 84b2018842a8d34406f277e586dcda56a5b017ab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a942222d56faf55b770a66be177590ed2d96584f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 6cb1173385..7f50028eb7 100644 +index e21e0326d9..5c4544a753 100644 @@ -23 +24 @@ -@@ -11030,10 +11030,12 @@ cmd_set_raw_parsed(const struct buffer *in) +@@ -9210,10 +9210,12 @@ cmd_set_raw_parsed(const struct buffer *in)