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 DD102A0A0E for ; Mon, 10 May 2021 18:22:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6E814003E; Mon, 10 May 2021 18:22:03 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2052.outbound.protection.outlook.com [40.107.243.52]) by mails.dpdk.org (Postfix) with ESMTP id BD174410E3 for ; Mon, 10 May 2021 18:22:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dsjf5lTpedoh6QBE7tJhpIsf9QBRxbvBKk8rbCQsWMt7EXf+lurtMgs5+AQa4kvyh8VW/vTat/1MLk63516oOzlEwqNBaBqvSSVbLzqOxixF6P/ed29BVmj+lv9YP04kB8f/cGfpemww7ykjZFHe/NbV2O6YckfQlMf/h3aqquTIy+Agnmi/fJ4Pczhpzw8jknJBa+KY07vo8JV2d4mAgw94LWbGAiQW6EGG58DBWJK68MvwQ5dGn9vdxcpTpC1l+n+yBZhPckdk1g24TA9wdhB42YSWkbnojbHQgPngC9xPFqcIK6dH4Q/rvWTLJujiJdh2Js1lz0KCcgyfya0wZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q+Zu9E9NPepUBq9aficTBEcXhALfGRBidDkzJI94j/Q=; b=lhiy6moGARXzUKJSVFAeeoyGG0ull/Obf/IRjmjHCLSYBgHILxGQQptNpHzTpChAPFl5rhV7B0P7ogcbSz7qRPivpo/HEhWn9ryV055Kim3cZ1A1peSZfbnZNeuAPLEZ8yU4Doktad95ewsdDavVqPsAcCXReYIUhIfx2f4v7Rni9a8V2CU3Awcz5TnZZhG7ccO7NBS+IWeSievA34uz7Hk9c8GcRFDobO7qErr/ZogjkcI5dn+DCOEp0lkq4kFOTqXpxzqEH2nTfGUuhsfCWJIRK2DHBM/b79EEWSr6LpTvp0ZmNGuljUven8zMTV71VptY97Lbjd8WRTH95ldpLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q+Zu9E9NPepUBq9aficTBEcXhALfGRBidDkzJI94j/Q=; b=RVQxX9yTyrAR8g6e3SQKxBXesClxN86IC20ynjtQSLgq9FJSFGOpphAWWyRDjZsk1/is1qVQrj9r+S9UEy7/4nDoFJaYttKNGDAjSGHC1agvEvBrLm+tMystTMU1JmNCc2ivR3ICWeXR5I5UnFCaHb2RMwFnLeNjs7CFQWMa+srYiNE4SWiGHFEA1eOiiMymnFw5rupzwwl1DekpFnVvFhmds3jNqJ1TbhV6yTGUELzmDDDRhbxdB+ybkU1SRAZT9frLeb3MKwhD/eiZ8MWUiD8Os4j7NoiCJkXZX4s1alCkGoCtzKSKEUYlFfqvny0tHyKvyUOqnfpuRyW+ClTJQw== Received: from BN9P220CA0006.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::11) by MWHPR12MB1518.namprd12.prod.outlook.com (2603:10b6:301:11::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:22:00 +0000 Received: from BN8NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::a2) by BN9P220CA0006.outlook.office365.com (2603:10b6:408:13e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:22:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT050.mail.protection.outlook.com (10.13.177.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:59 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:21:57 +0000 From: Xueming Li To: Raslan Darawsheh CC: Luca Boccassi , Ferruh Yigit , dpdk stable Date: Tue, 11 May 2021 00:02:19 +0800 Message-ID: <20210510160258.30982-190-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bc9ead5-b0ae-4acf-b5d4-08d913cfbd05 X-MS-TrafficTypeDiagnostic: MWHPR12MB1518: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xzCoeY1z1gA7eqg2lxzwUrKxd28XDUrHgaZXqiIX9B/KmCE4NMgKp2vKsTfLfrRjBQ4mQh5/7IYNYIBjZH/RVXoFYIb9+ChhpH89nFQts3bq36i+4+7W1+GXAgBRiSYR3caayKMNfNs86CqwGygXoEfex7UtOC37kd8fyafE/4HthjSfLns9PoAhxmieceGwUy5xoyH6Fgy6ICt46Zw+tr9XMBfpLNiNrdqQKcp13qNhjjcQwHpFyl24Fv/UTCtDSy5a/kqf7pIpuNlLkZ0qNQfqdRjc60/tntO9i4YFr0R235R5iWPwfaWE3rq/PqQPrtwD7M9MlN+sXaKP0Zxzy9cqrAVK7VkS2lztR4iGmOp/2g9w7zo9ArPpcSw0o0ulwHVPcaAU2nQNnAYhZAt1AK2Xen+gCvv4DagmWHvGNFbJMhi2bjx5PAmtoqRDAMN4JdZYnol2TbCazIF6C5UyLdcrI1TG9U6WZOMrejN4JpLilBvmOgsysxpz6grEoXZd5RpvE2bxBi0bxnDvR5tMr/Q6faq3Fng9XNGmQ5bFq88HNrvh1KrBo5VHRo+VHZ/pxLtXpwAO5MYpj5uKiloJnk6k8C3+UfDU2Akuscj7/zWFNljmQ3zWVom5HJFxZZfi3QAralHJAUjhyP7px/ae3mIXsajyt2kxMgwDeq5EwQysm/KhBe3kDVxCOhlKMHiF5tl3TZuOMAyT+0sWYsCM5rt3tgsI7YS2h5otZ32A9tv5/6oqFIqwfXKTfR8z7KQU2//XK8STA9vIh2IxtjBsvw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(396003)(376002)(346002)(136003)(36840700001)(46966006)(55016002)(83380400001)(36756003)(8676002)(478600001)(36906005)(316002)(5660300002)(70206006)(37006003)(2906002)(54906003)(8936002)(15650500001)(86362001)(356005)(82310400003)(70586007)(53546011)(6862004)(2616005)(426003)(36860700001)(6286002)(82740400003)(4326008)(7636003)(26005)(6666004)(16526019)(966005)(336012)(186003)(6636002)(7696005)(1076003)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:59.8292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc9ead5-b0ae-4acf-b5d4-08d913cfbd05 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1518 Subject: [dpdk-stable] patch 'ethdev: update flow item GTP QFI definition' has been queued to stable release 20.11.2 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 20.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 05/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5ecc163bf94f95ca73365d5d6b940dad3c425761 Thanks. Xueming Li --- >From 5ecc163bf94f95ca73365d5d6b940dad3c425761 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 Cc: Luca Boccassi [ 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 6a00245fc8..3187756892 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3729,7 +3729,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 0977a78270..3ecf65e3ee 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -1385,14 +1385,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.504402300 +0800 +++ 0191-ethdev-update-flow-item-GTP-QFI-definition.patch 2021-05-10 23:59:26.650000000 +0800 @@ -1 +1 @@ -From 7d96f5717a693546933aff4f6623c94976150c5b Mon Sep 17 00:00:00 2001 +From 5ecc163bf94f95ca73365d5d6b940dad3c425761 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 7d96f5717a693546933aff4f6623c94976150c5b ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index 72667dedb1..711683fa11 100644 +index 6a00245fc8..3187756892 100644 @@ -33 +35 @@ -@@ -3767,7 +3767,8 @@ This section lists supported pattern items and their attributes, if any. +@@ -3729,7 +3729,8 @@ This section lists supported pattern items and their attributes, if any. @@ -44 +46 @@ -index 5eba79d26f..203c4cde9a 100644 +index 0977a78270..3ecf65e3ee 100644 @@ -47 +49 @@ -@@ -1423,14 +1423,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = { +@@ -1385,14 +1385,14 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = {