Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/21601/?format=api
{ "id": 21601, "url": "https://patches.dpdk.org/api/patches/21601/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1488966121-22853-2-git-send-email-olivier.matz@6wind.com/", "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": "<1488966121-22853-2-git-send-email-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1488966121-22853-2-git-send-email-olivier.matz@6wind.com", "date": "2017-03-08T09:41:53", "name": "[dpdk-dev,1/9] mbuf: make segment prefree function public", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1732c6bd6393d7cc84ba257117532368a0c38b13", "submitter": { "id": 8, "url": "https://patches.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1488966121-22853-2-git-send-email-olivier.matz@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/21601/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/21601/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 466736CB5;\n\tWed, 8 Mar 2017 10:42:50 +0100 (CET)", "from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com\n\t[62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 5FC3337A4\n\tfor <dev@dpdk.org>; Wed, 8 Mar 2017 10:42:23 +0100 (CET)", "from glumotte.dev.6wind.com (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id A4AD624D1B;\n\tWed, 8 Mar 2017 10:42:17 +0100 (CET)" ], "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Cc": "bruce.richardson@intel.com, konstantin.ananyev@intel.com,\n\tmb@smartsharesystems.com, andrey.chilikin@intel.com,\n\tjblunck@infradead.org, \n\tnelio.laranjeiro@6wind.com, arybchenko@solarflare.com", "Date": "Wed, 8 Mar 2017 10:41:53 +0100", "Message-Id": "<1488966121-22853-2-git-send-email-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.8.1", "In-Reply-To": "<1488966121-22853-1-git-send-email-olivier.matz@6wind.com>", "References": "<1485271173-13408-1-git-send-email-olivier.matz@6wind.com>\n\t<1488966121-22853-1-git-send-email-olivier.matz@6wind.com>", "Subject": "[dpdk-dev] [PATCH 1/9] mbuf: make segment prefree function public", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <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": "Document the function and make it public, since it is used at several\nplaces in the drivers. The old one is marked as deprecated.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n drivers/net/enic/enic_rxtx.c | 2 +-\n drivers/net/fm10k/fm10k_rxtx.c | 6 +++---\n drivers/net/fm10k/fm10k_rxtx_vec.c | 6 +++---\n drivers/net/i40e/i40e_rxtx_vec_common.h | 6 +++---\n drivers/net/ixgbe/ixgbe_rxtx.c | 2 +-\n drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 6 +++---\n drivers/net/virtio/virtio_rxtx_simple.h | 6 +++---\n lib/librte_mbuf/rte_mbuf.h | 30 +++++++++++++++++++++++++++---\n 8 files changed, 44 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c\nindex 343dabc..1ee5cbb 100644\n--- a/drivers/net/enic/enic_rxtx.c\n+++ b/drivers/net/enic/enic_rxtx.c\n@@ -473,7 +473,7 @@ static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index)\n \tpool = ((struct rte_mbuf *)buf->mb)->pool;\n \tfor (i = 0; i < nb_to_free; i++) {\n \t\tbuf = &wq->bufs[tail_idx];\n-\t\tm = __rte_pktmbuf_prefree_seg((struct rte_mbuf *)(buf->mb));\n+\t\tm = rte_pktmbuf_prefree_seg((struct rte_mbuf *)(buf->mb));\n \t\tbuf->mb = NULL;\n \n \t\tif (unlikely(m == NULL)) {\ndiff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c\nindex 144e5e6..c9bb04a 100644\n--- a/drivers/net/fm10k/fm10k_rxtx.c\n+++ b/drivers/net/fm10k/fm10k_rxtx.c\n@@ -434,12 +434,12 @@ static inline void tx_free_bulk_mbuf(struct rte_mbuf **txep, int num)\n \tif (unlikely(num == 0))\n \t\treturn;\n \n-\tm = __rte_pktmbuf_prefree_seg(txep[0]);\n+\tm = rte_pktmbuf_prefree_seg(txep[0]);\n \tif (likely(m != NULL)) {\n \t\tfree[0] = m;\n \t\tnb_free = 1;\n \t\tfor (i = 1; i < num; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i]);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i]);\n \t\t\tif (likely(m != NULL)) {\n \t\t\t\tif (likely(m->pool == free[0]->pool))\n \t\t\t\t\tfree[nb_free++] = m;\n@@ -455,7 +455,7 @@ static inline void tx_free_bulk_mbuf(struct rte_mbuf **txep, int num)\n \t\trte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);\n \t} else {\n \t\tfor (i = 1; i < num; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i]);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i]);\n \t\t\tif (m != NULL)\n \t\t\t\trte_mempool_put(m->pool, m);\n \t\t\ttxep[i] = NULL;\ndiff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c\nindex 27f3e43..825e3c1 100644\n--- a/drivers/net/fm10k/fm10k_rxtx_vec.c\n+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c\n@@ -754,12 +754,12 @@ fm10k_tx_free_bufs(struct fm10k_tx_queue *txq)\n \t * next_dd - (rs_thresh-1)\n \t */\n \ttxep = &txq->sw_ring[txq->next_dd - (n - 1)];\n-\tm = __rte_pktmbuf_prefree_seg(txep[0]);\n+\tm = rte_pktmbuf_prefree_seg(txep[0]);\n \tif (likely(m != NULL)) {\n \t\tfree[0] = m;\n \t\tnb_free = 1;\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i]);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i]);\n \t\t\tif (likely(m != NULL)) {\n \t\t\t\tif (likely(m->pool == free[0]->pool))\n \t\t\t\t\tfree[nb_free++] = m;\n@@ -774,7 +774,7 @@ fm10k_tx_free_bufs(struct fm10k_tx_queue *txq)\n \t\trte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);\n \t} else {\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i]);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i]);\n \t\t\tif (m != NULL)\n \t\t\t\trte_mempool_put(m->pool, m);\n \t\t}\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h\nindex 3745558..76031fe 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_common.h\n+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h\n@@ -123,12 +123,12 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)\n \t * tx_next_dd - (tx_rs_thresh-1)\n \t */\n \ttxep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];\n-\tm = __rte_pktmbuf_prefree_seg(txep[0].mbuf);\n+\tm = rte_pktmbuf_prefree_seg(txep[0].mbuf);\n \tif (likely(m != NULL)) {\n \t\tfree[0] = m;\n \t\tnb_free = 1;\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i].mbuf);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i].mbuf);\n \t\t\tif (likely(m != NULL)) {\n \t\t\t\tif (likely(m->pool == free[0]->pool)) {\n \t\t\t\t\tfree[nb_free++] = m;\n@@ -144,7 +144,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)\n \t\trte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);\n \t} else {\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i].mbuf);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i].mbuf);\n \t\t\tif (m != NULL)\n \t\t\t\trte_mempool_put(m->pool, m);\n \t\t}\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex 9502432..b056107 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -142,7 +142,7 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)\n \n \tfor (i = 0; i < txq->tx_rs_thresh; ++i, ++txep) {\n \t\t/* free buffers one at a time */\n-\t\tm = __rte_pktmbuf_prefree_seg(txep->mbuf);\n+\t\tm = rte_pktmbuf_prefree_seg(txep->mbuf);\n \t\ttxep->mbuf = NULL;\n \n \t\tif (unlikely(m == NULL))\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\nindex a3473b9..a83afe5 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n@@ -123,12 +123,12 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)\n \t * tx_next_dd - (tx_rs_thresh-1)\n \t */\n \ttxep = &txq->sw_ring_v[txq->tx_next_dd - (n - 1)];\n-\tm = __rte_pktmbuf_prefree_seg(txep[0].mbuf);\n+\tm = rte_pktmbuf_prefree_seg(txep[0].mbuf);\n \tif (likely(m != NULL)) {\n \t\tfree[0] = m;\n \t\tnb_free = 1;\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i].mbuf);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i].mbuf);\n \t\t\tif (likely(m != NULL)) {\n \t\t\t\tif (likely(m->pool == free[0]->pool))\n \t\t\t\t\tfree[nb_free++] = m;\n@@ -143,7 +143,7 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)\n \t\trte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);\n \t} else {\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\tm = __rte_pktmbuf_prefree_seg(txep[i].mbuf);\n+\t\t\tm = rte_pktmbuf_prefree_seg(txep[i].mbuf);\n \t\t\tif (m != NULL)\n \t\t\t\trte_mempool_put(m->pool, m);\n \t\t}\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.h b/drivers/net/virtio/virtio_rxtx_simple.h\nindex b08f859..f531c54 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.h\n+++ b/drivers/net/virtio/virtio_rxtx_simple.h\n@@ -98,13 +98,13 @@ virtio_xmit_cleanup(struct virtqueue *vq)\n \tdesc_idx = (uint16_t)(vq->vq_used_cons_idx &\n \t\t ((vq->vq_nentries >> 1) - 1));\n \tm = (struct rte_mbuf *)vq->vq_descx[desc_idx++].cookie;\n-\tm = __rte_pktmbuf_prefree_seg(m);\n+\tm = rte_pktmbuf_prefree_seg(m);\n \tif (likely(m != NULL)) {\n \t\tfree[0] = m;\n \t\tnb_free = 1;\n \t\tfor (i = 1; i < VIRTIO_TX_FREE_NR; i++) {\n \t\t\tm = (struct rte_mbuf *)vq->vq_descx[desc_idx++].cookie;\n-\t\t\tm = __rte_pktmbuf_prefree_seg(m);\n+\t\t\tm = rte_pktmbuf_prefree_seg(m);\n \t\t\tif (likely(m != NULL)) {\n \t\t\t\tif (likely(m->pool == free[0]->pool))\n \t\t\t\t\tfree[nb_free++] = m;\n@@ -123,7 +123,7 @@ virtio_xmit_cleanup(struct virtqueue *vq)\n \t} else {\n \t\tfor (i = 1; i < VIRTIO_TX_FREE_NR; i++) {\n \t\t\tm = (struct rte_mbuf *)vq->vq_descx[desc_idx++].cookie;\n-\t\t\tm = __rte_pktmbuf_prefree_seg(m);\n+\t\t\tm = rte_pktmbuf_prefree_seg(m);\n \t\t\tif (m != NULL)\n \t\t\t\trte_mempool_put(m->pool, m);\n \t\t}\ndiff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h\nindex ce57d47..b61c430 100644\n--- a/lib/librte_mbuf/rte_mbuf.h\n+++ b/lib/librte_mbuf/rte_mbuf.h\n@@ -1213,8 +1213,23 @@ static inline void rte_pktmbuf_detach(struct rte_mbuf *m)\n \t\t__rte_mbuf_raw_free(md);\n }\n \n-static inline struct rte_mbuf* __attribute__((always_inline))\n-__rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n+/**\n+ * Decrease reference counter and unlink a mbuf segment\n+ *\n+ * This function does the same than a free, except that it does not\n+ * return the segment to its pool.\n+ * It decreases the reference counter, and if it reaches 0, it is\n+ * detached from its parent for an indirect mbuf.\n+ *\n+ * @param m\n+ * The mbuf to be unlinked\n+ * @return\n+ * - (m) if it is the last reference. It can be recycled or freed.\n+ * - (NULL) if the mbuf still has remaining references on it.\n+ */\n+__attribute__((always_inline))\n+static inline struct rte_mbuf *\n+rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n {\n \t__rte_mbuf_sanity_check(m, 0);\n \n@@ -1227,6 +1242,14 @@ __rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n \treturn NULL;\n }\n \n+/* deprecated, replaced by rte_pktmbuf_prefree_seg() */\n+__rte_deprecated\n+static inline struct rte_mbuf *\n+__rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n+{\n+\treturn rte_pktmbuf_prefree_seg(m);\n+}\n+\n /**\n * Free a segment of a packet mbuf into its original mempool.\n *\n@@ -1239,7 +1262,8 @@ __rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n static inline void __attribute__((always_inline))\n rte_pktmbuf_free_seg(struct rte_mbuf *m)\n {\n-\tif (likely(NULL != (m = __rte_pktmbuf_prefree_seg(m)))) {\n+\tm = rte_pktmbuf_prefree_seg(m);\n+\tif (likely(m != NULL)) {\n \t\tm->next = NULL;\n \t\t__rte_mbuf_raw_free(m);\n \t}\n", "prefixes": [ "dpdk-dev", "1/9" ] }