From patchwork Fri Oct 4 21:47:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 60561 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B48B11C2EC; Fri, 4 Oct 2019 23:47:52 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 1577C1C2DE for ; Fri, 4 Oct 2019 23:47:50 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id i14so4458382pgt.11 for ; Fri, 04 Oct 2019 14:47:50 -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=Q4INw0jXclEiki3qquDLRi7spTdZl6ftU0aD9i1ySi8=; b=Td38DgTRx/bm0AJ/kHSq0/3gf8DTJhvDAp0UPv4Qi0a3c8Y7Oc+1FefTIlm951L0vn untY0FWvsmkkGmM87RdYrMFS5UpZ3RjSw3eazP9ul3o6ISDf2ijGWakr03NS9p2QLYfy g4BYocUHIqF5JGHwPgInRFX7+YgmwC6X9B/Oe5pm8HI3F1Hfgm1hXhYLQaB1seUmZ64J db/C9EoD2I64DRfk9IcVTfPkGwA+LUhbocZceIYN+AA32YZK3gGuq+dVZiG83ZGvtF0K hK7xCFE9ERBCSHmQPBOio4p4VbHiFqNmvQhP0zW28BREPiGePElzZO1kciytLhNUuize cLeg== 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=Q4INw0jXclEiki3qquDLRi7spTdZl6ftU0aD9i1ySi8=; b=OPN/h+LqTSe+EU8SSUAnajGUoJQbLa19uzBZ58EDZ0Q3L4+ck3VRW1OU3Nv/ZpDFQu Qzv/2w0iflc4r7gXWNschTpswxoN4S/aS9RrvnPEHPO6abSWNHHxS2pr3nEGy85YCTEj MVLQweS/g1oBwoGYOowe5BEskaqx9O5FsitUaVxZPTxx9UjMFQKGHG5625LWAGTtF2ph 95E7j+LgoyetIuD4jR0B1uPqdP76+7bWQeJfCJiYzNQRl7AVdXbu6Fvf2LMVy/MWRyyi kdAVdOQUePLq9sNsIMF2nNOxA+GPnDXnZlH96PtoQdQKVtTPeBOH32TahJ7GEgoGD+k4 iKqw== X-Gm-Message-State: APjAAAU3/LwkDP0+kyziJrZS/tomAsoTJMtIPrsmFyVLLJ3K/sJGmZhq kKeTi6X0l8tt3ov80Der9HUlh9C59gXRDg== X-Google-Smtp-Source: APXvYqzvGiRHS3eE78idOnyBcAdpOXkZDhhPrcsic8Kc9vMXuZFHL7rSN48BzNcMu7a5n8TS6XnllA== X-Received: by 2002:a63:487:: with SMTP id 129mr17869523pge.14.1570225669641; Fri, 04 Oct 2019 14:47:49 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q71sm6191355pjb.26.2019.10.04.14.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 14:47:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 4 Oct 2019 14:47:40 -0700 Message-Id: <20191004214743.24686-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004214743.24686-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191004214743.24686-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 1/4] mbuf: don't generate invalid mbuf in clone test 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 test for cloning changed mbuf would generate an mbuf whose length and segments were invalid. This would cause a crash if test was run with mbuf debugging enabled. Fixes: f1022aba76a5 ("app/test: rename mbuf variable") Signed-off-by: Stephen Hemminger --- app/test/test_mbuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 2a97afe2044a..aafad0cf6206 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -332,8 +332,11 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool) m->next = rte_pktmbuf_alloc(pktmbuf_pool); if (m->next == NULL) GOTO_FAIL("Next Pkt Null\n"); + m->nb_segs = 2; rte_pktmbuf_append(m->next, sizeof(uint32_t)); + m->pkt_len = 2 * sizeof(uint32_t); + data = rte_pktmbuf_mtod(m->next, unaligned_uint32_t *); *data = MAGIC_DATA; From patchwork Fri Oct 4 21:47:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 60562 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F35A11C2F2; Fri, 4 Oct 2019 23:47:54 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id A0E791C2E9 for ; Fri, 4 Oct 2019 23:47:52 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id p30so2409477pgl.2 for ; Fri, 04 Oct 2019 14:47:52 -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=GBnlB6HE4E1BFlysCOhAlSDaD0wf14GC+LLwu+S5Axw=; b=r1usrnjdb61jHweUUTw7NEREFvVogDXf7V4TREaOQ4Uq6AARShPNVqLnC44q7wluqd Jl8QL4e0tA0u9recUGTTyiqn31eRSc1r9/XRILiZ9qR/vFW69CakSiPhTMJE9Syw0M9o r1yAIUZ5ysFWDXKMz8agZcPOAY/b46X0wVKLx+5tiV+uXmw3aTReubtSusQ7dK/dQ4Ie Ix7CLMiG6XSkfPMTD5Q37p/ckskX+A/JWW0uz8hTokFIh/GOjrOpNpNkrXYTRz83aOpI 3dJ5QhGuwiCUxqet759Gs/lPVlcNwksDDpLwiAWa83fWmeiqY83vnxf+yQ+ZbbJsiux3 B85w== 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=GBnlB6HE4E1BFlysCOhAlSDaD0wf14GC+LLwu+S5Axw=; b=Jlj4n4orJQ+QB2eaa8i3DZRQ5wopYu5+9Wu2AOUIFv68Z98Gdsl25mgbmWHA+ZjrWU oFr9Wg+khDTVKnMoP30HndTdcZaQB3EVSU39xqet0hdLT/DbFxMNJpgBX1Kh5eq9mLy2 bnFfs6EdPbOGC2A3ni8TNKLNc6XrsJ4ToOuDJxqdOZ8z6YW9wdF3DrJlizktJ7jpn4xB D1sCvwckTGV2ARIKe9A18wq7jXIMN4FadteJB+C4cy+XzpARFWlUCOqG8STBRTR1clNh jcOd5IdwOEZBoYnIybzpXHpT1QeFsRmJu2T+0kbhOMo5WFtmeYNMl3A8CIH/hoHI9wdv k+Yw== X-Gm-Message-State: APjAAAW8HuDOxqU60VPAkxykkwnoLs7UyD58t/TZ94l9fzZouHBts5jB LsV5+bRKRNgQlMHqfFVSPwKX6PWxPoeKcA== X-Google-Smtp-Source: APXvYqz6clsgW7ZCBDfR7vzyWfnBquPxyZjKBBDh6OdIUGrIroZauiANhYVV633154sRDvPpnF95gw== X-Received: by 2002:a63:7b16:: with SMTP id w22mr17636511pgc.328.1570225671413; Fri, 04 Oct 2019 14:47:51 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q71sm6191355pjb.26.2019.10.04.14.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 14:47:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Date: Fri, 4 Oct 2019 14:47:41 -0700 Message-Id: <20191004214743.24686-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004214743.24686-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191004214743.24686-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 2/4] mbuf: delinline rte_pktmbuf_linearize 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 copy part of this function is too big to be put inline. The places it is used are only in special exception paths where a highly fragmented mbuf arrives at a device that can't handle it. Signed-off-by: Stephen Hemminger Acked-by: Andrew Rybchenko --- lib/librte_mbuf/rte_mbuf.c | 37 +++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 38 +++++----------------------- lib/librte_mbuf/rte_mbuf_version.map | 6 +++++ 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 37718d49c148..e2c661c97522 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -245,6 +245,43 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header, return 0; } +/* convert multi-segment mbuf to single mbuf */ +int +__rte_pktmbuf_linearize(struct rte_mbuf *mbuf) +{ + size_t seg_len, copy_len; + struct rte_mbuf *m; + struct rte_mbuf *m_next; + char *buffer; + + /* Extend first segment to the total packet length */ + copy_len = rte_pktmbuf_pkt_len(mbuf) - rte_pktmbuf_data_len(mbuf); + + if (unlikely(copy_len > rte_pktmbuf_tailroom(mbuf))) + return -1; + + buffer = rte_pktmbuf_mtod_offset(mbuf, char *, mbuf->data_len); + mbuf->data_len = (uint16_t)(mbuf->pkt_len); + + /* Append data from next segments to the first one */ + m = mbuf->next; + while (m != NULL) { + m_next = m->next; + + seg_len = rte_pktmbuf_data_len(m); + rte_memcpy(buffer, rte_pktmbuf_mtod(m, char *), seg_len); + buffer += seg_len; + + rte_pktmbuf_free_seg(m); + m = m_next; + } + + mbuf->next = NULL; + mbuf->nb_segs = 1; + + return 0; +} + /* 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 98225ec80bf1..bffda1c81fbd 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -2400,6 +2400,11 @@ rte_validate_tx_offload(const struct rte_mbuf *m) return 0; } +/** + * @internal used by rte_pktmbuf_linearize(). + */ +int __rte_pktmbuf_linearize(struct rte_mbuf *mbuf); + /** * Linearize data in mbuf. * @@ -2415,40 +2420,9 @@ rte_validate_tx_offload(const struct rte_mbuf *m) static inline int rte_pktmbuf_linearize(struct rte_mbuf *mbuf) { - size_t seg_len, copy_len; - struct rte_mbuf *m; - struct rte_mbuf *m_next; - char *buffer; - if (rte_pktmbuf_is_contiguous(mbuf)) return 0; - - /* Extend first segment to the total packet length */ - copy_len = rte_pktmbuf_pkt_len(mbuf) - rte_pktmbuf_data_len(mbuf); - - if (unlikely(copy_len > rte_pktmbuf_tailroom(mbuf))) - return -1; - - buffer = rte_pktmbuf_mtod_offset(mbuf, char *, mbuf->data_len); - mbuf->data_len = (uint16_t)(mbuf->pkt_len); - - /* Append data from next segments to the first one */ - m = mbuf->next; - while (m != NULL) { - m_next = m->next; - - seg_len = rte_pktmbuf_data_len(m); - rte_memcpy(buffer, rte_pktmbuf_mtod(m, char *), seg_len); - buffer += seg_len; - - rte_pktmbuf_free_seg(m); - m = m_next; - } - - mbuf->next = NULL; - mbuf->nb_segs = 1; - - return 0; + return __rte_pktmbuf_linearize(mbuf); } /** diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map index 2662a37bf674..4d0bc9772769 100644 --- a/lib/librte_mbuf/rte_mbuf_version.map +++ b/lib/librte_mbuf/rte_mbuf_version.map @@ -46,6 +46,12 @@ DPDK_18.08 { rte_pktmbuf_pool_create_by_ops; } DPDK_16.11; +DPDK_19.11 { + global: + + __rte_pktmbuf_linearize; +} DPDK_18.08; + EXPERIMENTAL { global: From patchwork Fri Oct 4 21:47:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 60563 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5BCE51C438; Fri, 4 Oct 2019 23:47:57 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 4EA041C2EE for ; Fri, 4 Oct 2019 23:47:54 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id q7so4460007pgi.12 for ; Fri, 04 Oct 2019 14:47:54 -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=zxcyCp/RJwDdLRu+ORBLRDdv/Ir5nLTZyoyCxr19E5Q=; b=eAI3frkOtNkqc+FX9VKvjeQIrtEKNLpljJOCSXEQo3VcXGPNPfzBs5CTorGuoyeoO/ AwdHfZz1RoPfY1Gl3NSoHzwOIN7QphTVDjWHtHVuvOYucj/qEy67YYiWpr0bmDrtjBuX Wn2pRjd58GviQZCExm24bL1+bet39nIraElk3zeETQq19bt58t0pEnRHtXVHaN55fY5X JXG56iFXqS5Mc4tdDIOsCxh9stPgjGHxsIyzkYN0RG8MMDUt7GXFf/V/9IyMkCefbqZ1 1tvE/RzWWM01lSO9ZHBaDaPA9IpNLapgc8UyWmh9xPk2OWDXq6YD78hugaylEuny+lwU r09A== 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=zxcyCp/RJwDdLRu+ORBLRDdv/Ir5nLTZyoyCxr19E5Q=; b=tyf5gvRiI0XS5QRqs2iZC+kYFQTGRdrRS7di5x4ahqCC2+yH6PGLzGNayWbu7ewEKI IqBODzvMJWdEgDEAIiTEHS2zHskix9osozbuSSvLCtYKCxSfWdoGqHgoDkEAoaFquZ3S GBvHh74JmJMUxrRViB49O1ObaQV04ZBlDdk6sZMah03khoG3HPcsn1o8hPQE9tEnsW14 BNDEQiXm72ihuCko71U/9052JxYu40I5jdJF9Bqo/Qys8jwxd8nN89jyKGdDFguLkELJ 8WRPdxiiA23nF5y0RhX9PlWvip2QM0i6G5IoUdzLVuufqCQeZTqYrELAiNNBztYbsJHQ eDVg== X-Gm-Message-State: APjAAAXxCb0+9Tbvs0TCBx5bSg9+kECsBPQ4bKvKV1u+90mFrmx7W5+4 PRuJvh/l+gdK1oMj6AUUi+PULsdCcsfcFw== X-Google-Smtp-Source: APXvYqxxZBqgHx/uzdjdVgXIFnUCKhxbjHKWYWcS70ibyZjn7Ln/osaIBRxfqrKrfIrM2EDvvu4gtw== X-Received: by 2002:a17:90a:fb85:: with SMTP id cp5mr19553110pjb.42.1570225673092; Fri, 04 Oct 2019 14:47:53 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q71sm6191355pjb.26.2019.10.04.14.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 14:47:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Date: Fri, 4 Oct 2019 14:47:42 -0700 Message-Id: <20191004214743.24686-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004214743.24686-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191004214743.24686-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 3/4] mbuf: deinline rte_pktmbuf_clone 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" Cloning mbufs requires allocations and iteration and therefore should not be an inline. Signed-off-by: Stephen Hemminger Acked-by: Andrew Rybchenko --- lib/librte_mbuf/rte_mbuf.c | 39 ++++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 38 ++------------------------- lib/librte_mbuf/rte_mbuf_version.map | 1 + 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index e2c661c97522..9a1a1b5f9468 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -245,6 +245,45 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header, return 0; } +/* Creates a shallow copy of mbuf */ +struct rte_mbuf * +rte_pktmbuf_clone(struct rte_mbuf *md, struct rte_mempool *mp) +{ + struct rte_mbuf *mc, *mi, **prev; + uint32_t pktlen; + uint16_t nseg; + + mc = rte_pktmbuf_alloc(mp); + if (unlikely(mc == NULL)) + return NULL; + + mi = mc; + prev = &mi->next; + pktlen = md->pkt_len; + nseg = 0; + + do { + nseg++; + rte_pktmbuf_attach(mi, md); + *prev = mi; + prev = &mi->next; + } while ((md = md->next) != NULL && + (mi = rte_pktmbuf_alloc(mp)) != NULL); + + *prev = NULL; + mc->nb_segs = nseg; + mc->pkt_len = pktlen; + + /* Allocation of new indirect segment failed */ + if (unlikely(mi == NULL)) { + rte_pktmbuf_free(mc); + return NULL; + } + + __rte_mbuf_sanity_check(mc, 1); + return mc; +} + /* convert multi-segment mbuf to single mbuf */ int __rte_pktmbuf_linearize(struct rte_mbuf *mbuf) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index bffda1c81fbd..6133f12172ae 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1924,42 +1924,8 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m) * - The pointer to the new "clone" mbuf on success. * - NULL if allocation fails. */ -static inline struct rte_mbuf *rte_pktmbuf_clone(struct rte_mbuf *md, - struct rte_mempool *mp) -{ - struct rte_mbuf *mc, *mi, **prev; - uint32_t pktlen; - uint16_t nseg; - - if (unlikely ((mc = rte_pktmbuf_alloc(mp)) == NULL)) - return NULL; - - mi = mc; - prev = &mi->next; - pktlen = md->pkt_len; - nseg = 0; - - do { - nseg++; - rte_pktmbuf_attach(mi, md); - *prev = mi; - prev = &mi->next; - } while ((md = md->next) != NULL && - (mi = rte_pktmbuf_alloc(mp)) != NULL); - - *prev = NULL; - mc->nb_segs = nseg; - mc->pkt_len = pktlen; - - /* Allocation of new indirect segment failed */ - if (unlikely (mi == NULL)) { - rte_pktmbuf_free(mc); - return NULL; - } - - __rte_mbuf_sanity_check(mc, 1); - return mc; -} +struct rte_mbuf * +rte_pktmbuf_clone(struct rte_mbuf *md, struct rte_mempool *mp); /** * 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 4d0bc9772769..ff5c18a5559b 100644 --- a/lib/librte_mbuf/rte_mbuf_version.map +++ b/lib/librte_mbuf/rte_mbuf_version.map @@ -50,6 +50,7 @@ DPDK_19.11 { global: __rte_pktmbuf_linearize; + rte_pktmbuf_clone; } DPDK_18.08; EXPERIMENTAL { From patchwork Fri Oct 4 21:47:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 60564 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17E9B1C435; Fri, 4 Oct 2019 23:47:59 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 60EAC1C433 for ; Fri, 4 Oct 2019 23:47:56 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id q12so4670898pff.9 for ; Fri, 04 Oct 2019 14:47:56 -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=L6dCrdpamwAtzqWE8QnS/8KT5Z5U75CZzPCVYebQ4Lo=; b=nBzp8YX9+aSozmZcX/HPf1VbV4aQTJci4LDVmmwzJppLQ5uwfZzU+k34GGVAhX3emY BZ/Xg/Kj3i45jFFlj1l976OhH8wdnhFjNLaoCHFlHr79yJgmj3kcQUnovxKO0F0nzJ0v LaZNX8QK7p+5udzUzW0Oe3Loju88Pc0h3mJY6f2BKwz01nsxPdUlNM/npnokYR4dWvA/ 23sGp9fnNsFNHRbs8GbkCKI40PG6xWfnfHFmU976Qh8YnfcUWmgar2FIZO5ohLsicJlU meVcQvAVhTq7A9YwwPuMwg9bJuNDFLKh2REFLfI8yWOmWU2uMIRxZ0Yb1UJsASPgbVax Zstw== 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=L6dCrdpamwAtzqWE8QnS/8KT5Z5U75CZzPCVYebQ4Lo=; b=Yofw9ssIxtIvhT47D9gDMKyX4iuGsjnEN5NtRp+4GavxRpLP/RrHtod4+yC06LGSZS DWqKtFXKMNaqTQwTZD+6RzNRlyEI1I7mhMwnCv/yKh+lAEoIYNPCFrXH/TICwFqUkJv9 Cdo5kojv230NnUj7iLfgELVhrLsrsdy3z8I+ML+X2YV/SQJZl5/rfdvV3QH/H4HOWzda dQFTKIVWPURhilLaA3cgN1RJfZ98056arQ0pQMBhcWTfXZgFGVQ7gNzvW84e6I4ED5HD Mhf2akHrqVZ9h5XKhuDlBjuKdcddlt/huJctZv6KU0JPtmr+y49IgIsP+jsx1YkQZN77 qiog== X-Gm-Message-State: APjAAAW8DrxLtgbtVMmsQ6QLbjlf0vdOzQNAwJJZ5WfrX8RdYqw76/j+ /H/2LydwQ/C24wbZYEFPjoX+JoADLEUVEQ== X-Google-Smtp-Source: APXvYqxGx1D7oHcdI4uZ/dFfaXFg0wm6t5be2Yvb99ZwgWx7N0xddHtD4HtnYqrvHOVqd6HndRQ6rg== X-Received: by 2002:a63:e001:: with SMTP id e1mr6531700pgh.358.1570225674806; Fri, 04 Oct 2019 14:47:54 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q71sm6191355pjb.26.2019.10.04.14.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 14:47:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 4 Oct 2019 14:47:43 -0700 Message-Id: <20191004214743.24686-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004214743.24686-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191004214743.24686-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 4/4] 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. This patch also introduces internal inline to copy the metadata fields of mbuf. Signed-off-by: Stephen Hemminger --- lib/librte_mbuf/rte_mbuf.c | 69 ++++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 53 +++++++++++++++++---- lib/librte_mbuf/rte_mbuf_version.map | 1 + 3 files changed, 113 insertions(+), 10 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 9a1a1b5f9468..d5c9488fa213 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -321,6 +321,75 @@ __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; + uint16_t priv_size; + + 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; + + __rte_pktmbuf_copy_hdr(mc, m); + + /* copy private area (can be 0) */ + priv_size = RTE_MIN(rte_pktmbuf_priv_size(mp), + rte_pktmbuf_priv_size(m->pool)); + rte_memcpy(mc + 1, m + 1, priv_size); + + 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..803ddf28496e 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1684,6 +1684,19 @@ rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, */ #define rte_pktmbuf_detach_extbuf(m) rte_pktmbuf_detach(m) +/* internal */ +static inline void +__rte_pktmbuf_copy_hdr(struct rte_mbuf *mi, const struct rte_mbuf *m) +{ + mi->port = m->port; + mi->vlan_tci = m->vlan_tci; + mi->vlan_tci_outer = m->vlan_tci_outer; + mi->tx_offload = m->tx_offload; + mi->hash = m->hash; + mi->packet_type = m->packet_type; + mi->timestamp = m->timestamp; +} + /** * Attach packet mbuf to another packet mbuf. * @@ -1721,23 +1734,17 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m) mi->ol_flags = m->ol_flags | IND_ATTACHED_MBUF; } - mi->buf_iova = m->buf_iova; - mi->buf_addr = m->buf_addr; - mi->buf_len = m->buf_len; + __rte_pktmbuf_copy_hdr(mi, m); mi->data_off = m->data_off; mi->data_len = m->data_len; - mi->port = m->port; - mi->vlan_tci = m->vlan_tci; - mi->vlan_tci_outer = m->vlan_tci_outer; - mi->tx_offload = m->tx_offload; - mi->hash = m->hash; + mi->buf_iova = m->buf_iova; + mi->buf_addr = m->buf_addr; + mi->buf_len = m->buf_len; mi->next = NULL; mi->pkt_len = mi->data_len; mi->nb_segs = 1; - mi->packet_type = m->packet_type; - mi->timestamp = m->timestamp; __rte_mbuf_sanity_check(mi, 1); __rte_mbuf_sanity_check(m, 0); @@ -1927,6 +1934,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;