Is it ok to use debugfs to dump some ucontext-level driver-defined info?
by liweihang
Hi all,
We want to dump some hns driver-defined information that belongs to a
process to keep track of current memory usage. For example, there is
a ucontext-level(process-level) memory pool to store WQE which is
shared by a lot of QPs, we want to record and query which QPs are using
this pool and how much space each QP is using.
rdmatool don't have a ucontext-level resource tracking currently, is it
ok to achieve that through debugfs?
This may looks like:
$ echo 1 > <dbgfs_dir>/hns_roce/hns_0/<pid>/qp
QPN Total(kB) SQ(kB) SGE(kB) RQ(kB)
110 6400 256 2048 4096
118 6400 256 2048 0
Or should it be achieved in rdmatool?
Thanks
Weihang
1 year, 8 months
[PATCH mm/zswap 2/2] mm: set the sleep_mapped to true
by Tian Tao
zpool driver a flag to indicates whether the zpool driver can sleep
while mapped, this patch set it for true for z3fold and zbud.
Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com>
---
mm/z3fold.c | 1 +
mm/zbud.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/mm/z3fold.c b/mm/z3fold.c
index dacb0d7..234b46f 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -1778,6 +1778,7 @@ static u64 z3fold_zpool_total_size(void *pool)
static struct zpool_driver z3fold_zpool_driver = {
.type = "z3fold",
+ .sleep_mapped = true,
.owner = THIS_MODULE,
.create = z3fold_zpool_create,
.destroy = z3fold_zpool_destroy,
diff --git a/mm/zbud.c b/mm/zbud.c
index c49966e..7ec5f27 100644
--- a/mm/zbud.c
+++ b/mm/zbud.c
@@ -203,6 +203,7 @@ static u64 zbud_zpool_total_size(void *pool)
static struct zpool_driver zbud_zpool_driver = {
.type = "zbud",
+ .sleep_mapped = true,
.owner = THIS_MODULE,
.create = zbud_zpool_create,
.destroy = zbud_zpool_destroy,
--
2.7.4
1 year, 9 months
[PATCH mm/zswap 1/2] mm/zswap: add the flag can_sleep_mapped
by Tian Tao
add a flag to zpool, named is "can_sleep_mapped", and have it set true
for zbud/z3fold, set false for zsmalloc. Then zswap could go the current
path if the flag is true; and if it's false, copy data from src to a
temporary buffer, then unmap the handle, take the mutex, process the
buffer instead of src to avoid sleeping function called from atomic
context.
Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com>
---
include/linux/zpool.h | 3 +++
mm/zpool.c | 13 +++++++++++++
mm/zswap.c | 27 ++++++++++++++++++++++++---
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/include/linux/zpool.h b/include/linux/zpool.h
index 51bf430..e899701 100644
--- a/include/linux/zpool.h
+++ b/include/linux/zpool.h
@@ -73,6 +73,7 @@ u64 zpool_get_total_size(struct zpool *pool);
* @malloc: allocate mem from a pool.
* @free: free mem from a pool.
* @shrink: shrink the pool.
+ * @sleep_mapped: whether zpool driver can sleep during map.
* @map: map a handle.
* @unmap: unmap a handle.
* @total_size: get total size of a pool.
@@ -100,6 +101,7 @@ struct zpool_driver {
int (*shrink)(void *pool, unsigned int pages,
unsigned int *reclaimed);
+ bool sleep_mapped;
void *(*map)(void *pool, unsigned long handle,
enum zpool_mapmode mm);
void (*unmap)(void *pool, unsigned long handle);
@@ -112,5 +114,6 @@ void zpool_register_driver(struct zpool_driver *driver);
int zpool_unregister_driver(struct zpool_driver *driver);
bool zpool_evictable(struct zpool *pool);
+bool zpool_can_sleep_mapped(struct zpool *pool);
#endif
diff --git a/mm/zpool.c b/mm/zpool.c
index 3744a2d..5ed7120 100644
--- a/mm/zpool.c
+++ b/mm/zpool.c
@@ -23,6 +23,7 @@ struct zpool {
void *pool;
const struct zpool_ops *ops;
bool evictable;
+ bool can_sleep_mapped;
struct list_head list;
};
@@ -183,6 +184,7 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
zpool->pool = driver->create(name, gfp, ops, zpool);
zpool->ops = ops;
zpool->evictable = driver->shrink && ops && ops->evict;
+ zpool->can_sleep_mapped = driver->sleep_mapped;
if (!zpool->pool) {
pr_err("couldn't create %s pool\n", type);
@@ -393,6 +395,17 @@ bool zpool_evictable(struct zpool *zpool)
return zpool->evictable;
}
+/**
+ * zpool_can_sleep_mapped - Test if zpool can sleep when do mapped.
+ * @zpool: The zpool to test
+ *
+ * Returns: true if zpool can sleep; false otherwise.
+ */
+bool zpool_can_sleep_mapped(struct zpool *zpool)
+{
+ return zpool->can_sleep_mapped;
+}
+
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Dan Streetman <ddstreet(a)ieee.org>");
MODULE_DESCRIPTION("Common API for compressed memory storage");
diff --git a/mm/zswap.c b/mm/zswap.c
index 182f6ad..1e9d2b6 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -1235,7 +1235,7 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
struct zswap_entry *entry;
struct scatterlist input, output;
struct crypto_acomp_ctx *acomp_ctx;
- u8 *src, *dst;
+ u8 *src, *dst, *tmp;
unsigned int dlen;
int ret;
@@ -1256,12 +1256,29 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
goto freeentry;
}
+ if (!zpool_can_sleep_mapped(entry->pool->zpool)) {
+
+ tmp = kmalloc(entry->length, GFP_ATOMIC);
+ if (!tmp) {
+ ret = -ENOMEM;
+ goto freeentry;
+ }
+ }
+
/* decompress */
dlen = PAGE_SIZE;
src = zpool_map_handle(entry->pool->zpool, entry->handle, ZPOOL_MM_RO);
if (zpool_evictable(entry->pool->zpool))
src += sizeof(struct zswap_header);
+ if (!zpool_can_sleep_mapped(entry->pool->zpool)) {
+
+ memcpy(tmp, src, entry->length);
+ src = tmp;
+
+ zpool_unmap_handle(entry->pool->zpool, entry->handle);
+ }
+
acomp_ctx = raw_cpu_ptr(entry->pool->acomp_ctx);
mutex_lock(acomp_ctx->mutex);
sg_init_one(&input, src, entry->length);
@@ -1271,7 +1288,11 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
ret = crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), &acomp_ctx->wait);
mutex_unlock(acomp_ctx->mutex);
- zpool_unmap_handle(entry->pool->zpool, entry->handle);
+ if (zpool_can_sleep_mapped(entry->pool->zpool))
+ zpool_unmap_handle(entry->pool->zpool, entry->handle);
+ else
+ kfree(tmp);
+
BUG_ON(ret);
freeentry:
@@ -1279,7 +1300,7 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
zswap_entry_put(tree, entry);
spin_unlock(&tree->lock);
- return 0;
+ return ret;
}
/* frees an entry in zswap */
--
2.7.4
1 year, 9 months
[PATCH mm/zswap 0/2] Fix the compatibility of zsmalloc and zswap
by Tian Tao
patch #1 add a flag to zpool, then zswap used to determine if zpool
drivers such as zbud/z3fold/zsmalloc whether can sleep in atoimc context.
patch #2 set flag sleep_mapped to true indicates that zbud/z3fold can
sleep in atomic context. zsmalloc didin't support sleep in atomic context,
so not set that flag to true.
Tian Tao (2):
mm/zswap: add the flag can_sleep_mapped
mm: set the sleep_mapped to true
include/linux/zpool.h | 3 +++
mm/z3fold.c | 1 +
mm/zbud.c | 1 +
mm/zpool.c | 13 +++++++++++++
mm/zswap.c | 27 ++++++++++++++++++++++++---
5 files changed, 42 insertions(+), 3 deletions(-)
--
2.7.4
1 year, 9 months
Test
by John Garry
This is just a test, and I can imagine that we will have more of the same...
1 year, 9 months
