From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <arybchenko@solarflare.com>
Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com
[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id CE6F31B00B
for <dev@dpdk.org>; Tue, 23 Jan 2018 14:16:53 +0100 (CET)
X-Virus-Scanned: Proofpoint Essentials engine
Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26])
(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id
E3CB5BC005E; Tue, 23 Jan 2018 13:16:52 +0000 (UTC)
Received: from ocex03.SolarFlarecom.com (10.20.40.36) by
ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id
15.0.1044.25; Tue, 23 Jan 2018 05:16:49 -0800
Received: from opal.uk.solarflarecom.com (10.17.10.1) by
ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id
15.0.1044.25 via Frontend Transport; Tue, 23 Jan 2018 05:16:49 -0800
Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com
[10.17.10.10])
by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id w0NDGm4s006418;
Tue, 23 Jan 2018 13:16:48 GMT
Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1])
by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id w0NDGleh010689;
Tue, 23 Jan 2018 13:16:48 GMT
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
CC: Olivier Matz <olivier.matz@6wind.com>, Santosh Shukla
<santosh.shukla@caviumnetworks.com>, Jerin Jacob
<jerin.jacob@caviumnetworks.com>
Date: Tue, 23 Jan 2018 13:16:03 +0000
Message-ID: <1516713372-10572-9-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.2.3
In-Reply-To: <1516713372-10572-1-git-send-email-arybchenko@solarflare.com>
References: <1511539591-20966-1-git-send-email-arybchenko@solarflare.com>
<1516713372-10572-1-git-send-email-arybchenko@solarflare.com>
MIME-Version: 1.0
Content-Type: text/plain
X-MDID: 1516713412-hr7u59KBl+Ln
Subject: [dpdk-dev] [RFC v2 08/17] mempool/octeontx: prepare to remove
register memory area op
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<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: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jan 2018 13:16:54 -0000
Callback to populate pool objects has all required information and
executed a bit later than register memory area callback.
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/mempool/octeontx/rte_mempool_octeontx.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx.c b/drivers/mempool/octeontx/rte_mempool_octeontx.c
index 36cc23b..8700bfb 100644
--- a/drivers/mempool/octeontx/rte_mempool_octeontx.c
+++ b/drivers/mempool/octeontx/rte_mempool_octeontx.c
@@ -151,26 +151,15 @@ octeontx_fpavf_calc_mem_size(const struct rte_mempool *mp,
}
static int
-octeontx_fpavf_register_memory_area(const struct rte_mempool *mp,
- char *vaddr, rte_iova_t paddr, size_t len)
-{
- RTE_SET_USED(paddr);
- uint8_t gpool;
- uintptr_t pool_bar;
-
- gpool = octeontx_fpa_bufpool_gpool(mp->pool_id);
- pool_bar = mp->pool_id & ~(uint64_t)FPA_GPOOL_MASK;
-
- return octeontx_fpavf_pool_set_range(pool_bar, len, vaddr, gpool);
-}
-
-static int
octeontx_fpavf_populate(struct rte_mempool *mp, unsigned int max_objs,
void *vaddr, rte_iova_t iova, size_t len,
rte_mempool_populate_obj_cb_t *obj_cb)
{
size_t total_elt_sz;
size_t off;
+ uint8_t gpool;
+ uintptr_t pool_bar;
+ int ret;
if (iova == RTE_BAD_IOVA)
return -EINVAL;
@@ -187,6 +176,13 @@ octeontx_fpavf_populate(struct rte_mempool *mp, unsigned int max_objs,
iova += off;
len -= off;
+ gpool = octeontx_fpa_bufpool_gpool(mp->pool_id);
+ pool_bar = mp->pool_id & ~(uint64_t)FPA_GPOOL_MASK;
+
+ ret = octeontx_fpavf_pool_set_range(pool_bar, len, vaddr, gpool);
+ if (ret < 0)
+ return ret;
+
return rte_mempool_populate_one_by_one(mp, max_objs, vaddr, iova, len,
obj_cb);
}
@@ -198,7 +194,6 @@ static struct rte_mempool_ops octeontx_fpavf_ops = {
.enqueue = octeontx_fpavf_enqueue,
.dequeue = octeontx_fpavf_dequeue,
.get_count = octeontx_fpavf_get_count,
- .register_memory_area = octeontx_fpavf_register_memory_area,
.calc_mem_size = octeontx_fpavf_calc_mem_size,
.populate = octeontx_fpavf_populate,
};
--
2.7.4