Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4206/?format=api
{ "id": 4206, "url": "https://patches.dpdk.org/api/patches/4206/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1427829784-12323-2-git-send-email-zer0@droids-corp.org/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1427829784-12323-2-git-send-email-zer0@droids-corp.org>", "list_archive_url": "https://inbox.dpdk.org/dev/1427829784-12323-2-git-send-email-zer0@droids-corp.org", "date": "2015-03-31T19:23:00", "name": "[dpdk-dev,v3,1/5] mbuf: fix clone support when application uses private mbuf data", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "39c7cefa1addde4c15bc01e2fbafc014c200c718", "submitter": { "id": 8, "url": "https://patches.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1427829784-12323-2-git-send-email-zer0@droids-corp.org/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/4206/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/4206/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 73DB87EEF;\n\tTue, 31 Mar 2015 21:23:32 +0200 (CEST)", "from mail-wi0-f169.google.com (mail-wi0-f169.google.com\n\t[209.85.212.169]) by dpdk.org (Postfix) with ESMTP id A47FD7E6A\n\tfor <dev@dpdk.org>; Tue, 31 Mar 2015 21:23:29 +0200 (CEST)", "by wibgn9 with SMTP id gn9so38800550wib.1\n\tfor <dev@dpdk.org>; Tue, 31 Mar 2015 12:23:29 -0700 (PDT)", "from localhost.localdomain ([185.65.185.242])\n\tby mx.google.com with ESMTPSA id\n\tg2sm25966892wib.1.2015.03.31.12.23.27\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 31 Mar 2015 12:23:28 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=nCI0AtoTTYzeyCNeyLXYd5qkZZkJpHy7IEAlbj05Ko0=;\n\tb=ZQXxwAAokSAAWFtELkb7JYaylHh30VBD1L3MWKzF9yDJzGg2bp11aGPndEQ3m0bQTv\n\tKoObNMKP0CqCEHYXR44xy0ikziXcMQPbka/tK2aCPIyrtWocbPwPkJOd8tg0ogIjeyF2\n\tGt++mvuzmbKNHYdJfYm3JGkD1Jbq06GffMdygVs+cItjY9buYnTdsis2ryZjRWkGIJiZ\n\tSBmCZhmhHilA2fZ+fM5/7GhoZrIEaGYTDlAiUx9t9Ju4ZWrb25fd0SAJXI9XP60BCo/5\n\tUXyn2cGUrF7AHPFAwifjkUum6mvDosZ4u/iZNNSuNhHLYWdE4Wf2+NN4CtC/GaIGGJmT\n\tYuAA==", "X-Gm-Message-State": "ALoCoQn/v0BYWii0MTrnbwyZjxQSxDT5evuUBJMQjta+CTnY3ULVJkuDGjjx5JvZ85Myzpyw8MC5", "X-Received": "by 10.194.174.164 with SMTP id\n\tbt4mr78074090wjc.155.1427829809368; \n\tTue, 31 Mar 2015 12:23:29 -0700 (PDT)", "From": "Olivier Matz <olivier.matz@6wind.com>", "X-Google-Original-From": "Olivier Matz <zer0@droids-corp.org>", "To": "dev@dpdk.org", "Date": "Tue, 31 Mar 2015 21:23:00 +0200", "Message-Id": "<1427829784-12323-2-git-send-email-zer0@droids-corp.org>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1427829784-12323-1-git-send-email-zer0@droids-corp.org>", "References": "<1427385595-15011-1-git-send-email-olivier.matz@6wind.com>\n\t<1427829784-12323-1-git-send-email-zer0@droids-corp.org>", "Subject": "[dpdk-dev] [PATCH v3 1/5] mbuf: fix clone support when application\n\tuses private mbuf data", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Olivier Matz <olivier.matz@6wind.com>\n\nAdd a new private_size field in mbuf structure that should\nbe initialized at mbuf pool creation. This field contains the\nsize of the application private data in mbufs.\n\nIntroduce new static inline functions rte_mbuf_from_indirect()\nand rte_mbuf_to_baddr() to replace the existing macros, which\ntake the private size in account when attaching and detaching\nmbufs.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n app/test-pmd/testpmd.c | 1 +\n examples/vhost/main.c | 4 +--\n lib/librte_mbuf/rte_mbuf.c | 1 +\n lib/librte_mbuf/rte_mbuf.h | 77 +++++++++++++++++++++++++++++++++++-----------\n 4 files changed, 63 insertions(+), 20 deletions(-)", "diff": "diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex 3057791..c5a195a 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -425,6 +425,7 @@ testpmd_mbuf_ctor(struct rte_mempool *mp,\n \tmb->tx_offload = 0;\n \tmb->vlan_tci = 0;\n \tmb->hash.rss = 0;\n+\tmb->priv_size = 0;\n }\n \n static void\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex c3fcb80..e44e82f 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -139,7 +139,7 @@\n /* Number of descriptors per cacheline. */\n #define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))\n \n-#define MBUF_EXT_MEM(mb) (RTE_MBUF_FROM_BADDR((mb)->buf_addr) != (mb))\n+#define MBUF_EXT_MEM(mb) (rte_mbuf_from_indirect(mb) != (mb))\n \n /* mask of enabled ports */\n static uint32_t enabled_port_mask = 0;\n@@ -1550,7 +1550,7 @@ attach_rxmbuf_zcp(struct virtio_net *dev)\n static inline void pktmbuf_detach_zcp(struct rte_mbuf *m)\n {\n \tconst struct rte_mempool *mp = m->pool;\n-\tvoid *buf = RTE_MBUF_TO_BADDR(m);\n+\tvoid *buf = rte_mbuf_to_baddr(m);\n \tuint32_t buf_ofs;\n \tuint32_t buf_len = mp->elt_size - sizeof(*m);\n \tm->buf_physaddr = rte_mempool_virt2phy(mp, m) + sizeof(*m);\ndiff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c\nindex 526b18d..e095999 100644\n--- a/lib/librte_mbuf/rte_mbuf.c\n+++ b/lib/librte_mbuf/rte_mbuf.c\n@@ -125,6 +125,7 @@ rte_pktmbuf_init(struct rte_mempool *mp,\n \tm->pool = mp;\n \tm->nb_segs = 1;\n \tm->port = 0xff;\n+\tm->priv_size = 0;\n }\n \n /* do some sanity checks on a mbuf: panic if it fails */\ndiff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h\nindex 17ba791..932fe58 100644\n--- a/lib/librte_mbuf/rte_mbuf.h\n+++ b/lib/librte_mbuf/rte_mbuf.h\n@@ -317,18 +317,51 @@ struct rte_mbuf {\n \t\t\t/* uint64_t unused:8; */\n \t\t};\n \t};\n+\n+\t/** Size of the application private data. In case of an indirect\n+\t * mbuf, it stores the direct mbuf private data size. */\n+\tuint16_t priv_size;\n } __rte_cache_aligned;\n \n /**\n- * Given the buf_addr returns the pointer to corresponding mbuf.\n+ * Return the mbuf owning the data buffer address of an indirect mbuf.\n+ *\n+ * @param mi\n+ * The pointer to the indirect mbuf.\n+ * @return\n+ * The address of the direct mbuf corresponding to buffer_addr.\n */\n-#define RTE_MBUF_FROM_BADDR(ba) (((struct rte_mbuf *)(ba)) - 1)\n+static inline struct rte_mbuf *\n+rte_mbuf_from_indirect(struct rte_mbuf *mi)\n+{\n+ struct rte_mbuf *md;\n+\n+ /* mi->buf_addr and mi->priv_size correspond to buffer and\n+\t* private size of the direct mbuf */\n+ md = (struct rte_mbuf *)((char *)mi->buf_addr - sizeof(*mi) -\n+\t mi->priv_size);\n+ return md;\n+}\n \n /**\n- * Given the pointer to mbuf returns an address where it's buf_addr\n- * should point to.\n+ * Return the buffer address embedded in the given mbuf.\n+ *\n+ * The user must ensure that m->priv_size corresponds to the\n+ * private size of this mbuf, which is not the case for indirect\n+ * mbufs.\n+ *\n+ * @param md\n+ * The pointer to the mbuf.\n+ * @return\n+ * The address of the data buffer owned by the mbuf.\n */\n-#define RTE_MBUF_TO_BADDR(mb) (((struct rte_mbuf *)(mb)) + 1)\n+static inline char *\n+rte_mbuf_to_baddr(struct rte_mbuf *md)\n+{\n+ char *buffer_addr;\n+ buffer_addr = (char *)md + sizeof(*md) + md->priv_size;\n+ return buffer_addr;\n+}\n \n /**\n * Returns TRUE if given mbuf is indirect, or FALSE otherwise.\n@@ -688,6 +721,7 @@ static inline struct rte_mbuf *rte_pktmbuf_alloc(struct rte_mempool *mp)\n \n /**\n * Attach packet mbuf to another packet mbuf.\n+ *\n * After attachment we refer the mbuf we attached as 'indirect',\n * while mbuf we attached to as 'direct'.\n * Right now, not supported:\n@@ -701,7 +735,6 @@ static inline struct rte_mbuf *rte_pktmbuf_alloc(struct rte_mempool *mp)\n * @param md\n * The direct packet mbuf.\n */\n-\n static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)\n {\n \tRTE_MBUF_ASSERT(RTE_MBUF_DIRECT(md) &&\n@@ -712,6 +745,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)\n \tmi->buf_physaddr = md->buf_physaddr;\n \tmi->buf_addr = md->buf_addr;\n \tmi->buf_len = md->buf_len;\n+\tmi->priv_size = md->priv_size;\n \n \tmi->next = md->next;\n \tmi->data_off = md->data_off;\n@@ -732,7 +766,8 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)\n }\n \n /**\n- * Detach an indirect packet mbuf -\n+ * Detach an indirect packet mbuf.\n+ *\n * - restore original mbuf address and length values.\n * - reset pktmbuf data and data_len to their default values.\n * All other fields of the given packet mbuf will be left intact.\n@@ -740,22 +775,28 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)\n * @param m\n * The indirect attached packet mbuf.\n */\n-\n static inline void rte_pktmbuf_detach(struct rte_mbuf *m)\n {\n-\tconst struct rte_mempool *mp = m->pool;\n-\tvoid *buf = RTE_MBUF_TO_BADDR(m);\n-\tuint32_t buf_len = mp->elt_size - sizeof(*m);\n-\tm->buf_physaddr = rte_mempool_virt2phy(mp, m) + sizeof (*m);\n-\n+\tstruct rte_pktmbuf_pool_private *mbp_priv;\n+\tstruct rte_mempool *mp = m->pool;\n+\tvoid *buf;\n+\tunsigned mhdr_size;\n+\n+\t/* first, restore the priv_size, this is needed before calling\n+\t * rte_mbuf_to_baddr() */\n+\tmbp_priv = rte_mempool_get_priv(mp);\n+\tm->priv_size = mp->elt_size - RTE_PKTMBUF_HEADROOM -\n+\t\tmbp_priv->mbuf_data_room_size -\n+\t\tsizeof(struct rte_mbuf);\n+\n+\tbuf = rte_mbuf_to_baddr(m);\n+\tmhdr_size = (char *)buf - (char *)m;\n+\tm->buf_physaddr = rte_mempool_virt2phy(mp, m) + mhdr_size;\n \tm->buf_addr = buf;\n-\tm->buf_len = (uint16_t)buf_len;\n-\n+\tm->buf_len = (uint16_t)(mp->elt_size - mhdr_size);\n \tm->data_off = (RTE_PKTMBUF_HEADROOM <= m->buf_len) ?\n \t\t\tRTE_PKTMBUF_HEADROOM : m->buf_len;\n-\n \tm->data_len = 0;\n-\n \tm->ol_flags = 0;\n }\n \n@@ -774,7 +815,7 @@ __rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n \t\t * - free attached mbuf segment\n \t\t */\n \t\tif (RTE_MBUF_INDIRECT(m)) {\n-\t\t\tstruct rte_mbuf *md = RTE_MBUF_FROM_BADDR(m->buf_addr);\n+\t\t\tstruct rte_mbuf *md = rte_mbuf_from_indirect(m);\n \t\t\trte_pktmbuf_detach(m);\n \t\t\tif (rte_mbuf_refcnt_update(md, -1) == 0)\n \t\t\t\t__rte_mbuf_raw_free(md);\n", "prefixes": [ "dpdk-dev", "v3", "1/5" ] }