From patchwork Fri Oct 7 17:29:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 117576 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3B797A00C4; Fri, 7 Oct 2022 19:29:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8337C42685; Fri, 7 Oct 2022 19:29:25 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 5276140151 for ; Fri, 7 Oct 2022 19:29:24 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id 11B3A92; Fri, 7 Oct 2022 20:29:24 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.6 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id C70557D; Fri, 7 Oct 2022 20:29:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru C70557D Authentication-Results: shelob.oktetlabs.ru/C70557D; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Thomas Monjalon , Ferruh Yigit Cc: dev@dpdk.org Subject: [PATCH v8 1/4] ethdev: factor out helper function to check Rx mempool Date: Fri, 7 Oct 2022 20:29:18 +0300 Message-Id: <20221007172921.3325250-2-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221007172921.3325250-1-andrew.rybchenko@oktetlabs.ru> References: <20221006170126.1322852-1-hpothula@marvell.com> <20221007172921.3325250-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Avoid Rx mempool checks duplication logic. Signed-off-by: Andrew Rybchenko --- 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;