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 A7E0EA0579 for ; Tue, 6 Apr 2021 18:10:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96E52141254; Tue, 6 Apr 2021 18:10:02 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 6BB1C14122C; Tue, 6 Apr 2021 18:10:00 +0200 (CEST) IronPort-SDR: oxY+dj08iZYAmjpIb7SQBt6RjFC+iIKKiqsSsAFkWaw6gNSWegxw7Z6zwx52T/y/vNNiq7q1VO xThSUeo4BRkw== X-IronPort-AV: E=McAfee;i="6000,8403,9946"; a="180232798" X-IronPort-AV: E=Sophos;i="5.82,310,1613462400"; d="scan'208";a="180232798" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 09:09:59 -0700 IronPort-SDR: 4vrv9qMWqcGTkGkOFwMlLpSouI24EjabRfIZ0QImbIfwPkDSMfU4+mB9iSQZ3U2sJctb3Dz3vL ClZkqWkdWIOg== X-IronPort-AV: E=Sophos;i="5.82,310,1613462400"; d="scan'208";a="421277989" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.213.250.199]) ([10.213.250.199]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 09:09:56 -0700 To: Raslan Darawsheh , dev@dpdk.org, orika@nvidia.com, andrew.rybchenko@oktetlabs.ru Cc: ivan.malov@oktetlabs.ru, ying.a.wang@intel.com, olivier.matz@6wind.com, viacheslavo@nvidia.com, shirik@nvidia.com, stable@dpdk.org, David Marchand , Thomas Monjalon References: <20210330075036.6579-2-rasland@nvidia.com> <20210404074552.24190-1-rasland@nvidia.com> <20210404074552.24190-3-rasland@nvidia.com> From: Ferruh Yigit X-User: ferruhy Message-ID: <536631b9-c634-ddac-c154-91978ffc29a5@intel.com> Date: Tue, 6 Apr 2021 17:09:53 +0100 MIME-Version: 1.0 In-Reply-To: <20210404074552.24190-3-rasland@nvidia.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-stable] [PATCH v4 2/2] ethdev: update qfi definition 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" On 4/4/2021 8:45 AM, Raslan Darawsheh wrote: > 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) based on RFC 38415-g30 > > This update the doxygen format 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") > Cc: ying.a.wang@intel.com > Cc: stable@dpdk.org > > Signed-off-by: Raslan Darawsheh > --- > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 ++- > lib/librte_ethdev/rte_flow.h | 20 +++++++++++++++++--- > 2 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > index f59eb8a27d..dd39c4c3c2 100644 > --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > @@ -3742,7 +3742,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 6cc57136ac..20b4389429 100644 > --- a/lib/librte_ethdev/rte_flow.h > +++ b/lib/librte_ethdev/rte_flow.h > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1421,16 +1422,29 @@ static const struct rte_flow_item_meta rte_flow_item_meta_mask = { > * > * Matches a GTP PDU extension header with type 0x85. > */ > +RTE_STD_C11 > struct rte_flow_item_gtp_psc { > - uint8_t pdu_type; /**< PDU type. */ > - uint8_t qfi; /**< QoS flow identifier. */ > + union { > + struct { > + /* > + * These fields are retained for compatibility. > + * Please switch to the new header field below. > + */ > + uint8_t pdu_type; /**< PDU type. */ > + uint8_t qfi; /**< PPP, RQI, QoS flow identifier. */ > + > + }; > + struct rte_gtp_psc_hdr hdr; > + }; > }; This will change the struct size even with union, since old version is missing all fields from protocol header. Struct size will go from 2 --> 5 bytes [1]. Since this is public struct, we can't change its size. @Ori, Andrew, Do you have a suggestion for next step? - We can still add the "struct rte_gtp_psc_hdr", and add a deprecation notice for "struct rte_flow_item_gtp_psc" to say it will use "struct rte_gtp_psc_hdr" on 21.11. - And for this release use the Raslan's first version: - uint8_t qfi; /**< QoS flow identifier. */ + uint8_t qfi; /**< PPP, RQI, QoS flow identifier. */ Does it make sense? Any comments? [1] struct rte_gtp_psc_hdr { uint8_t ext_hdr_len; /* 0 1 */ uint8_t type:4; /* 1: 0 1 */ uint8_t qmp:1; /* 1: 4 1 */ /* XXX 3 bits hole, try to pack */ union { struct { uint8_t snp:1; /* 2: 0 1 */ uint8_t spare_dl1:2; /* 2: 1 1 */ }; /* 2 1 */ struct { uint8_t dl_delay_ind:1; /* 2: 0 1 */ uint8_t ul_delay_ind:1; /* 2: 1 1 */ uint8_t snp_ul1:1; /* 2: 2 1 */ }; /* 2 1 */ }; /* 2 1 */ union { struct { uint8_t ppp:1; /* 3: 0 1 */ uint8_t rqi:1; /* 3: 1 1 */ }; /* 3 1 */ struct { uint8_t n_delay_ind:1; /* 3: 0 1 */ uint8_t spare_ul2:1; /* 3: 1 1 */ }; /* 3 1 */ }; /* 3 1 */ uint8_t qfi:6; /* 4: 0 1 */ /* XXX 2 bits hole, try to pack */ uint8_t data[]; /* 5 0 */ /* size: 5, cachelines: 1, members: 7 */ /* sum members: 3 */ /* sum bitfield members: 11 bits, bit holes: 2, sum bit holes: 5 bits */ /* last cacheline: 5 bytes */ }; > > /** 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, > + .hdr.ppp = 1, > + .hdr.rqi = 1, > + .hdr.qfi = 0x3f, > }; > #endif > >