From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
To: Thomas Monjalon <thomas@monjalon.net>,
Ferruh Yigit <ferruh.yigit@amd.com>
Cc: dev@dpdk.org
Subject: [PATCH v7 1/4] ethdev: factor out helper function to check Rx mempool
Date: Fri, 7 Oct 2022 17:37:20 +0300 [thread overview]
Message-ID: <20221007143723.3204575-2-andrew.rybchenko@oktetlabs.ru> (raw)
In-Reply-To: <20221007143723.3204575-1-andrew.rybchenko@oktetlabs.ru>
Avoid Rx mempool checks duplication logic.
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
lib/ethdev/rte_ethdev.c | 82 +++++++++++++++++++++--------------------
1 file changed, 42 insertions(+), 40 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 01fac713a2..b3dba291e7 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -1648,6 +1648,36 @@ rte_eth_dev_is_removed(uint16_t port_id)
return ret;
}
+static int
+rte_eth_check_rx_mempool(struct rte_mempool *mp, uint16_t offset,
+ uint16_t min_length)
+{
+ uint16_t data_room_size;
+
+ /*
+ * Check the size of the mbuf data buffer, this value
+ * must be provided in the private data of the memory pool.
+ * First check that the memory pool(s) has a valid private data.
+ */
+ if (mp->private_data_size <
+ sizeof(struct rte_pktmbuf_pool_private)) {
+ RTE_ETHDEV_LOG(ERR, "%s private_data_size %u < %u\n",
+ mp->name, mp->private_data_size,
+ (unsigned int)
+ sizeof(struct rte_pktmbuf_pool_private));
+ return -ENOSPC;
+ }
+ data_room_size = rte_pktmbuf_data_room_size(mp);
+ if (data_room_size < offset + min_length) {
+ RTE_ETHDEV_LOG(ERR,
+ "%s mbuf_data_room_size %u < %u (%u + %u)\n",
+ mp->name, data_room_size,
+ offset + min_length, offset, min_length);
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
rte_eth_rx_queue_check_split(const struct rte_eth_rxseg_split *rx_seg,
uint16_t n_seg, uint32_t *mbp_buf_size,
@@ -1657,6 +1687,7 @@ rte_eth_rx_queue_check_split(const struct rte_eth_rxseg_split *rx_seg,
struct rte_mempool *mp_first;
uint32_t offset_mask;
uint16_t seg_idx;
+ int ret;
if (n_seg > seg_capa->max_nseg) {
RTE_ETHDEV_LOG(ERR,
@@ -1696,25 +1727,14 @@ rte_eth_rx_queue_check_split(const struct rte_eth_rxseg_split *rx_seg,
return -EINVAL;
}
}
- if (mpl->private_data_size <
- sizeof(struct rte_pktmbuf_pool_private)) {
- RTE_ETHDEV_LOG(ERR,
- "%s private_data_size %u < %u\n",
- mpl->name, mpl->private_data_size,
- (unsigned int)sizeof
- (struct rte_pktmbuf_pool_private));
- return -ENOSPC;
- }
+
offset += seg_idx != 0 ? 0 : RTE_PKTMBUF_HEADROOM;
*mbp_buf_size = rte_pktmbuf_data_room_size(mpl);
length = length != 0 ? length : *mbp_buf_size;
- if (*mbp_buf_size < length + offset) {
- RTE_ETHDEV_LOG(ERR,
- "%s mbuf_data_room_size %u < %u (segment length=%u + segment offset=%u)\n",
- mpl->name, *mbp_buf_size,
- length + offset, length, offset);
- return -EINVAL;
- }
+
+ ret = rte_eth_check_rx_mempool(mpl, offset, length);
+ if (ret != 0)
+ return ret;
}
return 0;
}
@@ -1753,31 +1773,13 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
"Ambiguous segment configuration\n");
return -EINVAL;
}
- /*
- * Check the size of the mbuf data buffer, this value
- * must be provided in the private data of the memory pool.
- * First check that the memory pool(s) has a valid private data.
- */
- if (mp->private_data_size <
- sizeof(struct rte_pktmbuf_pool_private)) {
- RTE_ETHDEV_LOG(ERR, "%s private_data_size %u < %u\n",
- mp->name, mp->private_data_size,
- (unsigned int)
- sizeof(struct rte_pktmbuf_pool_private));
- return -ENOSPC;
- }
+
+ ret = rte_eth_check_rx_mempool(mp, RTE_PKTMBUF_HEADROOM,
+ dev_info.min_rx_bufsize);
+ if (ret != 0)
+ return ret;
+
mbp_buf_size = rte_pktmbuf_data_room_size(mp);
- if (mbp_buf_size < dev_info.min_rx_bufsize +
- RTE_PKTMBUF_HEADROOM) {
- RTE_ETHDEV_LOG(ERR,
- "%s mbuf_data_room_size %u < %u (RTE_PKTMBUF_HEADROOM=%u + min_rx_bufsize(dev)=%u)\n",
- mp->name, mbp_buf_size,
- RTE_PKTMBUF_HEADROOM +
- dev_info.min_rx_bufsize,
- RTE_PKTMBUF_HEADROOM,
- dev_info.min_rx_bufsize);
- return -EINVAL;
- }
} else {
const struct rte_eth_rxseg_split *rx_seg;
uint16_t n_seg;
--
2.30.2
next prev parent reply other threads:[~2022-10-07 14:37 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 10:46 [PATCH v1 1/1] ethdev: introduce pool sort capability Hanumanth Pothula
2022-08-12 13:27 ` Morten Brørup
2022-08-12 17:24 ` [PATCH v2 1/3] " Hanumanth Pothula
2022-08-12 17:24 ` [PATCH v2 2/3] app/testpmd: add command line argument 'rxseg-mode' Hanumanth Pothula
2022-08-12 17:24 ` [PATCH v2 3/3] net/cnxk: introduce pool sort capability Hanumanth Pothula
2022-08-23 3:26 ` [PATCH v2 1/3] ethdev: " Ding, Xuan
2022-08-24 15:33 ` Ferruh Yigit
2022-08-30 12:08 ` [EXT] " Hanumanth Reddy Pothula
2022-09-06 12:18 ` Ferruh Yigit
2022-09-07 7:02 ` Hanumanth Reddy Pothula
2022-09-07 11:24 ` Ferruh Yigit
2022-09-07 21:31 ` Hanumanth Reddy Pothula
2022-09-13 9:28 ` Ferruh Yigit
2022-09-13 10:00 ` Hanumanth Reddy Pothula
2022-09-02 7:00 ` [PATCH v3 " Hanumanth Pothula
2022-09-02 7:00 ` [PATCH v3 2/3] app/testpmd: Add support for " Hanumanth Pothula
2022-09-02 7:00 ` [PATCH v3 3/3] net/cnxk: introduce " Hanumanth Pothula
2022-09-13 8:06 ` [PATCH v3 1/3] ethdev: " Andrew Rybchenko
2022-09-13 9:31 ` Ferruh Yigit
2022-09-13 10:41 ` [EXT] " Hanumanth Reddy Pothula
2022-09-15 7:07 ` [PATCH v4 1/3] ethdev: Add support for mulitiple mbuf pools per Rx queue Hanumanth Pothula
2022-09-15 7:07 ` [PATCH v4 2/3] app/testpmd: " Hanumanth Pothula
2022-09-15 7:07 ` [PATCH v4 3/3] net/cnxk: Add support for mulitiple mbuf pools Hanumanth Pothula
2022-09-28 9:43 ` [PATCH v4 1/3] ethdev: Add support for mulitiple mbuf pools per Rx queue Andrew Rybchenko
2022-09-28 11:06 ` Thomas Monjalon
2022-10-06 17:01 ` [PATCH v5 1/3] ethdev: support " Hanumanth Pothula
2022-10-06 17:01 ` [PATCH v5 2/3] net/cnxk: " Hanumanth Pothula
2022-10-06 17:01 ` [PATCH v5 3/3] app/testpmd: " Hanumanth Pothula
2022-10-06 17:29 ` [PATCH v5 1/3] ethdev: " Stephen Hemminger
2022-10-07 14:13 ` Andrew Rybchenko
2022-10-06 17:53 ` [PATCH v6 " Hanumanth Pothula
2022-10-06 17:53 ` [PATCH v6 2/3] net/cnxk: " Hanumanth Pothula
2022-10-06 17:53 ` [PATCH v6 3/3] app/testpmd: " Hanumanth Pothula
2022-10-06 18:14 ` [PATCH v6 1/3] ethdev: " Hanumanth Reddy Pothula
2022-10-07 14:37 ` [PATCH v7 0/4] " Andrew Rybchenko
2022-10-07 14:37 ` Andrew Rybchenko [this message]
2022-10-07 14:37 ` [PATCH v7 2/4] " Andrew Rybchenko
2022-10-07 16:08 ` Thomas Monjalon
2022-10-07 16:18 ` Stephen Hemminger
2022-10-07 16:20 ` Stephen Hemminger
2022-10-07 16:33 ` Andrew Rybchenko
2022-10-07 17:30 ` Andrew Rybchenko
2022-10-07 14:37 ` [PATCH v7 3/4] net/cnxk: " Andrew Rybchenko
2022-10-07 14:37 ` [PATCH v7 4/4] app/testpmd: " Andrew Rybchenko
2022-10-07 17:29 ` [PATCH v8 0/4] ethdev: " Andrew Rybchenko
2022-10-07 17:29 ` [PATCH v8 1/4] ethdev: factor out helper function to check Rx mempool Andrew Rybchenko
2022-10-07 17:29 ` [PATCH v8 2/4] ethdev: support multiple mbuf pools per Rx queue Andrew Rybchenko
2022-10-07 18:35 ` Thomas Monjalon
2022-10-07 19:45 ` Andrew Rybchenko
2022-10-07 17:29 ` [PATCH v8 3/4] net/cnxk: support mulitiple " Andrew Rybchenko
2022-10-07 17:29 ` [PATCH v8 4/4] app/testpmd: " Andrew Rybchenko
[not found] ` <PH0PR18MB47500560DC1793F68E7312DDCB5F9@PH0PR18MB4750.namprd18.prod.outlook.com>
2022-10-07 19:43 ` [EXT] " Andrew Rybchenko
2022-10-07 19:56 ` Hanumanth Reddy Pothula
2022-10-17 8:48 ` [PATCH v9 1/1] " Hanumanth Pothula
2022-10-21 15:57 ` Singh, Aman Deep
2022-10-24 3:32 ` [EXT] " Hanumanth Reddy Pothula
2022-10-24 4:07 ` [PATCH v10 1/1] app/testpmd: support multiple " Hanumanth Pothula
2022-10-25 1:40 ` [PATCH v11 " Hanumanth Pothula
2022-11-01 14:13 ` Hanumanth Reddy Pothula
2022-11-03 12:15 ` Singh, Aman Deep
2022-11-03 12:36 ` [EXT] " Hanumanth Reddy Pothula
2022-11-03 15:20 ` Singh, Aman Deep
2022-11-04 15:38 ` Hanumanth Reddy Pothula
2022-11-07 5:31 ` [PATCH v12 " Hanumanth Pothula
2022-11-09 8:04 ` Singh, Aman Deep
2022-11-09 10:39 ` Andrew Rybchenko
2022-11-10 6:51 ` Andrew Rybchenko
2022-11-10 8:17 ` [PATCH v13 " Hanumanth Pothula
2022-11-10 9:01 ` Andrew Rybchenko
2022-11-10 9:31 ` [EXT] " Hanumanth Reddy Pothula
2022-11-10 10:16 ` [PATCH v14 " Hanumanth Pothula
2022-11-10 10:47 ` Andrew Rybchenko
2022-11-17 8:43 ` Jiang, YuX
2022-11-17 11:38 ` Hanumanth Reddy Pothula
2022-10-08 20:38 ` [PATCH v8 0/4] ethdev: support mulitiple " Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221007143723.3204575-2-andrew.rybchenko@oktetlabs.ru \
--to=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).