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 408B1A057F for ; Tue, 28 Jun 2022 17:20:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D26142825; Tue, 28 Jun 2022 17:20:05 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9E92140042 for ; Tue, 28 Jun 2022 17:20:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656429603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1VO6Lz8wIAIdZOhn5YJRvmSaPGzsv6Rf/BOZowrpwmQ=; b=YiX+v6iURiPVYCdY+CduADE5IiX/zb2Oh87ackTJqeYM5/8rlwrQwcAKV2Xi5nam2cVs5i g911LuStYqpGL5kM4ux47+jSxrzSjuweno603lZD+3bTFvUr3cvdYY69OZp2gcjKdrLsxu ojGKquKqCegv/YLSMhc7ELh0NzMCsow= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-245-wFTURMH9OkO3R7Ty6hx-IA-1; Tue, 28 Jun 2022 11:19:59 -0400 X-MC-Unique: wFTURMH9OkO3R7Ty6hx-IA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 570CB29DD9A3; Tue, 28 Jun 2022 15:19:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A8EA1415108; Tue, 28 Jun 2022 15:19:57 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Viacheslav Ovsiienko , Aman Singh , dpdk stable Subject: patch 'app/testpmd: fix GTP PSC raw processing' has been queued to stable release 21.11.2 Date: Tue, 28 Jun 2022 16:19:24 +0100 Message-Id: <20220628151938.2278711-12-ktraynor@redhat.com> In-Reply-To: <20220628151938.2278711-1-ktraynor@redhat.com> References: <20220628151938.2278711-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 06/30/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/44dad33c767065893b3e5afcddcaea444e162258 Thanks. Kevin --- >From 44dad33c767065893b3e5afcddcaea444e162258 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 16 Jun 2022 21:01:04 +0300 Subject: [PATCH] app/testpmd: fix GTP PSC raw processing [ upstream commit c65282c9aa31ff0cae4ff7030ac5e56a98b2d711 ] Use generic GTP PSC header definition in raw handler. Fixes: 9213c50e36fa ("app/testpmd: support GTP PSC option in raw sets") Signed-off-by: Gregory Etelson Reviewed-by: Viacheslav Ovsiienko Acked-by: Aman Singh --- app/test-pmd/cmdline_flow.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index ce57e409df..e21e0326d9 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -9210,17 +9210,11 @@ cmd_set_raw_parsed(const struct buffer *in) const struct rte_flow_item_gtp_psc *opt = item->spec; - struct { - uint8_t len; - uint8_t pdu_type:4; - uint8_t qfi:6; - uint8_t next; - } psc; - psc.len = sizeof(psc) / 4; - psc.pdu_type = opt->hdr.type; - psc.qfi = opt->hdr.qfi; - psc.next = 0; - *total_size += sizeof(psc); - rte_memcpy(data_tail - (*total_size), - &psc, sizeof(psc)); + struct rte_gtp_psc_generic_hdr *hdr; + + *total_size += RTE_ALIGN(sizeof(hdr), + sizeof(int32_t)); + hdr = (typeof(hdr))(data_tail - (*total_size)); + *hdr = opt->hdr; + hdr->ext_hdr_len = 1; gtp_psc = i; size = 0; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-28 16:18:04.312599302 +0100 +++ 0012-app-testpmd-fix-GTP-PSC-raw-processing.patch 2022-06-28 16:18:04.019387176 +0100 @@ -1 +1 @@ -From c65282c9aa31ff0cae4ff7030ac5e56a98b2d711 Mon Sep 17 00:00:00 2001 +From 44dad33c767065893b3e5afcddcaea444e162258 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c65282c9aa31ff0cae4ff7030ac5e56a98b2d711 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cfd55c598d..6cb1173385 100644 +index ce57e409df..e21e0326d9 100644 @@ -22 +23 @@ -@@ -11030,17 +11030,11 @@ cmd_set_raw_parsed(const struct buffer *in) +@@ -9210,17 +9210,11 @@ cmd_set_raw_parsed(const struct buffer *in)