From patchwork Mon Oct 7 15:43:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 60625 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 C940D1C1C6; Mon, 7 Oct 2019 17:43:56 +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 1E8D81C12E for ; Mon, 7 Oct 2019 17:43:53 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id 205so8928171pfw.2 for ; Mon, 07 Oct 2019 08:43:53 -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=w39jcvWnhb75zw/m6b761+fDHyUtt2tSg/AXwTsyUXAit3tLZKVx/6YgLJGh6v8K/O DgKZ7oL4+nHM2C+zlJjQ0halP8s50XgxVSaZ5cmamVJS0Nv5BBoNUxR92/oeKO1WasTu UXrLsbB1LzptcSvOSyL0X1UNOjpsZBHpR3NsQkOKQAOYaiqFHaU6DeyNwcYnb+r0IyWr 0O7z1ccMEyAYRf/aZQ18TFG7DesjjAXGBIJdgUFRJdrWTg0KCPtSIzaBadxtXzdfvFCr sPOWY8WAjqalA/YU1seam+fhOFrGGxAA0Q30mUDR0pOdLFzeuiY7uSTMQZ0arL1dIAng KVYw== 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=Fxlbr51zs619bh6yjn9dTQuUutBhVIZ21WoVKj75NdE2Zfclt1qsnGqDdLXqSG7eaS TXEKPJQ10adUT/jnCXmKT33ZhzgjnGPNbFfOmxw4D7vone60U7YXhDLgVU7hLr4A+1lC zcmrhpGTrCDjdeEVDNtVtqopXe/sIeroCpAb0D0JOdA5BIdd2MsjHdI+MY6nxbqWSxhs ysCTqup9iYclPyGFl5G2sK5Dh51r6K6kPSPTdTDMf3slrDUO60N3uZw9oZi181mL+kz0 86gcon25bqQq9GLkwfeUSV3VbXqAW4xxPMSUUvIVr2jgXTixHU6+8tyUSoTKtxV4Gm+i 3MLg== X-Gm-Message-State: APjAAAWolechHlCiqv2B1K1LyR4PH3jlIz2rZKG9Yt+IdRsdcvOQpiSs cuB+M44/AlKf1Wjyzx5uthwyW6eElt6kmg== X-Google-Smtp-Source: APXvYqxtUEz1IAlESN02whKzbn4S7WKkYYXZHJPee+BSamaQaQDzDYg6H4OPqALlzLgqSP0XjDp3xQ== X-Received: by 2002:a17:90a:ad81:: with SMTP id s1mr34972529pjq.27.1570463031798; Mon, 07 Oct 2019 08:43:51 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k5sm20779345pfp.109.2019.10.07.08.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 08:43:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 7 Oct 2019 08:43:39 -0700 Message-Id: <20191007154343.8556-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191007154343.8556-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191007154343.8556-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 1/5] 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 Acked-by: Olivier Matz --- 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 Mon Oct 7 15:43: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: 60626 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 68E641C1F8; Mon, 7 Oct 2019 17:43:59 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id ACCE41C1C3 for ; Mon, 7 Oct 2019 17:43:54 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id d26so8449300pgl.7 for ; Mon, 07 Oct 2019 08:43: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=GBnlB6HE4E1BFlysCOhAlSDaD0wf14GC+LLwu+S5Axw=; b=CpjYU4SBhIc8K+UDywy/k8cBUWhZQho2tWWs49bLhJdkjYi79WySMDe8hN7t5Di3ee ggChoAcF/ZdTXnFtixrzqH+Exm4kQcxCMLmDdFSb3yl6wshN8w28UTJgl4bH/AXfEzCE Df2VtOPHp/VjJfIJLUPaCAHsyWaoi/bCLvMViLa2Ue6enteXO/xmH7fS1chDkPZZ12zV o4t2FKpJXrJP8cn16qvk/MULP+sUt3/tkfEVWCCWbciiS408qKIteUsO49UJ3XRk1vh8 utBWkiaZGfHhhwY5OIvFMIK5Ev6KBOBDLEwjktrzOzoppYfpWC232LRq9AJ2AX+YY5qV YreQ== 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=Yl4mZpquPC0xrVRwV5A0cZBb9MBmVgvUWrzYZNDZxEjlKJrnlrUsO0MDY8KfMeY/xW B0Yx6UOBJks+Se6o+FEkrxap8QpS4nVPNu8OblLheor0UcKOzmFnHuT/ZThsOjkB1NvB rNK8IfPNeJgnQFsaxSyXlnw5+Aka4bScuLgGYRGTMw138hfsIyK9fDj+6UHO5OW/iRef K4PcQNsi/dtul8aKa+3L+XjJ/2+Z4ztqSt5Why7gL+iFNJNXYUhgADjT1k+R/HXIbIH+ jWeZhSNfSPsh6FondaYWHAdYGMhcHTy8Re2fDSuKedodXeddklV2e7cCsFs8RBv3MmH4 44oA== X-Gm-Message-State: APjAAAXevfam0Jb8fyYZn3f3RReq/mnS6n+olQXrpd5GiT9uNmyIKIHz htTMaRkvNdqyWRvNr1qV2+f6m1ffi+DkBQ== X-Google-Smtp-Source: APXvYqw4Hm+VsPnnrUaOAzjNtz9f/iNVqJwlY2/jKS/AkegWIP3tcZ384gAMiG4cZ8p6GsF7r9Myug== X-Received: by 2002:a63:500e:: with SMTP id e14mr30950091pgb.176.1570463033251; Mon, 07 Oct 2019 08:43:53 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k5sm20779345pfp.109.2019.10.07.08.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 08:43:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Date: Mon, 7 Oct 2019 08:43:40 -0700 Message-Id: <20191007154343.8556-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191007154343.8556-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191007154343.8556-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 2/5] 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 Acked-by: Olivier Matz --- 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 Mon Oct 7 15:43: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: 60627 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 5309F1C29D; Mon, 7 Oct 2019 17:44:01 +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 EFB381C1C6 for ; Mon, 7 Oct 2019 17:43:55 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id e1so8450980pgj.6 for ; Mon, 07 Oct 2019 08:43:55 -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=UW2Q8BMSu302YJMIJqQw/LN+tjqUhFqQCW9wYr2K/ZlujztUktMFseegtv8n9Wp8iq SfpW1QJSRIEtn0YhAkVMzLBbFlpCTS6CQK03QywmyiqmEIkWCkuZmHDp4yjgtEr/Rub+ LnCGfeoBTSP+Am1KfvU+7E9OLZ/uZXCd/y0kx+ltTr4tjlbXCcn8AUIVCGyfUDTgLxpq CCKmh1U2LsmlwNv2FiRPKFbNw/Sr3TDkb6tp1dfCPRxwW3b0wUw+FmNFuMTF+uDItSOR N65mMdoO+DpOIDNysWu3l9gJwqZEfDHDmkxcSZ9YcpnbM9gTYd5TI5kEiotBS5Y2Rx1Z Mi/g== 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=aW47qldgoAsEjF5RQDTaTBt/D973VBD3DzsgbfJUdl2DYEz2m9hWTrpvQWQtUo1KHQ zmKv3A9CUpwLhHV9DOOjdctisNpfvCRbhwjdMKcJVJDS1rMJTJMsPan1QBfLmwigEpau 5aahpRBZFkTs4zj3PANASxsQDxeSKYr5Nrk8YQMkQbZyN0o8+7aSL7X62hhnGL9i0Wcs fp+6C2oXntDLo1xIFb3Pzo7HpxOk6IpIS4dZYCvBCkET34djX/l2Vl/wtQDgr7GoiJQZ KFbJollFMmMCw+fc20Lib1a8Wn0tGg6g7OzrZAsxoGXKdO3dUNHYy80nYT/D9Auhw7U6 jfZA== X-Gm-Message-State: APjAAAWXV3UdYAjnnbr/2DJ0f9ZHgrBPmwUcaTsPg/CauZFT+7o9teAd fIwbIBYrCzAyclRtsUorPyuJTGt/nGYcWQ== X-Google-Smtp-Source: APXvYqw8qx4zQ6E8dUT5ZLNWlxIuQkVDnTYnblbCNBrsjFBjfX/57FwWPbWTvd/sx0vNam+mg3Ibeg== X-Received: by 2002:a63:fc60:: with SMTP id r32mr17205297pgk.160.1570463034747; Mon, 07 Oct 2019 08:43:54 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k5sm20779345pfp.109.2019.10.07.08.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 08:43:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Date: Mon, 7 Oct 2019 08:43:41 -0700 Message-Id: <20191007154343.8556-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191007154343.8556-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191007154343.8556-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 3/5] 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 Acked-by: Olivier Matz --- 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 Mon Oct 7 15:43: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: 60628 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 00BE51C2A3; Mon, 7 Oct 2019 17:44:03 +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 76A7D1C1D2 for ; Mon, 7 Oct 2019 17:43:57 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id d26so8449369pgl.7 for ; Mon, 07 Oct 2019 08:43:57 -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=U99ZZRmMZhCT4iPLREs+iP++KxUv99XaKFo+9LOgmOm2OQkgWWRWD3A/wqRSUs91xh jYc+Mv/06y5R9xIAZmfyjMV0ESYngFP2LSFCVo2OczGlF6TNjbKtb+SGAe7M3MAPtlcF LVTiPP+snL5yoYhnTbeO8ED0dQfCJj39eYPumK8Y6+p2E7c7oOOxFwr1OUilXT2OXqpU wzHvmw4LaWkhRYA4v8WgIf/ACl19tAWM+TM2iFYPasxAD34JtOCPYpV3wZOzmEFEIwfx WsLAVl6sXV/L5Z26lnOEyr4+sma66BoRYmHj5vACkz4427CGUwTVmyq5NEqaBJvVmWHZ gDdw== 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=CKCH+4qmZkAVNpwtKaQoWhWPQV4KmaL2YGq4JAwpYJ0sHxAg9j2JEdHVUrs9th6Nq2 LKXPiaLlVV5hpmT7eKo+SLteu3ZXERX0oI7BydydAJOoAa/R1FTVt5kN3Sfr/H5PoN/A oJdDgQCt+YX5XLi50Cr+UKpEWeVd/S+iGWyJKk+N+eeyeE3fX3i68wz+9M5+4YYYk6i0 MPFmrSFEJsXLS+S+lhSMcYZn9XkEAuiElMR1muHAkVz+31GVq+Xdb1txh3gxifZZzSgU LyL5ZCnZaiRsdQ4dV04ZuliZHLc2VORn77dLtNNNHwXBqKRf917L0+fvjVA3cYY7kmGa 0pVw== X-Gm-Message-State: APjAAAVDeew3VDakgjJ9oaQDNJVxfcdjgDL36RYG6zVrIe2cYzXcUeAc qihPZgvJkadKttxj3FpzskKTOvwPiqs/Ag== X-Google-Smtp-Source: APXvYqxkXwXr+7pWMS7/0h1Kw85xHOM8OOByRvtevWts6JcqZKL0chWDmvIiPNzGFU4mnewm+dGqZg== X-Received: by 2002:a65:6644:: with SMTP id z4mr4940236pgv.208.1570463036253; Mon, 07 Oct 2019 08:43:56 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k5sm20779345pfp.109.2019.10.07.08.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 08:43:55 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 7 Oct 2019 08:43:42 -0700 Message-Id: <20191007154343.8556-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191007154343.8556-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191007154343.8556-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 4/5] 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; From patchwork Mon Oct 7 15:43: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: 60629 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 F0E071C43E; Mon, 7 Oct 2019 17:44:04 +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 CF4F31C1F8 for ; Mon, 7 Oct 2019 17:43:58 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id y72so8873649pfb.12 for ; Mon, 07 Oct 2019 08:43:58 -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=hnJVNme230AHorC9MqsxxOvVRW7V8JTUGHH+CXxU7nQ=; b=DfqksnP82UmaAp2xMelex1CZXFaaPqFBYz/0DCqP5hWij7hFx9jE1nxzbtzAZaRb3t PVQh3kIswAmp+uL9QEdDzo+Ysy8dDSDvWK/hGKv9zk/ersjWYZHu4NgxmvBONw49mIWc +ZsYkDz0DTpffwZaaqzrBum3d2sLKtlyWSIOgFndxaeFkMOHbYOdQjXNXuVb+6T+nKdc DpqFTDKaW/Ad2JKc7sJDbovTCmMBrb5XWnqYvayLBwKVMf2OycaUlYRFaYJptqbtYCn2 5Fl1XofiyAVUaPuClJ4e6tvxeHYfC91LdYhC/el/ChN7vef2VhsdVAR3SHQ88/mbrnCy 16UA== 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=hnJVNme230AHorC9MqsxxOvVRW7V8JTUGHH+CXxU7nQ=; b=Lr1etXh8K+Bz2PnzIzNNa12C05R+GcrJL9b0sVOxWFLYG+Hke8fKY1l3cZPedCS7D3 snLOjxGSGP+5Mew/aYGll10rAFFecA5JPZYMwnQkNbriCT2Vaec594Yndas4McL3Wh+Y Wgoh3J5hl3qLeI+bcVxGQ8KWTYK7VVaoyWcm7Qrga2LyT/voTinDbJ5epzYLFRG5mqaK xxitpPm9DpJCnfFBdjQ0Rny6YfFaczboCIXH3AfpHQI42Wn3q74/k0opdoyzV+Q8cz93 o/xGwdtWl3y8IYw8qgggwr2e9SG9gTmDyBBRfoo/l4/Xy4vHKtrHDL7AtNhG+xzCp/zH qvlg== X-Gm-Message-State: APjAAAVxtXApB8boOH1XoyCUN3cjJJpcMuKm/xNSzf5a0lnsrH6Bng0z YtYbePL33JeOmH2sNPl2wPimLg2JaECGxQ== X-Google-Smtp-Source: APXvYqxd/d3b5I+RjoxZQS7yCGsKJhiHEZ9MLsB8IAB4jD7ZfhvM03A1IrW9mDfi0GrlSPKqFpPYpw== X-Received: by 2002:a63:2a08:: with SMTP id q8mr31894764pgq.421.1570463037734; Mon, 07 Oct 2019 08:43:57 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k5sm20779345pfp.109.2019.10.07.08.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 08:43:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 7 Oct 2019 08:43:43 -0700 Message-Id: <20191007154343.8556-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191007154343.8556-1-stephen@networkplumber.org> References: <20190928003758.18489-1-stephen@networkplumber.org> <20191007154343.8556-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 5/5] mbuf: add pktmbuf copy 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" New test for rte_pktmbuf_copy based of the clone tests. Signed-off-by: Stephen Hemminger Acked-by: Olivier Matz --- app/test/test_mbuf.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index aafad0cf6206..49c3a5f7893c 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -399,6 +399,127 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool) return -1; } +static int +test_pktmbuf_copy(struct rte_mempool *pktmbuf_pool) +{ + struct rte_mbuf *m = NULL; + struct rte_mbuf *copy = NULL; + struct rte_mbuf *copy2 = NULL; + unaligned_uint32_t *data; + + /* alloc a mbuf */ + m = rte_pktmbuf_alloc(pktmbuf_pool); + if (m == NULL) + GOTO_FAIL("ooops not allocating mbuf"); + + if (rte_pktmbuf_pkt_len(m) != 0) + GOTO_FAIL("Bad length"); + + rte_pktmbuf_append(m, sizeof(uint32_t)); + data = rte_pktmbuf_mtod(m, unaligned_uint32_t *); + *data = MAGIC_DATA; + + /* copy the allocated mbuf */ + copy = rte_pktmbuf_copy(m, pktmbuf_pool, 0, UINT32_MAX); + if (copy == NULL) + GOTO_FAIL("cannot copy data\n"); + + if (rte_pktmbuf_pkt_len(copy) != sizeof(uint32_t)) + GOTO_FAIL("copy length incorrect\n"); + + if (rte_pktmbuf_data_len(copy) != sizeof(uint32_t)) + GOTO_FAIL("copy data length incorrect\n"); + + data = rte_pktmbuf_mtod(copy, unaligned_uint32_t *); + if (*data != MAGIC_DATA) + GOTO_FAIL("invalid data in copy\n"); + + /* free the copy */ + rte_pktmbuf_free(copy); + copy = NULL; + + /* same test with a chained mbuf */ + 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 + 1; + + copy = rte_pktmbuf_copy(m, pktmbuf_pool, 0, UINT32_MAX); + if (copy == NULL) + GOTO_FAIL("cannot copy data\n"); + + if (rte_pktmbuf_pkt_len(copy) != 2 * sizeof(uint32_t)) + GOTO_FAIL("chain copy length incorrect\n"); + + if (rte_pktmbuf_data_len(copy) != 2 * sizeof(uint32_t)) + GOTO_FAIL("chain copy data length incorrect\n"); + + data = rte_pktmbuf_mtod(copy, unaligned_uint32_t *); + if (data[0] != MAGIC_DATA || data[1] != MAGIC_DATA + 1) + GOTO_FAIL("invalid data in copy\n"); + + rte_pktmbuf_free(copy2); + + /* test offset copy */ + copy2 = rte_pktmbuf_copy(copy, pktmbuf_pool, + sizeof(uint32_t), UINT32_MAX); + if (copy2 == NULL) + GOTO_FAIL("cannot copy the copy\n"); + + if (rte_pktmbuf_pkt_len(copy2) != sizeof(uint32_t)) + GOTO_FAIL("copy with offset, length incorrect\n"); + + if (rte_pktmbuf_data_len(copy2) != sizeof(uint32_t)) + GOTO_FAIL("copy with offset, data length incorrect\n"); + + data = rte_pktmbuf_mtod(copy2, unaligned_uint32_t *); + if (data[0] != MAGIC_DATA + 1) + GOTO_FAIL("copy with offset, invalid data\n"); + + rte_pktmbuf_free(copy2); + + /* test truncation copy */ + copy2 = rte_pktmbuf_copy(copy, pktmbuf_pool, + 0, sizeof(uint32_t)); + if (copy2 == NULL) + GOTO_FAIL("cannot copy the copy\n"); + + if (rte_pktmbuf_pkt_len(copy2) != sizeof(uint32_t)) + GOTO_FAIL("copy with truncate, length incorrect\n"); + + if (rte_pktmbuf_data_len(copy2) != sizeof(uint32_t)) + GOTO_FAIL("copy with truncate, data length incorrect\n"); + + data = rte_pktmbuf_mtod(copy2, unaligned_uint32_t *); + if (data[0] != MAGIC_DATA) + GOTO_FAIL("copy with truncate, invalid data\n"); + + /* free mbuf */ + rte_pktmbuf_free(m); + rte_pktmbuf_free(copy); + rte_pktmbuf_free(copy2); + + m = NULL; + copy = NULL; + copy2 = NULL; + printf("%s ok\n", __func__); + return 0; + +fail: + if (m) + rte_pktmbuf_free(m); + if (copy) + rte_pktmbuf_free(copy); + if (copy2) + rte_pktmbuf_free(copy2); + return -1; +} + static int test_attach_from_different_pool(struct rte_mempool *pktmbuf_pool, struct rte_mempool *pktmbuf_pool2) @@ -1203,6 +1324,11 @@ test_mbuf(void) goto err; } + if (test_pktmbuf_copy(pktmbuf_pool) < 0) { + printf("test_pktmbuf_copy() failed.\n"); + goto err; + } + if (test_attach_from_different_pool(pktmbuf_pool, pktmbuf_pool2) < 0) { printf("test_attach_from_different_pool() failed\n"); goto err;