Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4381/?format=api
{ "id": 4381, "url": "http://patches.dpdk.org/api/patches/4381/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1429544496-22532-4-git-send-email-olivier.matz@6wind.com/", "project": { "id": 1, "url": "http://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": "<1429544496-22532-4-git-send-email-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1429544496-22532-4-git-send-email-olivier.matz@6wind.com", "date": "2015-04-20T15:41:27", "name": "[dpdk-dev,v4,03/12] mbuf: add accessors to get data room size and private size", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7cd81fda55bf30a004c84a43e89e9e43ae691ae2", "submitter": { "id": 8, "url": "http://patches.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1429544496-22532-4-git-send-email-olivier.matz@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/4381/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/4381/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 DB90FC37C;\n\tMon, 20 Apr 2015 17:41:53 +0200 (CEST)", "from mail-wg0-f45.google.com (mail-wg0-f45.google.com\n\t[74.125.82.45]) by dpdk.org (Postfix) with ESMTP id 240395FEB\n\tfor <dev@dpdk.org>; Mon, 20 Apr 2015 17:41:50 +0200 (CEST)", "by wgin8 with SMTP id n8so183396158wgi.0\n\tfor <dev@dpdk.org>; Mon, 20 Apr 2015 08:41:50 -0700 (PDT)", "from glumotte.dev.6wind.com (6wind.net2.nerim.net.\n\t[213.41.180.237]) by mx.google.com with ESMTPSA id\n\tfm8sm11258951wib.9.2015.04.20.08.41.49\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tMon, 20 Apr 2015 08:41:49 -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=mPuH75ohyWyVnk9bXeM6ESg9PS1b+2Dq3FF45xtbq/0=;\n\tb=UurPvUTmGv5+dJIINCkUuvz9rlemY/GHTfZwo5D5A30WD3IDjvRbKnbg4IUhAu2oHg\n\t2F2PmrAOTtR69CJ95Lrhy4pM0P4XvPYMPGYyf9QcIwVpfViIgAd3n/h8eGYsWXFGV1Ww\n\t5a8Aop18PYUNeEGeoruOYDpmVFeEm6T0ACGEjH+qVTJmkEjqKS1ghHUgOon/s6Td+azi\n\tufB1XKkF78GU38jJQeqXr8e4ZYewqUAzu2OjBMnAhjx+Hra6Qv6+L5OL33QFVryYFPQV\n\tGCsUPl0mFO3I5y4hpQeNFNIoa/IFlJyR71NspmD8TRb84FxedRZ6kxUfR6GJPFcHvLMC\n\t7UHg==", "X-Gm-Message-State": "ALoCoQlwn0vXvv9zjSqu+qTzFLCHD/TrYY9jLCSw7sillKTPHOCcqCSAi1e6ayKef6aUwDAoHzrO", "X-Received": "by 10.180.103.130 with SMTP id fw2mr22616665wib.87.1429544510011;\n\tMon, 20 Apr 2015 08:41:50 -0700 (PDT)", "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Date": "Mon, 20 Apr 2015 17:41:27 +0200", "Message-Id": "<1429544496-22532-4-git-send-email-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1429544496-22532-1-git-send-email-olivier.matz@6wind.com>", "References": "<1427829784-12323-2-git-send-email-zer0@droids-corp.org>\n\t<1429544496-22532-1-git-send-email-olivier.matz@6wind.com>", "Subject": "[dpdk-dev] [PATCH v4 03/12] mbuf: add accessors to get data room\n\tsize and private size", "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": "This code retrieving the pool private area is duplicated in many\nplaces, we can use of function for it.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n lib/librte_ether/rte_ethdev.c | 4 +--\n lib/librte_mbuf/rte_mbuf.h | 41 ++++++++++++++++++++++++++++\n lib/librte_pmd_af_packet/rte_eth_af_packet.c | 6 ++--\n lib/librte_pmd_e1000/em_rxtx.c | 5 ++--\n lib/librte_pmd_e1000/igb_rxtx.c | 12 +++-----\n lib/librte_pmd_fm10k/fm10k_ethdev.c | 6 ++--\n lib/librte_pmd_i40e/i40e_ethdev_vf.c | 6 ++--\n lib/librte_pmd_i40e/i40e_rxtx.c | 15 ++++------\n lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 12 +++-----\n lib/librte_pmd_pcap/rte_eth_pcap.c | 5 +---\n lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c | 7 ++---\n 11 files changed, 67 insertions(+), 52 deletions(-)", "diff": "diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex e20cca5..ff06256 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -1439,7 +1439,6 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n \tint ret;\n \tuint32_t mbp_buf_size;\n \tstruct rte_eth_dev *dev;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tstruct rte_eth_dev_info dev_info;\n \n \t/* This function is only safe when called from the primary process\n@@ -1478,8 +1477,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n \t\t\t\t(int) sizeof(struct rte_pktmbuf_pool_private));\n \t\treturn (-ENOSPC);\n \t}\n-\tmbp_priv = rte_mempool_get_priv(mp);\n-\tmbp_buf_size = mbp_priv->mbuf_data_room_size;\n+\tmbp_buf_size = rte_pktmbuf_data_room_size(mp);\n \n \tif ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) {\n \t\tPMD_DEBUG_TRACE(\"%s mbuf_data_room_size %d < %d \"\ndiff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h\nindex 13fd626..a4146fa 100644\n--- a/lib/librte_mbuf/rte_mbuf.h\n+++ b/lib/librte_mbuf/rte_mbuf.h\n@@ -642,6 +642,47 @@ void rte_pktmbuf_init(struct rte_mempool *mp, void *opaque_arg,\n void rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg);\n \n /**\n+ * Get the data room size of mbufs stored in a pktmbuf_pool\n+ *\n+ * The data room size is the amount of data that can be stored in a\n+ * mbuf including the headroom (RTE_PKTMBUF_HEADROOM).\n+ *\n+ * @param mp\n+ * The packet mbuf pool.\n+ * @return\n+ * The data room size of mbufs stored in this mempool.\n+ */\n+static inline uint16_t\n+rte_pktmbuf_data_room_size(struct rte_mempool *mp)\n+{\n+\tstruct rte_pktmbuf_pool_private *mbp_priv;\n+\n+\tmbp_priv = (struct rte_pktmbuf_pool_private *)rte_mempool_get_priv(mp);\n+\treturn mbp_priv->mbuf_data_room_size;\n+}\n+\n+/**\n+ * Get the application private size of mbufs stored in a pktmbuf_pool\n+ *\n+ * The private size of mbuf is a zone located between the rte_mbuf\n+ * structure and the data buffer where an application can store data\n+ * associated to a packet.\n+ *\n+ * @param mp\n+ * The packet mbuf pool.\n+ * @return\n+ * The private size of mbufs stored in this mempool.\n+ */\n+static inline uint16_t\n+rte_pktmbuf_priv_size(struct rte_mempool *mp)\n+{\n+\tstruct rte_pktmbuf_pool_private *mbp_priv;\n+\n+\tmbp_priv = (struct rte_pktmbuf_pool_private *)rte_mempool_get_priv(mp);\n+\treturn mbp_priv->mbuf_priv_size;\n+}\n+\n+/**\n * Reset the fields of a packet mbuf to their default values.\n *\n * The given mbuf must have only one segment.\ndiff --git a/lib/librte_pmd_af_packet/rte_eth_af_packet.c b/lib/librte_pmd_af_packet/rte_eth_af_packet.c\nindex f7e9ec9..bdd9628 100644\n--- a/lib/librte_pmd_af_packet/rte_eth_af_packet.c\n+++ b/lib/librte_pmd_af_packet/rte_eth_af_packet.c\n@@ -348,15 +348,13 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n \tstruct pkt_rx_queue *pkt_q = &internals->rx_queue[rx_queue_id];\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tuint16_t buf_size;\n \n \tpkt_q->mb_pool = mb_pool;\n \n \t/* Now get the space available for data in the mbuf */\n-\tmbp_priv = rte_mempool_get_priv(pkt_q->mb_pool);\n-\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t RTE_PKTMBUF_HEADROOM);\n+\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(pkt_q->mb_pool) -\n+\t\tRTE_PKTMBUF_HEADROOM);\n \n \tif (ETH_FRAME_LEN > buf_size) {\n \t\tRTE_LOG(ERR, PMD,\ndiff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c\nindex 8e20920..64d067c 100644\n--- a/lib/librte_pmd_e1000/em_rxtx.c\n+++ b/lib/librte_pmd_e1000/em_rxtx.c\n@@ -1668,12 +1668,11 @@ eth_em_rx_init(struct rte_eth_dev *dev)\n \t/* Determine RX bufsize. */\n \trctl_bsize = EM_MAX_BUF_SIZE;\n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \t\tuint32_t buf_size;\n \n \t\trxq = dev->data->rx_queues[i];\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mb_pool);\n-\t\tbuf_size = mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM;\n+\t\tbuf_size = rte_pktmbuf_data_room_size(rxq->mb_pool) -\n+\t\t\tRTE_PKTMBUF_HEADROOM;\n \t\trctl_bsize = RTE_MIN(rctl_bsize, buf_size);\n \t}\n \ndiff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c\nindex 084e45a..80d05c0 100644\n--- a/lib/librte_pmd_e1000/igb_rxtx.c\n+++ b/lib/librte_pmd_e1000/igb_rxtx.c\n@@ -1921,7 +1921,6 @@ eth_igb_rx_init(struct rte_eth_dev *dev)\n {\n \tstruct e1000_hw *hw;\n \tstruct igb_rx_queue *rxq;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tuint32_t rctl;\n \tuint32_t rxcsum;\n \tuint32_t srrctl;\n@@ -1991,9 +1990,8 @@ eth_igb_rx_init(struct rte_eth_dev *dev)\n \t\t/*\n \t\t * Configure RX buffer size.\n \t\t */\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mb_pool);\n-\t\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t\t\t\t RTE_PKTMBUF_HEADROOM);\n+\t\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) -\n+\t\t\tRTE_PKTMBUF_HEADROOM);\n \t\tif (buf_size >= 1024) {\n \t\t\t/*\n \t\t\t * Configure the BSIZEPACKET field of the SRRCTL\n@@ -2221,7 +2219,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)\n {\n \tstruct e1000_hw *hw;\n \tstruct igb_rx_queue *rxq;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tuint32_t srrctl;\n \tuint16_t buf_size;\n \tuint16_t rctl_bsize;\n@@ -2262,9 +2259,8 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)\n \t\t/*\n \t\t * Configure RX buffer size.\n \t\t */\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mb_pool);\n-\t\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t\t\t\t RTE_PKTMBUF_HEADROOM);\n+\t\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) -\n+\t\t\tRTE_PKTMBUF_HEADROOM);\n \t\tif (buf_size >= 1024) {\n \t\t\t/*\n \t\t\t * Configure the BSIZEPACKET field of the SRRCTL\ndiff --git a/lib/librte_pmd_fm10k/fm10k_ethdev.c b/lib/librte_pmd_fm10k/fm10k_ethdev.c\nindex 1a96cf2..dd4454c 100644\n--- a/lib/librte_pmd_fm10k/fm10k_ethdev.c\n+++ b/lib/librte_pmd_fm10k/fm10k_ethdev.c\n@@ -397,7 +397,6 @@ fm10k_dev_rx_init(struct rte_eth_dev *dev)\n \tuint32_t size;\n \tuint32_t rxdctl = FM10K_RXDCTL_WRITE_BACK_MIN_DELAY;\n \tuint16_t buf_size;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \n \t/* Disable RXINT to avoid possible interrupt */\n \tfor (i = 0; i < hw->mac.max_queues; i++)\n@@ -425,9 +424,8 @@ fm10k_dev_rx_init(struct rte_eth_dev *dev)\n \t\tFM10K_WRITE_REG(hw, FM10K_RDLEN(i), size);\n \n \t\t/* Configure the Rx buffer size for one buff without split */\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mp);\n-\t\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t\t\t\t\tRTE_PKTMBUF_HEADROOM);\n+\t\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -\n+\t\t\tRTE_PKTMBUF_HEADROOM);\n \t\tFM10K_WRITE_REG(hw, FM10K_SRRCTL(i),\n \t\t\t\tbuf_size >> FM10K_SRRCTL_BSIZEPKT_SHIFT);\n \ndiff --git a/lib/librte_pmd_i40e/i40e_ethdev_vf.c b/lib/librte_pmd_i40e/i40e_ethdev_vf.c\nindex 4581c5b..473d441 100644\n--- a/lib/librte_pmd_i40e/i40e_ethdev_vf.c\n+++ b/lib/librte_pmd_i40e/i40e_ethdev_vf.c\n@@ -571,13 +571,11 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct i40e_virtchnl_rxq_info *rxq_info,\n \trxq_info->queue_id = queue_id;\n \trxq_info->max_pkt_size = max_pkt_size;\n \tif (queue_id < nb_rxq) {\n-\t\tstruct rte_pktmbuf_pool_private *mbp_priv;\n-\n \t\trxq_info->ring_len = rxq->nb_rx_desc;\n \t\trxq_info->dma_ring_addr = rxq->rx_ring_phys_addr;\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mp);\n \t\trxq_info->databuffer_size =\n-\t\t\tmbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM;\n+\t\t\t(rte_pktmbuf_data_room_size(rxq->mp) -\n+\t\t\t\tRTE_PKTMBUF_HEADROOM);\n \t}\n }\n \ndiff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c\nindex abe68f4..493cfa3 100644\n--- a/lib/librte_pmd_i40e/i40e_rxtx.c\n+++ b/lib/librte_pmd_i40e/i40e_rxtx.c\n@@ -2444,11 +2444,10 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)\n \tstruct i40e_pf *pf = I40E_VSI_TO_PF(rxq->vsi);\n \tstruct i40e_hw *hw = I40E_VSI_TO_HW(rxq->vsi);\n \tstruct rte_eth_dev_data *data = pf->dev_data;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv =\n-\t\t\trte_mempool_get_priv(rxq->mp);\n-\tuint16_t buf_size = (uint16_t)(mbp_priv->mbuf_data_room_size -\n-\t\t\t\t\t\tRTE_PKTMBUF_HEADROOM);\n-\tuint16_t len;\n+\tuint16_t buf_size, len;\n+\n+\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -\n+\t\tRTE_PKTMBUF_HEADROOM);\n \n \tswitch (pf->flags & (I40E_FLAG_HEADER_SPLIT_DISABLED |\n \t\t\tI40E_FLAG_HEADER_SPLIT_ENABLED)) {\n@@ -2506,7 +2505,6 @@ i40e_rx_queue_init(struct i40e_rx_queue *rxq)\n \tuint16_t pf_q = rxq->reg_idx;\n \tuint16_t buf_size;\n \tstruct i40e_hmc_obj_rxq rx_ctx;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \n \terr = i40e_rx_queue_config(rxq);\n \tif (err < 0) {\n@@ -2553,9 +2551,8 @@ i40e_rx_queue_init(struct i40e_rx_queue *rxq)\n \n \trxq->qrx_tail = hw->hw_addr + I40E_QRX_TAIL(pf_q);\n \n-\tmbp_priv = rte_mempool_get_priv(rxq->mp);\n-\tbuf_size = (uint16_t)(mbp_priv->mbuf_data_room_size -\n-\t\t\t\t\tRTE_PKTMBUF_HEADROOM);\n+\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -\n+\t\tRTE_PKTMBUF_HEADROOM);\n \n \t/* Check if scattered RX needs to be used. */\n \tif ((rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) {\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\nindex 3c61d1c..7f15f15 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n@@ -4203,7 +4203,6 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct ixgbe_rx_queue *rxq;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tuint64_t bus_addr;\n \tuint32_t rxctrl;\n \tuint32_t fctrl;\n@@ -4320,9 +4319,8 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)\n \t\t * The value is in 1 KB resolution. Valid values can be from\n \t\t * 1 KB to 16 KB.\n \t\t */\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mb_pool);\n-\t\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t\t\t\t RTE_PKTMBUF_HEADROOM);\n+\t\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) -\n+\t\t\tRTE_PKTMBUF_HEADROOM);\n \t\tsrrctl |= ((buf_size >> IXGBE_SRRCTL_BSIZEPKT_SHIFT) &\n \t\t\t IXGBE_SRRCTL_BSIZEPKT_MASK);\n \n@@ -4738,7 +4736,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct ixgbe_rx_queue *rxq;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tuint64_t bus_addr;\n \tuint32_t srrctl, psrtype = 0;\n \tuint16_t buf_size;\n@@ -4825,9 +4822,8 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)\n \t\t * The value is in 1 KB resolution. Valid values can be from\n \t\t * 1 KB to 16 KB.\n \t\t */\n-\t\tmbp_priv = rte_mempool_get_priv(rxq->mb_pool);\n-\t\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t\t\t\t RTE_PKTMBUF_HEADROOM);\n+\t\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) -\n+\t\t\tRTE_PKTMBUF_HEADROOM);\n \t\tsrrctl |= ((buf_size >> IXGBE_SRRCTL_BSIZEPKT_SHIFT) &\n \t\t\t IXGBE_SRRCTL_BSIZEPKT_MASK);\n \ndiff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c\nindex e5d2279..e1aea34 100644\n--- a/lib/librte_pmd_pcap/rte_eth_pcap.c\n+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c\n@@ -136,9 +136,7 @@ eth_pcap_rx(void *queue,\n \tconst u_char *packet;\n \tstruct rte_mbuf *mbuf;\n \tstruct pcap_rx_queue *pcap_q = queue;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tuint16_t num_rx = 0;\n-\tuint16_t buf_size;\n \n \tif (unlikely(pcap_q->pcap == NULL || nb_pkts == 0))\n \t\treturn 0;\n@@ -157,8 +155,7 @@ eth_pcap_rx(void *queue,\n \t\t\tbreak;\n \n \t\t/* Now get the space available for data in the mbuf */\n-\t\tmbp_priv = rte_mempool_get_priv(pcap_q->mb_pool);\n-\t\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n+\t\tbuf_size = (uint16_t)(rte_pktmbuf_data_room_size(pcap_q->mb_pool) -\n \t\t\t\tRTE_PKTMBUF_HEADROOM);\n \n \t\tif (header.len <= buf_size) {\ndiff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c\nindex a530c80..d8019f5 100644\n--- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c\n+++ b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c\n@@ -838,14 +838,11 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \tuint8_t i;\n \tchar mem_name[32];\n \tuint16_t buf_size;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\tmbp_priv = (struct rte_pktmbuf_pool_private *)\n-\t\trte_mempool_get_priv(mp);\n-\tbuf_size = (uint16_t) (mbp_priv->mbuf_data_room_size -\n-\t\t\t RTE_PKTMBUF_HEADROOM);\n+\tbuf_size = rte_pktmbuf_data_room_size(mp) -\n+\t\tRTE_PKTMBUF_HEADROOM;\n \n \tif (dev->data->dev_conf.rxmode.max_rx_pkt_len > buf_size) {\n \t\tPMD_INIT_LOG(ERR, \"buf_size = %u, max_pkt_len = %u, \"\n", "prefixes": [ "dpdk-dev", "v4", "03/12" ] }