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 12D83A0A02 for ; Mon, 17 May 2021 18:15:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BBEA410EA; Mon, 17 May 2021 18:15:05 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 29725410E0 for ; Mon, 17 May 2021 18:15:04 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1liftW-00087o-9P; Mon, 17 May 2021 16:15:02 +0000 From: Christian Ehrhardt To: Raslan Darawsheh Cc: Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:09:03 +0200 Message-Id: <20210517161039.3132619-114-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: update flow item GTP QFI definition' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/e7461728e6f42ec87a98fa7d6bcfff0f024a9b95 Thanks. Christian Ehrhardt --- >From e7461728e6f42ec87a98fa7d6bcfff0f024a9b95 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Tue, 23 Mar 2021 14:11:34 +0200 Subject: [PATCH] ethdev: update flow item GTP QFI definition [ upstream commit 7d96f5717a693546933aff4f6623c94976150c5b ] 'qfi' field is 8 bits which represent single bit for PPP (paging Policy Presence) single bit for RQI (Reflective QoS Indicator) and 6 bits for QFI (QoS Flow Identifier) This is based on RFC 38415-g30 https://www.3gpp.org/ftp/Specs/archive/38_series/38.415/38415-g30.zip Updated the doxygen comment and the mask for 'qfi' to properly identify the full 8 bits of the field. note: changing the default mask would cause different patterns generated by testpmd. Fixes: 346553db5bd1 ("ethdev: add GTP extension header to flow API") Signed-off-by: Raslan Darawsheh Reviewed-by: Ferruh Yigit --- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 ++- lib/librte_ethdev/rte_flow.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 17a41c21e5..4f77db31f6 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3944,7 +3944,8 @@ This section lists supported pattern items and their attributes, if any. - ``gtp_psc``: match GTP PDU extension header with type 0x85. - ``pdu_type {unsigned}``: PDU type. - - ``qfi {unsigned}``: QoS flow identifier. + + - ``qfi {unsigned}``: PPP, RQI and QoS flow identifier. - ``pppoes``, ``pppoed``: match PPPoE header. diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index 693824da8a..c32cd40434 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -1302,14 +1302,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = { */ struct rte_flow_item_gtp_psc { uint8_t pdu_type; /**< PDU type. */ - uint8_t qfi; /**< QoS flow identifier. */ + uint8_t qfi; /**< PPP, RQI, QoS flow identifier. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_GTP_PSC. */ #ifndef __cplusplus static const struct rte_flow_item_gtp_psc rte_flow_item_gtp_psc_mask = { - .qfi = 0x3f, + .qfi = 0xff, }; #endif -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:33.909898603 +0200 +++ 0114-ethdev-update-flow-item-GTP-QFI-definition.patch 2021-05-17 17:40:29.335810768 +0200 @@ -1 +1 @@ -From 7d96f5717a693546933aff4f6623c94976150c5b Mon Sep 17 00:00:00 2001 +From e7461728e6f42ec87a98fa7d6bcfff0f024a9b95 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7d96f5717a693546933aff4f6623c94976150c5b ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 72667dedb1..711683fa11 100644 +index 17a41c21e5..4f77db31f6 100644 @@ -33 +34 @@ -@@ -3767,7 +3767,8 @@ This section lists supported pattern items and their attributes, if any. +@@ -3944,7 +3944,8 @@ This section lists supported pattern items and their attributes, if any. @@ -44 +45 @@ -index 5eba79d26f..203c4cde9a 100644 +index 693824da8a..c32cd40434 100644 @@ -47 +48 @@ -@@ -1423,14 +1423,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = { +@@ -1302,14 +1302,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = {