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 9455741D79; Sat, 25 Feb 2023 14:53:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4738B40DDC; Sat, 25 Feb 2023 14:53:54 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 5716840DDA for ; Sat, 25 Feb 2023 14:53:53 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id h14so1920435wru.4 for ; Sat, 25 Feb 2023 05:53:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ed5zNnMpsGbyKgDke3IKjo6gOU01wlc/Sc7jFl9eTEA=; b=W8C62nnoQt6XeryAmrsDIgJS6JJNn4U0j4CBEBUoZY/fqrp1KxTfuNhC+Ova+g1kET Q5dc7Uzu2RDIMgYvSPAPz4MTbnDgrh7DrQQVpw4TDZ+A/hMWpFtrNAT67Jgpw3XG6fH/ BTQrIVJhEosBC1phpHSfswBgKZPQ5fbW20FQg1vVOYYdCFc0svs87iObWTpfG9BotZqi sZqia+kKYXRLoZFQ92Ek6VlL1DhRLjGF05rIeUyPODp8aJNQEghuM+ykyC6d9WvzPcWv twJqbGQ/dMa4zYJ7Hoy9Bf6WL8UPbRrR4/CSb1UOZuFxkXln/NTEMUggMvmSOqsSQ6v9 7zJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ed5zNnMpsGbyKgDke3IKjo6gOU01wlc/Sc7jFl9eTEA=; b=QFvhc9W9cAxciIy7gGmYO6FWrHjRSgnS+Op8bZ4vpe4yQ6P95hU92voKk5B8XAtFzC ZCxJU4U/FHjolXAEJIcR7+/Fb/8TKmAbNUKFrxC5WFED3YLRi2VGUKf6tovXwo609WIp tvb7x8SB4e3vGZ+vmlmg+3wT4mwxu/9pUcab9utb1EvkblUacVmLz0a8sfsk15RNETSV 2kjoS0cg4eRpr5z98MQeqRYzr931rHc+FrXMKFUvQToa3mAQaEgSHAcdzRC0+RsyL0Br Y22cxb4Th6SvY7uFh1gS/dCZdbdnziDXLvZvYC0VchBuuuuk3NmsnqW+UYMk7r6BJhSV RWug== X-Gm-Message-State: AO0yUKX5QDAfwmMgop1yyFAg9ZY2Ry9W906wMj4X1T/AkjK3vnP+dKsE FIejz7L5RwjEb5wfynauNtY= X-Google-Smtp-Source: AK7set/66juJNskZHa3UpjqA0D4q7BVfaQbuvOv4dpmiZDW0sspszHODnB8Rzz4i1u/+/vBe/0RMDA== X-Received: by 2002:a05:6000:81e:b0:2c4:489:fe93 with SMTP id bt30-20020a056000081e00b002c40489fe93mr2260464wrb.21.1677333232738; Sat, 25 Feb 2023 05:53:52 -0800 (PST) Received: from DESKTOP-KPIMD3E.localdomain ([2407:d000:f:d37f:706f:f5d4:b46b:b68c]) by smtp.gmail.com with ESMTPSA id r14-20020adff70e000000b002c567881dbcsm1845287wrp.48.2023.02.25.05.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 05:53:52 -0800 (PST) From: Tanzeel-inline To: olivier.matz@6wind.com, thomas@monjalon.net, tanzeelahmed713@gmail.com Cc: dev@dpdk.org, Tanzeel Ahmed Subject: [PATCH v4] lib/net: add MPLS insert and strip functionality Date: Sat, 25 Feb 2023 18:53:43 +0500 Message-Id: <20230225135343.262-1-tanxeel1.ahmed@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230219224334.309-1-tanxeel1.ahmed@gmail.com> References: <20230219224334.309-1-tanxeel1.ahmed@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Tanzeel Ahmed This patch is new version of [PATCH] lib/net: added push MPLS header API. I have also added the MPLS strip functionality to address the question asked in last patch. > You should explain why you add this function. None of the foundational NICs currently supports MPLS insertion and stripping, this functionality can help users who rely on MPLS in their network application. > I'm not sure it should be inline I did for performance in high-traffic application. Signed-off-by: Tanzeel Ahmed --- v4: * Removed extra void cast. * rte_pktmbuf_append/mtod now return void*. The memmove result is casted to rte_ether_hdr*. v3: * fixed patch check failure issue v2: * marked experimental * coding style fixed * changed rte_memcpy to memcpy * mpls header marked as const in parameter * added MPLS stripping functionality --- .mailmap | 1 + lib/net/rte_mpls.h | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/.mailmap b/.mailmap index a9f4f28..2af4e0d 100644 --- a/.mailmap +++ b/.mailmap @@ -1312,6 +1312,7 @@ Takeshi Yoshimura Takuya Asada Tal Avraham Tal Shnaiderman +Tanzeel Ahmed Tao Y Yang Tao Zhu Taripin Samuel diff --git a/lib/net/rte_mpls.h b/lib/net/rte_mpls.h index 51523e7..d7e267f 100644 --- a/lib/net/rte_mpls.h +++ b/lib/net/rte_mpls.h @@ -13,6 +13,8 @@ #include #include +#include +#include #ifdef __cplusplus extern "C" { @@ -36,6 +38,101 @@ struct rte_mpls_hdr { uint8_t ttl; /**< Time to live. */ } __rte_packed; +#define RTE_MPLS_HLEN 4 /**< Length of MPLS header. */ + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Insert MPLS header into the packet. + * If it's first MPLS header to be inserted in the packet, + * - Updates the ether type. + * - Sets the MPLS bottom-of-stack bit to 1. + * + * @param m + * The pointer to the mbuf. + * @param mp + * The pointer to the MPLS header. + * @return + * 0 on success, -1 on error + */ +__rte_experimental +static inline int +rte_mpls_push_over_l2(struct rte_mbuf **m, const struct rte_mpls_hdr *mp) +{ + void *os, *ns; + struct rte_ether_hdr *nh; + struct rte_mpls_hdr *mph; + + /* Can't insert header if mbuf is shared */ + if (!RTE_MBUF_DIRECT(*m) || rte_mbuf_refcnt_read(*m) > 1) + return -EINVAL; + + /* Can't insert header if ethernet frame doesn't exist */ + if (rte_pktmbuf_data_len(*m) < RTE_ETHER_HDR_LEN) + return -EINVAL; + + os = rte_pktmbuf_mtod(*m, void *); + ns = (void *)rte_pktmbuf_prepend(*m, sizeof(struct rte_mpls_hdr)); + if (ns == NULL) + return -ENOSPC; + + nh = (struct rte_ether_hdr *)memmove(ns, os, RTE_ETHER_HDR_LEN); + + /* Copy the MPLS header after ethernet frame */ + mph = rte_pktmbuf_mtod_offset(*m, struct rte_mpls_hdr*, + sizeof(struct rte_ether_hdr)); + memcpy(mph, mp, RTE_MPLS_HLEN); + + mph->tag_msb = rte_cpu_to_be_16(mp->tag_msb); + + /* If first MPLS header, update ether type and bottom-of-stack bit */ + if (nh->ether_type != rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS)) { + nh->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS); + mph->bs = 1; + } else { + mph->bs = 0; + } + + return 0; +} + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Strips MPLS from the packet. Doesn't update the ether type + * + * @param m + * The pointer to the mbuf. + * @return + * 0 on success, -1 on error + */ +__rte_experimental +static inline int +rte_mpls_strip_over_l2(struct rte_mbuf *m) +{ + struct rte_ether_hdr *eh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); + struct rte_mpls_hdr *mph; + bool mpls_exist = true; + + if (eh->ether_type != rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS)) + return -1; + + /* Stripping all MPLS header */ + while (mpls_exist) { + mph = rte_pktmbuf_mtod_offset(m, struct rte_mpls_hdr*, + sizeof(struct rte_ether_hdr)); + if (mph->bs & 1) + mpls_exist = false; + memmove(rte_pktmbuf_adj(m, sizeof(struct rte_mpls_hdr)), + eh, sizeof(struct rte_ether_hdr)); + eh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); + } + + return 0; +} + #ifdef __cplusplus } #endif -- 1.8.3.1