Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63519C0018C for ; Wed, 16 Dec 2020 14:25:44 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id CD74A233CF for ; Wed, 16 Dec 2020 14:25:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD74A233CF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F12B2C9B8; Wed, 16 Dec 2020 15:25:28 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C34B3C9B4 for ; Wed, 16 Dec 2020 15:25:26 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from shirik@nvidia.com) with SMTP; 16 Dec 2020 16:25:23 +0200 Received: from nvidia.com (c-236-2-60-065.mtl.labs.mlnx [10.236.2.65]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 0BGEPF6c015188; Wed, 16 Dec 2020 16:25:22 +0200 From: Shiri Kuzin To: dev@dpdk.org Cc: viacheslavo@nvidia.com, adrien.mazarguil@6wind.com, rasland@nvidia.com Date: Wed, 16 Dec 2020 16:25:06 +0200 Message-Id: <20201216142511.13660-2-shirik@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201216142511.13660-1-shirik@nvidia.com> References: <1599118768-13265-1-git-send-email-shirik@nvidia.com> <20201216142511.13660-1-shirik@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC 1/6] ethdev: update GTP headers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Viacheslav Ovsiienko This patch introduces the GTP header individual flag bit fields and the header optional word with N-PDU number, Sequence Number and Next Extension Header type. Signed-off-by: Viacheslav Ovsiienko --- lib/librte_net/rte_gtp.h | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/lib/librte_net/rte_gtp.h b/lib/librte_net/rte_gtp.h index 104384cc53..6a6f9b238d 100644 --- a/lib/librte_net/rte_gtp.h +++ b/lib/librte_net/rte_gtp.h @@ -27,13 +27,40 @@ extern "C" { * 16-bit payload length after mandatory header, 32-bit TEID. * No optional fields and next extension header. */ +__extension__ struct rte_gtp_hdr { - uint8_t gtp_hdr_info; /**< GTP header info */ + union { + uint8_t gtp_hdr_info; /**< GTP header info */ + struct { +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + uint8_t pn:1; /**< N-PDU Number present bit */ + uint8_t s:1; /**< Sequence Number Present bit */ + uint8_t e:1; /**< Extension Present bit */ + uint8_t res1:1; /**< Reserved */ + uint8_t pt:1; /**< Protocol Type bit */ + uint8_t ver:3; /**< Version Number */ +#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN + uint8_t ver:3; /**< Version Number */ + uint8_t pt:1; /**< Protocol Type bit */ + uint8_t res1:1; /**< Reserved */ + uint8_t e:1; /**< Extension Present bit */ + uint8_t s:1; /**< Sequence Number Present bit */ + uint8_t pn:1; /**< N-PDU Number present bit */ +#endif + }; + }; uint8_t msg_type; /**< GTP message type */ - uint16_t plen; /**< Total payload length */ - uint32_t teid; /**< Tunnel endpoint ID */ + rte_be16_t plen; /**< Total payload length */ + rte_be32_t teid; /**< Tunnel endpoint ID */ } __rte_packed; +/* Optional word of GTP header, present if any of E, S, PN is set. */ +struct rte_gtp_hdr_ext_word { + rte_be16_t sqn; /**< Sequence Number. */ + uint8_t npdu; /**< N-PDU number. */ + uint8_t next_ext; /**< Next Extension Header Type. */ +} __rte_packed; + /** GTP header length */ #define RTE_ETHER_GTP_HLEN \ (sizeof(struct rte_udp_hdr) + sizeof(struct rte_gtp_hdr)) -- 2.21.0