* [dpdk-dev] [PATCH 1/2] common/mlx5: add memory reclaim glue function
2020-06-01 6:09 [dpdk-dev] [PATCH 0/2] net/mlx5: add reclaim memory mode devarg Suanming Mou
@ 2020-06-01 6:09 ` Suanming Mou
2020-06-01 6:09 ` [dpdk-dev] [PATCH 2/2] net/mlx5: add reclaim memory mode devarg Suanming Mou
2020-06-03 11:35 ` [dpdk-dev] [PATCH 0/2] " Raslan Darawsheh
2 siblings, 0 replies; 4+ messages in thread
From: Suanming Mou @ 2020-06-01 6:09 UTC (permalink / raw)
To: viacheslavo, matan; +Cc: rasland, dev
While flow destroyed, rdma-core may still cache some resources for more
efficiently flow recreate. In case the peak time that millions of flows
created and destroyed, the cached resources will be very huge.
Currently, rdma-core proivdes the new function to configure the flow
resources not to be cached. Add the memory reclaim function to avoid
too many resources be cached.
This is the first patch for the memory reclaim. A new devarg will be
added to PMD to support the reclaim can be configured.
Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
drivers/common/mlx5/Makefile | 5 +++++
drivers/common/mlx5/meson.build | 2 ++
drivers/common/mlx5/mlx5_glue.c | 13 +++++++++++++
drivers/common/mlx5/mlx5_glue.h | 1 +
4 files changed, 21 insertions(+)
diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile
index 0d8cc1b..0d761cf 100644
--- a/drivers/common/mlx5/Makefile
+++ b/drivers/common/mlx5/Makefile
@@ -193,6 +193,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
func mlx5dv_alloc_var \
$(AUTOCONF_OUTPUT)
$Q sh -- '$<' '$@' \
+ HAVE_MLX5DV_DR_MEM_RECLAIM \
+ infiniband/mlx5dv.h \
+ func mlx5dv_dr_domain_set_reclaim_device_memory \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
HAVE_ETHTOOL_LINK_MODE_25G \
/usr/include/linux/ethtool.h \
enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index 5a802ba..1ef040d 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -185,6 +185,8 @@ has_sym_args = [
'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
'mlx5dv_dump_dr_domain'],
+ [ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
+ 'mlx5dv_dr_domain_set_reclaim_device_memory'],
[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
]
config = configuration_data()
diff --git a/drivers/common/mlx5/mlx5_glue.c b/drivers/common/mlx5/mlx5_glue.c
index f270f67..e6d7ebe 100644
--- a/drivers/common/mlx5/mlx5_glue.c
+++ b/drivers/common/mlx5/mlx5_glue.c
@@ -1182,6 +1182,18 @@
#endif
}
+
+static void
+mlx5_glue_dr_reclaim_domain_memory(void *domain, uint32_t enable)
+{
+#ifdef HAVE_MLX5DV_DR_MEM_RECLAIM
+ mlx5dv_dr_domain_set_reclaim_device_memory(domain, enable);
+#else
+ (void)(enable);
+ (void)(domain);
+#endif
+}
+
__rte_cache_aligned
const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) {
.version = MLX5_GLUE_VERSION,
@@ -1281,6 +1293,7 @@
.devx_qp_query = mlx5_glue_devx_qp_query,
.devx_port_query = mlx5_glue_devx_port_query,
.dr_dump_domain = mlx5_glue_dr_dump_domain,
+ .dr_reclaim_domain_memory = mlx5_glue_dr_reclaim_domain_memory,
.devx_query_eqn = mlx5_glue_devx_query_eqn,
.devx_create_event_channel = mlx5_glue_devx_create_event_channel,
.devx_destroy_event_channel = mlx5_glue_devx_destroy_event_channel,
diff --git a/drivers/common/mlx5/mlx5_glue.h b/drivers/common/mlx5/mlx5_glue.h
index 81d6a22..5d238a4 100644
--- a/drivers/common/mlx5/mlx5_glue.h
+++ b/drivers/common/mlx5/mlx5_glue.h
@@ -302,6 +302,7 @@ struct mlx5_glue {
(struct mlx5dv_devx_event_channel *event_channel,
struct mlx5dv_devx_async_event_hdr *event_data,
size_t event_resp_len);
+ void (*dr_reclaim_domain_memory)(void *domain, uint32_t enable);
};
extern const struct mlx5_glue *mlx5_glue;
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH 2/2] net/mlx5: add reclaim memory mode devarg
2020-06-01 6:09 [dpdk-dev] [PATCH 0/2] net/mlx5: add reclaim memory mode devarg Suanming Mou
2020-06-01 6:09 ` [dpdk-dev] [PATCH 1/2] common/mlx5: add memory reclaim glue function Suanming Mou
@ 2020-06-01 6:09 ` Suanming Mou
2020-06-03 11:35 ` [dpdk-dev] [PATCH 0/2] " Raslan Darawsheh
2 siblings, 0 replies; 4+ messages in thread
From: Suanming Mou @ 2020-06-01 6:09 UTC (permalink / raw)
To: viacheslavo, matan; +Cc: rasland, dev
Currently, when flow destroyed, some memory resources may still be kept
as cached to help next time create flow more efficiently.
Some system may need the resources to be more flexible with flow create
and destroy. After peak time, with millions of flows destroyed, the
system would prefer the resources to be reclaimed completely, no cache
is needed. Then the resources can be allocated and used by other
components. The system is not so sensitive about the flow insertion
rate, but more care about the resources.
Both DPDK mlx5 PMD driver and the low level component rdma-core have
provided the flow resources to be configured cached or not, but there is
no APIs or parameters exposed to user to configure the flow resources
cache mode. In this case, introduce a new PMD devarg to let user
configure the flow resources cache mode will be helpful.
This commit is to add a new "reclaim_mem_mode" to help user configure if
the destroyed flows' cache resources should be kept or not.
Their will be three mode can be chosen:
1. 0(none). It means the flow resources will be cached as usual. The
resources will be cached, helpful with flow insertion rate.
2. 1(light). It will only enable the DPDK PMD level resources reclaim.
3. 2(aggressive). Both DPDK PMD level and rdma-core low level will be
configured as reclaimed mode.
With these three mode, user can configure the resources cache mode with
different levels.
Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
doc/guides/nics/mlx5.rst | 20 ++++++++++++++++++++
doc/guides/rel_notes/release_20_08.rst | 6 ++++++
drivers/net/mlx5/mlx5.c | 24 +++++++++++++++++++++++-
drivers/net/mlx5/mlx5.h | 13 +++++++++++++
4 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index bb03df6..0ff3c53 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -849,6 +849,26 @@ Driver options
By default, the PMD will set this value to 16, which means that 9KB jumbo
frames will be supported.
+- ``reclaim_mem_mode`` parameter [int]
+
+ Cache some resources in flow destroy will help flow recreation more efficient.
+ While some systems may require the all the resources can be reclaimed after
+ flow destroyed.
+ The parameter ``reclaim_mem_mode`` provides the option for user to configure
+ if the resource cache is needed or not.
+
+ There are three options to choose:
+
+ - 0. It means the flow resources will be cached as usual. The resources will
+ be cached, helpful with flow insertion rate.
+
+ - 1. It will only enable the DPDK PMD level resources reclaim.
+
+ - 2. Both DPDK PMD level and rdma-core low level will be configured as
+ reclaimed mode.
+
+ By default, the PMD will set this value to 0.
+
.. _mlx5_firmware_config:
Firmware configuration
diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst
index 39064af..dee4ccb 100644
--- a/doc/guides/rel_notes/release_20_08.rst
+++ b/doc/guides/rel_notes/release_20_08.rst
@@ -56,6 +56,12 @@ New Features
Also, make sure to start the actual text at the margin.
=========================================================
+* **Updated Mellanox mlx5 driver.**
+
+ Updated Mellanox mlx5 driver with new features and improvements, including:
+
+ * Added new PMD devarg ``reclaim_mem_mode``.
+
Removed Items
-------------
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 469ff73..95a0f33 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -161,6 +161,9 @@
*/
#define MLX5_HP_BUF_SIZE "hp_buf_log_sz"
+/* Flow memory reclaim mode. */
+#define MLX5_RECLAIM_MEM "reclaim_mem_mode"
+
#ifndef HAVE_IBV_MLX5_MOD_MPW
#define MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED (1 << 2)
#define MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW (1 << 3)
@@ -577,8 +580,11 @@ struct mlx5_flow_id_pool *
mlx5_ipool_cfg[MLX5_IPOOL_MLX5_FLOW].size =
MLX5_FLOW_HANDLE_VERBS_SIZE;
#endif
- for (i = 0; i < MLX5_IPOOL_MAX; ++i)
+ for (i = 0; i < MLX5_IPOOL_MAX; ++i) {
+ if (config->reclaim_mode)
+ mlx5_ipool_cfg[i].release_mem_en = 1;
sh->ipool[i] = mlx5_ipool_create(&mlx5_ipool_cfg[i]);
+ }
}
/**
@@ -1192,6 +1198,12 @@ struct mlx5_flow_id_pool *
sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop();
}
#endif
+ if (priv->config.reclaim_mode == MLX5_RCM_AGGR) {
+ mlx5_glue->dr_reclaim_domain_memory(sh->rx_domain, 1);
+ mlx5_glue->dr_reclaim_domain_memory(sh->tx_domain, 1);
+ if (sh->fdb_domain)
+ mlx5_glue->dr_reclaim_domain_memory(sh->fdb_domain, 1);
+ }
sh->pop_vlan_action = mlx5_glue->dr_create_flow_action_pop_vlan();
#endif /* HAVE_MLX5DV_DR */
sh->dv_refcnt++;
@@ -1862,6 +1874,15 @@ struct mlx5_flow_id_pool *
DRV_LOG(DEBUG, "class argument is %s.", val);
} else if (strcmp(MLX5_HP_BUF_SIZE, key) == 0) {
config->log_hp_size = tmp;
+ } else if (strcmp(MLX5_RECLAIM_MEM, key) == 0) {
+ if (tmp != MLX5_RCM_NONE &&
+ tmp != MLX5_RCM_LIGHT &&
+ tmp != MLX5_RCM_AGGR) {
+ DRV_LOG(ERR, "Unrecognize %s: \"%s\"", key, val);
+ rte_errno = EINVAL;
+ return -rte_errno;
+ }
+ config->reclaim_mode = tmp;
} else {
DRV_LOG(WARNING, "%s: unknown parameter", key);
rte_errno = EINVAL;
@@ -1916,6 +1937,7 @@ struct mlx5_flow_id_pool *
MLX5_LRO_TIMEOUT_USEC,
MLX5_CLASS_ARG_NAME,
MLX5_HP_BUF_SIZE,
+ MLX5_RECLAIM_MEM,
NULL,
};
struct rte_kvargs *kvlist;
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 2908c8b..8e60897 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -60,6 +60,18 @@ enum mlx5_ipool_index {
MLX5_IPOOL_MAX,
};
+/*
+ * There are three reclaim memory mode supported.
+ * 0(none) means no memory reclaim.
+ * 1(light) means only PMD level reclaim.
+ * 2(aggressive) means both PMD and rdma-core level reclaim.
+ */
+enum mlx5_reclaim_mem_mode {
+ MLX5_RCM_NONE, /* Don't reclaim memory. */
+ MLX5_RCM_LIGHT, /* Reclaim PMD level. */
+ MLX5_RCM_AGGR, /* Reclaim PMD and rdma-core level. */
+};
+
/** Key string for IPC. */
#define MLX5_MP_NAME "net_mlx5_mp"
@@ -160,6 +172,7 @@ struct mlx5_dev_config {
unsigned int swp:1; /* Tx generic tunnel checksum and TSO offload. */
unsigned int devx:1; /* Whether devx interface is available or not. */
unsigned int dest_tir:1; /* Whether advanced DR API is available. */
+ unsigned int reclaim_mode:2; /* Memory reclaim mode. */
struct {
unsigned int enabled:1; /* Whether MPRQ is enabled. */
unsigned int stride_num_n; /* Number of strides. */
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH 0/2] net/mlx5: add reclaim memory mode devarg
2020-06-01 6:09 [dpdk-dev] [PATCH 0/2] net/mlx5: add reclaim memory mode devarg Suanming Mou
2020-06-01 6:09 ` [dpdk-dev] [PATCH 1/2] common/mlx5: add memory reclaim glue function Suanming Mou
2020-06-01 6:09 ` [dpdk-dev] [PATCH 2/2] net/mlx5: add reclaim memory mode devarg Suanming Mou
@ 2020-06-03 11:35 ` Raslan Darawsheh
2 siblings, 0 replies; 4+ messages in thread
From: Raslan Darawsheh @ 2020-06-03 11:35 UTC (permalink / raw)
To: Suanming Mou, Slava Ovsiienko, Matan Azrad; +Cc: dev
Hi,
> -----Original Message-----
> From: Suanming Mou <suanmingm@mellanox.com>
> Sent: Monday, June 1, 2020 9:10 AM
> To: Slava Ovsiienko <viacheslavo@mellanox.com>; Matan Azrad
> <matan@mellanox.com>
> Cc: Raslan Darawsheh <rasland@mellanox.com>; dev@dpdk.org
> Subject: [PATCH 0/2] net/mlx5: add reclaim memory mode devarg
>
> Currently, when flow destroyed, some memory resources may still be kept
> as cached to help next time create flow more efficiently.
>
> Some system may need the resources to be more flexible with flow create
> and destroy. After peak time, with millions of flows destroyed, the
> system would prefer the resources to be reclaimed completely, no cache
> is needed. Then the resources can be allocated and used by other
> components. The system is not so sensitive about the flow insertion
> rate, but more care about the resources.
>
> Both DPDK mlx5 PMD driver and the low level component rdma-core have
> provided the flow resources to be configured cached or not, but there is
> no APIs or parameters exposed to user to configure the flow resources
> cache mode. In this case, introduce a new PMD devarg to let user
> configure the flow resources cache mode will be helpful.
>
> This commit is to add a new "reclaim_mem_mode" to help user configure if
> the destroyed flows' cache resources should be kept or not.
>
> Their will be three mode can be chosen:
> 1. 0(none). It means the flow resources will be cached as usual. The
> resources will be cached, helpful with flow insertion rate.
> 2. 1(light). It will only enable the DPDK PMD level resources reclaim.
> 3. 2(aggressive). Both DPDK PMD level and rdma-core low level will be
> configured as reclaimed mode.
>
> With these three mode, user can configure the resources cache mode with
> different levels.
>
> Suanming Mou (2):
> common/mlx5: add memory reclaim glue function
> net/mlx5: add reclaim memory mode devarg
>
> doc/guides/nics/mlx5.rst | 20 ++++++++++++++++++++
> doc/guides/rel_notes/release_20_08.rst | 6 ++++++
> drivers/common/mlx5/Makefile | 5 +++++
> drivers/common/mlx5/meson.build | 2 ++
> drivers/common/mlx5/mlx5_glue.c | 13 +++++++++++++
> drivers/common/mlx5/mlx5_glue.h | 1 +
> drivers/net/mlx5/mlx5.c | 24 +++++++++++++++++++++++-
> drivers/net/mlx5/mlx5.h | 13 +++++++++++++
> 8 files changed, 83 insertions(+), 1 deletion(-)
>
> --
> 1.8.3.1
Series rebased and applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
^ permalink raw reply [flat|nested] 4+ messages in thread