From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE62EA2EDB for ; Mon, 30 Sep 2019 21:21:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD5DA1BEA5; Mon, 30 Sep 2019 21:21:13 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 460BC1BE81 for ; Mon, 30 Sep 2019 21:21:06 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id 205so6156766pfw.2 for ; Mon, 30 Sep 2019 12:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gtm1zzy1GlSRdxte2W0/vd1Jy7ccpq73UopKgcsU4nI=; b=TPYehffRMmWBHFn1Ypvvc9RTZ7wtmK9EYCLaLZNcNo+IfaZE7C3rmo0H1epvUI2hWj S9MXV6WjS7owUtFfGK9cdmn/Wxvb2uAVCsE748XHMscnJ/9zU96Z4BTjNttspx5SnDY8 16KArChiBA6xdcFbzC4qG0Ea7vJ5HEebwU/q/zCB0bbmr8ZjGy8fxKZljH3QGMvDXkFy d71R5HLrK1kgA8It56t9us0lcyN5hPBIUD/s+ngMuB6+WoCAwq4H6JKu/9YZx3V+Hd31 9u2bYyNeN5prymrOT2GjyormY4UsM3gRKrfScPc3CIfgo7ZBPpxPjkWtV27zS3VfWogI sTNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gtm1zzy1GlSRdxte2W0/vd1Jy7ccpq73UopKgcsU4nI=; b=sjFadNF2gjkZcOJtGq+37INeCtfmE0Mwty6WE+HiNIZhkowVR2+9Kv0RgHFyFHqmNk jKhGYvfw6SsJM9k8u06ug8LnCY9koyZs8kBRE5aGzkbvLMhtMocoPmF9cy8ecGfqMXHZ /WmGkVBGk8YmeLkvpOxhMM7VoPvamEKz/MR3lSqvxFLCRit+HtWim1FTIGWVMtGLCmsI N9TVszfOO21kdbs85scZFbB6Wnrq0r8PIRHigdtK4BrIQHDgIQRZ5o13kgZTMPl2F/cg 4PAeNlMRV0HwtDY0N3jAsjW1tSpPjcEIZufLZf4aEh5JN6otj4B0xkIhvG/FHIi+hi3E 5eMg== X-Gm-Message-State: APjAAAU5G8FtdtU2y/oRrhCw2ibEih8FBdQAlKIKL83aY8ibuJsGUx7T TR6uA00AOEXZ+zpY4K8Ns9tj7MGvprAUtw== X-Google-Smtp-Source: APXvYqy+lFFTtLxoA5PaHZr443gCeMjfts95owjFwtc/V/CDvOyHsdICJvDT/nzE5M8HLgLksvJ++w== X-Received: by 2002:a62:aa0f:: with SMTP id e15mr22580834pff.160.1569871265033; Mon, 30 Sep 2019 12:21:05 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id c64sm14788304pfc.19.2019.09.30.12.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 12:21:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 30 Sep 2019 12:20:54 -0700 Message-Id: <20190930192056.26828-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190930192056.26828-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20190930192056.26828-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 4/6] mbuf: add a pktmbuf copy routine 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" This is a commonly used operation that surprisingly the DPDK has not supported. The new rte_pktmbuf_copy does a deep copy of packet. This is a complete copy including meta-data. It handles the case where the source mbuf comes from a pool with larger data area than the destination pool. The routine also has options for skipping data, or truncating at a fixed length. Signed-off-by: Stephen Hemminger --- lib/librte_mbuf/rte_mbuf.c | 74 ++++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 26 ++++++++++ lib/librte_mbuf/rte_mbuf_version.map | 1 + 3 files changed, 101 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 9a1a1b5f9468..901df0192d2e 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -321,6 +321,80 @@ __rte_pktmbuf_linearize(struct rte_mbuf *mbuf) return 0; } +/* Create a deep copy of mbuf */ +struct rte_mbuf * +rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp, + uint32_t off, uint32_t len) +{ + const struct rte_mbuf *seg = m; + struct rte_mbuf *mc, *m_last, **prev; + + if (unlikely(off >= m->pkt_len)) + return NULL; + + mc = rte_pktmbuf_alloc(mp); + if (unlikely(mc == NULL)) + return NULL; + + if (len > m->pkt_len - off) + len = m->pkt_len - off; + + /* clone meta data from original */ + mc->port = m->port; + mc->vlan_tci = m->vlan_tci; + mc->vlan_tci_outer = m->vlan_tci_outer; + mc->tx_offload = m->tx_offload; + mc->hash = m->hash; + mc->packet_type = m->packet_type; + mc->timestamp = m->timestamp; + + /* copy private data (if any) */ + rte_memcpy(mc + 1, m + 1, + rte_pktmbuf_priv_size(mp)); + + prev = &mc->next; + m_last = mc; + while (len > 0) { + uint32_t copy_len; + + while (off >= seg->data_len) { + off -= seg->data_len; + seg = seg->next; + } + + /* current buffer is full, chain a new one */ + if (rte_pktmbuf_tailroom(m_last) == 0) { + m_last = rte_pktmbuf_alloc(mp); + if (unlikely(m_last == NULL)) { + rte_pktmbuf_free(mc); + return NULL; + } + ++mc->nb_segs; + *prev = m_last; + prev = &m_last->next; + } + + copy_len = RTE_MIN(seg->data_len - off, len); + if (copy_len > rte_pktmbuf_tailroom(m_last)) + copy_len = rte_pktmbuf_tailroom(m_last); + + /* append from seg to m_last */ + rte_memcpy(rte_pktmbuf_mtod_offset(m_last, char *, + m_last->data_len), + rte_pktmbuf_mtod_offset(seg, char *, + off), + copy_len); + + m_last->data_len += copy_len; + mc->pkt_len += copy_len; + off += copy_len; + len -= copy_len; + } + + __rte_mbuf_sanity_check(mc, 1); + return mc; +} + /* dump a mbuf on console */ void rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 6133f12172ae..b860d570ef20 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1927,6 +1927,32 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m) struct rte_mbuf * rte_pktmbuf_clone(struct rte_mbuf *md, struct rte_mempool *mp); +/** + * Creates a full copy of a given packet mbuf. + * + * Copies all the data from a given packet mbuf to a newly allocated + * set of mbufs. + * + * @param m + * The packet mbuf to be cloned. + * @param mp + * The mempool from which the "clone" mbufs are allocated. + * @param offset + * The number of bytes to skip before copying. + * If the mbuf does not have that many bytes, it is an error + * and NULL is returned. + * @param length + * The upper limit on bytes to copy. Passing UINT32_MAX + * means all data (after offset). + * @return + * - The pointer to the new "clone" mbuf on success. + * - NULL if allocation fails. + */ +__rte_experimental +struct rte_mbuf * +rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp, + uint32_t offset, uint32_t length); + /** * Adds given value to the refcnt of all packet mbuf segments. * diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map index ff5c18a5559b..a50dcb6db9ec 100644 --- a/lib/librte_mbuf/rte_mbuf_version.map +++ b/lib/librte_mbuf/rte_mbuf_version.map @@ -57,4 +57,5 @@ EXPERIMENTAL { global: rte_mbuf_check; + rte_pktmbuf_copy; } DPDK_18.08; -- 2.20.1