Skip to contentSkip to conversation

mm, mm/damon: Trivial fixes

PATCH Applied SeongJae Park 1 participant 6 messages Sep 17, 2021

Subsystems (5)
lore
Share & tools
lore

SeongJae Park

author maintainer
#0 lore raw

cover mm, mm/damon: Trivial fixes

This commit fixes trivial nits in mm documentation and DAMON.

SeongJae Park (5):
Documentation/vm: Move user guides to admin-guide/mm/
MAINTAINERS: Update SeongJae's email address docs/vm/damon: Remove broken reference include/linux/damon.h: Fix kernel-doc comments for 'damon_callback' mm/damon/core: Print kdamond start log in debug mode only

 Documentation/admin-guide/mm/index.rst        |  2 ++
 .../{vm => admin-guide/mm}/swap_numa.rst      |  0
 .../{vm => admin-guide/mm}/zswap.rst          |  0
 Documentation/vm/damon/index.rst              |  1 -
 Documentation/vm/index.rst                    | 26 ++++---------------
 MAINTAINERS                                   |  2 +-
 include/linux/damon.h                         |  6 ++---
 mm/damon/core.c                               |  2 +-
 8 files changed, 12 insertions(+), 27 deletions(-)
 rename Documentation/{vm => admin-guide/mm}/swap_numa.rst (100%)
 rename Documentation/{vm => admin-guide/mm}/zswap.rst (100%)
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH 1/5 Documentation/vm: Move user guides to admin-guide/mm/

From: SeongJae Park <[email protected]>

Most memory management user guide documents are in 'admin-guide/mm/', but two of those are in 'vm/'. This commit moves the two docs into 'admin-guide/mm' for easier documents finding.

---
 Documentation/admin-guide/mm/index.rst        |  2 ++
 .../{vm => admin-guide/mm}/swap_numa.rst      |  0
 .../{vm => admin-guide/mm}/zswap.rst          |  0
 Documentation/vm/index.rst                    | 26 ++++---------------
 4 files changed, 7 insertions(+), 21 deletions(-)
 rename Documentation/{vm => admin-guide/mm}/swap_numa.rst (100%)
 rename Documentation/{vm => admin-guide/mm}/zswap.rst (100%)
Documentation/admin-guide/mm/index.rst +2 -0
index cbd19d5e625f..c21b5823f126 100644
@@ -37,5 +37,7 @@ the Linux memory management.
    numaperf
    pagemap
    soft-dirty
+   swap_numa
    transhuge
    userfaultfd
+   zswap
Documentation/admin-guide/mm/swap_numa.rst renamed from Documentation/vm/swap_numa.rst +0 -0
similarity index 100%
rename from Documentation/vm/swap_numa.rst
rename to Documentation/admin-guide/mm/swap_numa.rst
Documentation/admin-guide/mm/zswap.rst renamed from Documentation/vm/zswap.rst +0 -0
similarity index 100%
rename from Documentation/vm/zswap.rst
rename to Documentation/admin-guide/mm/zswap.rst
Documentation/vm/index.rst +5 -21
index b51f0d8992f8..6f5ffef4b716 100644
@@ -3,27 +3,11 @@ Linux Memory Management Documentation
 =====================================
 
 This is a collection of documents about the Linux memory management (mm)
-subsystem.  If you are looking for advice on simply allocating memory,
-see the :ref:`memory_allocation`.
-
-User guides for MM features
-===========================
-
-The following documents provide guides for controlling and tuning
-various features of the Linux memory management
-
-.. toctree::
-   :maxdepth: 1
-
-   swap_numa
-   zswap
-
-Kernel developers MM documentation
-==================================
-
-The below documents describe MM internals with different level of
-details ranging from notes and mailing list responses to elaborate
-descriptions of data structures and algorithms.
+subsystem internals with different level of details ranging from notes and
+mailing list responses for elaborating descriptions of data structures and
+algorithms.  If you are looking for advice on simply allocating memory, see the
+:ref:`memory_allocation`.  For controlling and tuning guides, see the
+:doc:`admin guide <../admin-guide/mm/index>`.
 
 .. toctree::
    :maxdepth: 1
Signature · 1 line
2.17.1
author maintainer
#2 lore raw

PATCH 2/5 MAINTAINERS: Update SeongJae's email address

In reply to SeongJae Park

This commit updates SeongJae's email address in MAINTAINERS file to his preferred one.

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index d05b4e35e63f..774b6aac16ef 100644
@@ -5163,7 +5163,7 @@ F:	net/ax25/ax25_timer.c
 F:	net/ax25/sysctl_net_ax25.c
 
 DATA ACCESS MONITOR
-M:	SeongJae Park <[email protected]>
+M:	SeongJae Park <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/admin-guide/mm/damon/
Signature · 1 line
2.17.1
author maintainer
#3 lore raw

PATCH 3/5 docs/vm/damon: Remove broken reference

In reply to SeongJae Park

From: SeongJae Park <[email protected]>

Building DAMON documents warns for a reference to nonexisting doc, as below:

    $ time make htmldocs
    [...]
    Documentation/vm/damon/index.rst:24: WARNING: toctree contains reference to nonexisting document 'vm/damon/plans'

This commit fixes the warning by removing the wrong reference.

---
 Documentation/vm/damon/index.rst | 1 -
 1 file changed, 1 deletion(-)
Documentation/vm/damon/index.rst +0 -1
index a2858baf3bf1..48c0bbff98b2 100644
@@ -27,4 +27,3 @@ workloads and systems.
    faq
    design
    api
-   plans
Signature · 1 line
2.17.1
author maintainer
#4 lore raw

PATCH 4/5 include/linux/damon.h: Fix kernel-doc comments for 'damon_callback'

In reply to SeongJae Park

From: SeongJae Park <[email protected]>

A few Kernel-doc comments in 'damon.h' are broken. This commit fixes those.

---
 include/linux/damon.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/damon.h +3 -3
index d68b67b8d458..755d70804705 100644
@@ -62,7 +62,7 @@ struct damon_target {
 struct damon_ctx;
 
 /**
- * struct damon_primitive	Monitoring primitives for given use cases.
+ * struct damon_primitive - Monitoring primitives for given use cases.
  *
  * @init:			Initialize primitive-internal data structures.
  * @update:			Update primitive-internal data structures.
@@ -108,8 +108,8 @@ struct damon_primitive {
 	void (*cleanup)(struct damon_ctx *context);
 };
 
-/*
- * struct damon_callback	Monitoring events notification callbacks.
+/**
+ * struct damon_callback - Monitoring events notification callbacks.
  *
  * @before_start:	Called before starting the monitoring.
  * @after_sampling:	Called after each sampling.
Signature · 1 line
2.17.1
author maintainer
#5 lore raw

PATCH 5/5 mm/damon/core: Print kdamond start log in debug mode only

In reply to SeongJae Park

Logging of kdamond startup is using 'pr_info()' unnecessarily. This commit makes it to use 'pr_debug()' instead.

---
 mm/damon/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/damon/core.c +1 -1
index 30e9211f494a..874558a790a0 100644
@@ -653,7 +653,7 @@ static int kdamond_fn(void *data)
 	unsigned long sz_limit = 0;
 
 	mutex_lock(&ctx->kdamond_lock);
-	pr_info("kdamond (%d) starts\n", ctx->kdamond->pid);
+	pr_debug("kdamond (%d) starts\n", ctx->kdamond->pid);
 	mutex_unlock(&ctx->kdamond_lock);
 
 	if (ctx->primitive.init)
Signature · 1 line
2.17.1