From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 962DBA0C43;
Mon, 18 Oct 2021 12:02:21 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id DFA16410F2;
Mon, 18 Oct 2021 12:02:15 +0200 (CEST)
Received: from AZHDRRW-EX01.nvidia.com (azhdrrw-ex01.nvidia.com
[20.51.104.162]) by mails.dpdk.org (Postfix) with ESMTP id 1D03D410E1
for <dev@dpdk.org>; Mon, 18 Oct 2021 12:02:14 +0200 (CEST)
Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106)
by mxs.oss.nvidia.com (10.13.234.36) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.858.15; Mon, 18 Oct 2021 03:02:13 -0700
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=BdsJiYKxoLQ5MvUonsuK0qdBpT//qD/mIEsl4Zr0jL4apT8gJIloIv3gwpqU/GrqlgiB7l5eOjdXiNQiX41FyYvcN5qmCRffhZk136TQj/nwnrZIGuneX6UOz1M7ILYlHM7hsh6jo4exWRAEdhxd7loXmTJ9lbgELnLBMy6Bm6MTKdkQcDXQKZBJexPw3AiaceupfLd6kQZU/yFdvJdixLab34VERZXmo4w9IbakMl3BHaPtwVEm80OXlMNpwWSoF3Qifvw6eEK+ezuKtoTBvWdsI3bIX14VOLK+iGixP+iuz5BgSdt8H1FtlTd58Lt4qxGqqusTXUlsYyffdj4gIw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=OdNLSGdqrrQL2AH2gNrgfS9RFmaJwNKGr8gyGFXQj10=;
b=l1jcgafxA9LYvBIh5b1G6MWsHjcWGr9Dy7gIketBpdofa8ttzod/zdz0pd5AFvn0bbcMEugfEL12+Bcp+Jc02OU3nQmUWo2q+zrnVldDp+bSlEyOHpQ1S3uoLLA7H3KV7fDy3lR1Q72ebATaQkje90nY1nOM082ozs8b0M/XLQSY5hoK/vK3m4GJnJYq0W6S0Hmc9Je2Yg71EJu4Ry1UU5Y9HuBvmm7J3nnoWOh92F1CpfiwHl0o1w09W/Fi5+lCvBn8GjEtObdRSGdZQ/eiw72jo8n458IwcBTTEViCb1Z59BTGweRztOUVHF0tswkSVlp8he1ZFqvvzQABOblBHw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com;
dmarc=pass (p=quarantine sp=quarantine pct=100) action=none
header.from=nvidia.com; dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=OdNLSGdqrrQL2AH2gNrgfS9RFmaJwNKGr8gyGFXQj10=;
b=WO+CGai9LM8xQX4Fd58pmOwigsYIgBa5j8JeFhx7P3FbKNkBLNWaNFkpPbvVl/zChWmzd+0tzXeMWVfV/kZmuaYrTjWyebty8UeyZ2qhacrAsnqmO8hL1/VTGvpWwkeZjXYywqS3EwRWRnPvnb4v2zGrq0AdiBqBxGk4ONGEQHXxf5zbnKNnieBoolDSsHsWLJCurISug6bOdFBbXY1Cd+ggleXhxwUOcjqRY5iPdRlKfrwkxgOd0ErR56cVYRjVvKLWEgKX90IXKAmSxjsowb0NHjnFodN0wHLpq9l7MLkQqVCSqzva/F29dpYV0glBXqJsv3kmyf/XdBAPfcbtQg==
Received: from MW3PR06CA0010.namprd06.prod.outlook.com (2603:10b6:303:2a::15)
by CY4PR12MB1448.namprd12.prod.outlook.com (2603:10b6:910:f::12) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Mon, 18 Oct
2021 10:02:10 +0000
Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com
(2603:10b6:303:2a:cafe::ae) by MW3PR06CA0010.outlook.office365.com
(2603:10b6:303:2a::15) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend
Transport; Mon, 18 Oct 2021 10:02:10 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed)
header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 10:02:09 +0000
Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 18 Oct
2021 10:02:06 +0000
From: Dmitry Kozlyuk <dkozlyuk@oss.nvidia.com>
To: <dev@dpdk.org>
CC: David Marchand <david.marchand@redhat.com>, Matan Azrad
<matan@oss.nvidia.com>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
"Maryam Tahhan" <maryam.tahhan@intel.com>, Reshma Pattan
<reshma.pattan@intel.com>, Olivier Matz <olivier.matz@6wind.com>
Date: Mon, 18 Oct 2021 13:01:39 +0300
Message-ID: <20211018100141.3290956-3-dkozlyuk@nvidia.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20211018100141.3290956-1-dkozlyuk@nvidia.com>
References: <20211016200046.3176642-1-dkozlyuk@nvidia.com>
<20211018100141.3290956-1-dkozlyuk@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.187.6]
X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 6cef74e5-a5a5-47d7-e775-08d9921e59a2
X-MS-TrafficTypeDiagnostic: CY4PR12MB1448:
X-Microsoft-Antispam-PRVS: <CY4PR12MB1448272C9CD8D3EB6675BED3B9BC9@CY4PR12MB1448.namprd12.prod.outlook.com>
X-MS-Exchange-Transport-Forked: True
X-MS-Oob-TLC-OOBClassifiers: OLM:741;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: QpAKjNqtHTP+VCA6d2jBSRF3YSkiEqrw5BGrVf5sJ9kNCTC8xPJWbax/m5JEdHHtmuZGaBxe106yWdOTV9snQVKv98G6GTsFfVN9IMmjLbfK3wVBkW2dHMDgPrQt248cJg6XFo9X8agywk5uDMLQ3GqhLC5gyeV7RdtjTVVs+9hrid8pdEKTA5rdWG/UXreIQcpJYQfJXhKP14gLJZzZ+uKxlhORXut0bF1VVVbCn9QAn2DIwLbwwfHLOBDEJ9HZUI4JsCU2B4uachip863w1eRYdBTW0PRjvvNmS7ywEeDw6hRhM853m7ivltDBGLfUTQP6kAoOYhMb7PSsEKLm+9B//VKy09gahemE25HDneIifaJ2x2Tm6jR9SUDGVM1e8siouoPbo4RIEYkNLoKfJ8ZMV0GV1Wp41B6jnrbTROKt4KohFl1Uku9Ldz5vOJRXiE6oxqMaGScQD9ZVbuz+aDf2I/pffQtH1jDhUoBaU5WHobJtSSFeuEnC46KJdoUvgMiyw1txlEAz6OhFoZcJIj5oSSJzoguznubrwdDpK9kuj6zCzaIsDFtT33h01QRsxxpqTPyp701uFdqfQebQ/HYqBL229tvg0j4yvl0pu2GE1aYrhIMkPBY+90aCFxYql9kd/f2OOmoZ3H4TyJI5oZNgErbd1hLMfcVWDa2iLp9BGRdVaYQGF6ZujRTkxPxnp5OvY1sj/BaD9wt3Bi3x+JToAQmOFj/fVaL871NCkn0gO1F9dDtRnMIBoLbj9d7Msc+yEdc4bMPMsX+HD/IxuvwlEO8Qw006LXCUZhLomK4=
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(46966006)(36840700001)(47076005)(356005)(86362001)(2906002)(7636003)(5660300002)(36906005)(36860700001)(26005)(82310400003)(83380400001)(6286002)(6666004)(107886003)(1076003)(6916009)(4326008)(8936002)(70586007)(2616005)(36756003)(55016002)(426003)(8676002)(70206006)(336012)(186003)(316002)(16526019)(54906003)(7696005)(966005)(508600001);
DIR:OUT; SFP:1101;
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 10:02:09.7779 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 6cef74e5-a5a5-47d7-e775-08d9921e59a2
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1448
Subject: [dpdk-dev] [PATCH v7 2/4] mempool: add non-IO flag
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Mempool is a generic allocator that is not necessarily used
for device IO operations and its memory for DMA.
Add MEMPOOL_F_NON_IO flag to mark such mempools automatically
a) if their objects are not contiguous;
b) if IOVA is not available for any object.
Other components can inspect this flag
in order to optimize their memory management.
Discussion: https://mails.dpdk.org/archives/dev/2021-August/216654.html
Signed-off-by: Dmitry Kozlyuk <dkozlyuk@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
app/proc-info/main.c | 6 +-
app/test/test_mempool.c | 112 +++++++++++++++++++++++++
doc/guides/rel_notes/release_21_11.rst | 3 +
lib/mempool/rte_mempool.c | 10 +++
lib/mempool/rte_mempool.h | 2 +
5 files changed, 131 insertions(+), 2 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index a8e928fa9f..8ec9cadd79 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -1295,7 +1295,8 @@ show_mempool(char *name)
"\t -- No cache align (%c)\n"
"\t -- SP put (%c), SC get (%c)\n"
"\t -- Pool created (%c)\n"
- "\t -- No IOVA config (%c)\n",
+ "\t -- No IOVA config (%c)\n"
+ "\t -- Not used for IO (%c)\n",
ptr->name,
ptr->socket_id,
(flags & MEMPOOL_F_NO_SPREAD) ? 'y' : 'n',
@@ -1303,7 +1304,8 @@ show_mempool(char *name)
(flags & MEMPOOL_F_SP_PUT) ? 'y' : 'n',
(flags & MEMPOOL_F_SC_GET) ? 'y' : 'n',
(flags & MEMPOOL_F_POOL_CREATED) ? 'y' : 'n',
- (flags & MEMPOOL_F_NO_IOVA_CONTIG) ? 'y' : 'n');
+ (flags & MEMPOOL_F_NO_IOVA_CONTIG) ? 'y' : 'n',
+ (flags & MEMPOOL_F_NON_IO) ? 'y' : 'n');
printf(" - Size %u Cache %u element %u\n"
" - header %u trailer %u\n"
" - private data size %u\n",
diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index c39c83256e..9136e17374 100644
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -12,6 +12,7 @@
#include <sys/queue.h>
#include <rte_common.h>
+#include <rte_eal_paging.h>
#include <rte_log.h>
#include <rte_debug.h>
#include <rte_errno.h>
@@ -729,6 +730,109 @@ test_mempool_events_safety(void)
#pragma pop_macro("RTE_TEST_TRACE_FAILURE")
}
+#pragma push_macro("RTE_TEST_TRACE_FAILURE")
+#undef RTE_TEST_TRACE_FAILURE
+#define RTE_TEST_TRACE_FAILURE(...) do { \
+ ret = TEST_FAILED; \
+ goto exit; \
+ } while (0)
+
+static int
+test_mempool_flag_non_io_set_when_no_iova_contig_set(void)
+{
+ struct rte_mempool *mp = NULL;
+ int ret;
+
+ mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE, 0, 0,
+ SOCKET_ID_ANY, MEMPOOL_F_NO_IOVA_CONTIG);
+ RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
+ rte_strerror(rte_errno));
+ rte_mempool_set_ops_byname(mp, rte_mbuf_best_mempool_ops(), NULL);
+ ret = rte_mempool_populate_default(mp);
+ RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s",
+ rte_strerror(rte_errno));
+ RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO,
+ "NON_IO flag is not set when NO_IOVA_CONTIG is set");
+ ret = TEST_SUCCESS;
+exit:
+ rte_mempool_free(mp);
+ return ret;
+}
+
+static int
+test_mempool_flag_non_io_unset_when_populated_with_valid_iova(void)
+{
+ const struct rte_memzone *mz;
+ void *virt;
+ rte_iova_t iova;
+ size_t page_size = RTE_PGSIZE_2M;
+ struct rte_mempool *mp = NULL;
+ int ret;
+
+ mz = rte_memzone_reserve("test_mempool", 3 * page_size, SOCKET_ID_ANY,
+ RTE_MEMZONE_IOVA_CONTIG);
+ RTE_TEST_ASSERT_NOT_NULL(mz, "Cannot allocate memory");
+ virt = mz->addr;
+ iova = rte_mem_virt2iova(virt);
+ RTE_TEST_ASSERT_NOT_EQUAL(iova, RTE_BAD_IOVA, "Cannot get IOVA");
+ mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE, 0, 0,
+ SOCKET_ID_ANY, 0);
+ RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
+ rte_strerror(rte_errno));
+
+ ret = rte_mempool_populate_iova(mp, RTE_PTR_ADD(virt, 1 * page_size),
+ RTE_BAD_IOVA, page_size, NULL, NULL);
+ RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s",
+ rte_strerror(rte_errno));
+ RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO,
+ "NON_IO flag is not set when mempool is populated with only RTE_BAD_IOVA");
+
+ ret = rte_mempool_populate_iova(mp, virt, iova, page_size, NULL, NULL);
+ RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s",
+ rte_strerror(rte_errno));
+ RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO),
+ "NON_IO flag is not unset when mempool is populated with valid IOVA");
+
+ ret = rte_mempool_populate_iova(mp, RTE_PTR_ADD(virt, 2 * page_size),
+ RTE_BAD_IOVA, page_size, NULL, NULL);
+ RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s",
+ rte_strerror(rte_errno));
+ RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO),
+ "NON_IO flag is set even when some objects have valid IOVA");
+ ret = TEST_SUCCESS;
+
+exit:
+ rte_mempool_free(mp);
+ rte_memzone_free(mz);
+ return ret;
+}
+
+static int
+test_mempool_flag_non_io_unset_by_default(void)
+{
+ struct rte_mempool *mp;
+ int ret;
+
+ mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE, 0, 0,
+ SOCKET_ID_ANY, 0);
+ RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
+ rte_strerror(rte_errno));
+ ret = rte_mempool_populate_default(mp);
+ RTE_TEST_ASSERT_EQUAL(ret, (int)mp->size, "Failed to populate mempool: %s",
+ rte_strerror(rte_errno));
+ RTE_TEST_ASSERT(!(mp->flags & MEMPOOL_F_NON_IO),
+ "NON_IO flag is set by default");
+ ret = TEST_SUCCESS;
+exit:
+ rte_mempool_free(mp);
+ return ret;
+}
+
+#pragma pop_macro("RTE_TEST_TRACE_FAILURE")
+
static int
test_mempool(void)
{
@@ -914,6 +1018,14 @@ test_mempool(void)
if (test_mempool_events_safety() < 0)
GOTO_ERR(ret, err);
+ /* test NON_IO flag inference */
+ if (test_mempool_flag_non_io_unset_by_default() < 0)
+ GOTO_ERR(ret, err);
+ if (test_mempool_flag_non_io_set_when_no_iova_contig_set() < 0)
+ GOTO_ERR(ret, err);
+ if (test_mempool_flag_non_io_unset_when_populated_with_valid_iova() < 0)
+ GOTO_ERR(ret, err);
+
rte_mempool_list_dump(stdout);
ret = 0;
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 4c56cdfeaa..39a8a3d950 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -229,6 +229,9 @@ API Changes
the crypto/security operation. This field will be used to communicate
events such as soft expiry with IPsec in lookaside mode.
+* mempool: Added ``MEMPOOL_F_NON_IO`` flag to give a hint to DPDK components
+ that objects from this pool will not be used for device IO (e.g. DMA).
+
ABI Changes
-----------
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 8810d08ab5..7d7d97d85d 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -372,6 +372,10 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
STAILQ_INSERT_TAIL(&mp->mem_list, memhdr, next);
mp->nb_mem_chunks++;
+ /* At least some objects in the pool can now be used for IO. */
+ if (iova != RTE_BAD_IOVA)
+ mp->flags &= ~MEMPOOL_F_NON_IO;
+
/* Report the mempool as ready only when fully populated. */
if (mp->populated_size >= mp->size)
mempool_event_callback_invoke(RTE_MEMPOOL_EVENT_READY, mp);
@@ -851,6 +855,12 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
return NULL;
}
+ /*
+ * No objects in the pool can be used for IO until it's populated
+ * with at least some objects with valid IOVA.
+ */
+ flags |= MEMPOOL_F_NON_IO;
+
/* "no cache align" imply "no spread" */
if (flags & MEMPOOL_F_NO_CACHE_ALIGN)
flags |= MEMPOOL_F_NO_SPREAD;
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 5799d4a705..b2e20c8855 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -257,6 +257,8 @@ struct rte_mempool {
#define MEMPOOL_F_SC_GET 0x0008 /**< Default get is "single-consumer".*/
#define MEMPOOL_F_POOL_CREATED 0x0010 /**< Internal: pool is created. */
#define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 /**< Don't need IOVA contiguous objs. */
+/** Internal: no object from the pool can be used for device IO (DMA). */
+#define MEMPOOL_F_NON_IO 0x0040
/**
* @internal When debug is enabled, store some statistics.
--
2.25.1