From patchwork Fri Nov 8 16:47:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 62797 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5E475A04B4; Fri, 8 Nov 2019 17:47:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 77C841C2B9; Fri, 8 Nov 2019 17:47:30 +0100 (CET) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id B75061C2AC for ; Fri, 8 Nov 2019 17:47:28 +0100 (CET) Received: by mail-pg1-f195.google.com with SMTP id h4so4296082pgv.8 for ; Fri, 08 Nov 2019 08:47:28 -0800 (PST) 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=xxWH+EM140Zq/gOAgATXqCwnx95VCzkKgSlZISbiRJM=; b=BsWwWZpfiNK56BHXnnDTy0/SZAmGcsNTf8Ek2Ryz/NihrZQN7TzgwC75F2kQ2zHe2z j2GqvoHleluJI9pZtOhPf7Fxxzn+hvqL4VzTzQjXZtlw9dRx3icNzHZ9V9I0EN9sKRWn 9Kd5trMMUyB1N4Honbu8nb/cj8fEC1sDuHApdd1FZbf/h91hQd9n/OCIh7MZgBadxFp0 j+tGWePW/I9/1vWwBT/V5AS2XA7nJJxTROzQUYH9BqmNasjGkkL9HaTLK++N9bbfFddq qKcatANS57Quqy35jdISAsMS4VTdZUGb7atlG5A5GPUq7fi8jryV0OwsfbjWpdP+nKWc viBg== 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=xxWH+EM140Zq/gOAgATXqCwnx95VCzkKgSlZISbiRJM=; b=ddH3QGkJRyJCyCFD8HV5Oi+2WouUME88wJC/AQStbi0GKfAIpXGQ1VcQn3dm+jUEt+ dN8M67EdlsC1OMXNVJyTYd2Kw1SW3ogpLL1X1OB1XgpAUag0fUobwHFYMgqoy3Q7cdfm Orjmd8B/N0CAparjb1cTe8TYJ+YbbWXzWeMD6j1tycVqvvCv1k/whtJt5kOyZnjEYaZB k8QTHrz8N8iIZmug8jdnStUpRqeQnLU8q5O1GUItiR/8fz/CIiSlnifQI4iglHaOrx4h inuGjFwqYWmFWhgsuoa8VTDLBu/RT6nkdF/7Wfkp9A9kz4KHWpawYEWj+C2ZltG6nxfb tG0A== X-Gm-Message-State: APjAAAUhAsViCO9QypePPpBSjlu4ghZ3oUFy4I+N8/juA78rs+spguNj 7OW1VrmRYi7sK7g4+DYDlGrq9ptVM1ueLQ== X-Google-Smtp-Source: APXvYqytVeV8AR6bMl6DCDWxkhZaWzn/bjgsV13P/osJx4tIRi6LSepoZB/4r7k1nBu4PHBy3j5zwA== X-Received: by 2002:a63:d70f:: with SMTP id d15mr13388007pgg.424.1573231647349; Fri, 08 Nov 2019 08:47:27 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id y11sm8893045pfq.1.2019.11.08.08.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 08:47:26 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 8 Nov 2019 08:47:16 -0800 Message-Id: <20191108164717.7708-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108164717.7708-1-stephen@networkplumber.org> References: <20191108043818.27610-1-stephen@networkplumber.org> <20191108164717.7708-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/2] pdump: use new pktmbuf copy function 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" The rte_pktmbuf_copy handles varying size mbuf pools correctly. Signed-off-by: Stephen Hemminger --- lib/librte_pdump/rte_pdump.c | 69 +----------------------------------- 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c index ac94fea93656..7816c7254615 100644 --- a/lib/librte_pdump/rte_pdump.c +++ b/lib/librte_pdump/rte_pdump.c @@ -64,73 +64,6 @@ static struct pdump_rxtx_cbs { } rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT], tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; -static inline int -pdump_pktmbuf_copy_data(struct rte_mbuf *seg, const struct rte_mbuf *m) -{ - if (rte_pktmbuf_tailroom(seg) < m->data_len) { - RTE_LOG(ERR, PDUMP, - "User mempool: insufficient data_len of mbuf\n"); - return -EINVAL; - } - - seg->port = m->port; - seg->vlan_tci = m->vlan_tci; - seg->hash = m->hash; - seg->tx_offload = m->tx_offload; - seg->ol_flags = m->ol_flags; - seg->packet_type = m->packet_type; - seg->vlan_tci_outer = m->vlan_tci_outer; - seg->data_len = m->data_len; - seg->pkt_len = seg->data_len; - rte_memcpy(rte_pktmbuf_mtod(seg, void *), - rte_pktmbuf_mtod(m, void *), - rte_pktmbuf_data_len(seg)); - - return 0; -} - -static inline struct rte_mbuf * -pdump_pktmbuf_copy(struct rte_mbuf *m, struct rte_mempool *mp) -{ - struct rte_mbuf *m_dup, *seg, **prev; - uint32_t pktlen; - uint16_t nseg; - - m_dup = rte_pktmbuf_alloc(mp); - if (unlikely(m_dup == NULL)) - return NULL; - - seg = m_dup; - prev = &seg->next; - pktlen = m->pkt_len; - nseg = 0; - - do { - nseg++; - if (pdump_pktmbuf_copy_data(seg, m) < 0) { - if (seg != m_dup) - rte_pktmbuf_free_seg(seg); - rte_pktmbuf_free(m_dup); - return NULL; - } - *prev = seg; - prev = &seg->next; - } while ((m = m->next) != NULL && - (seg = rte_pktmbuf_alloc(mp)) != NULL); - - *prev = NULL; - m_dup->nb_segs = nseg; - m_dup->pkt_len = pktlen; - - /* Allocation of new indirect segment failed */ - if (unlikely(seg == NULL)) { - rte_pktmbuf_free(m_dup); - return NULL; - } - - __rte_mbuf_sanity_check(m_dup, 1); - return m_dup; -} static inline void pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params) @@ -148,7 +81,7 @@ pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params) ring = cbs->ring; mp = cbs->mp; for (i = 0; i < nb_pkts; i++) { - p = pdump_pktmbuf_copy(pkts[i], mp); + p = rte_pktmbuf_copy(pkts[i], mp, 0, UINT32_MAX); if (p) dup_bufs[d_pkts++] = p; }