Skip to contentSkip to conversation

incoming

PATCH New Andrew Morton 1 participant 3 messages Apr 27, 2022

Subsystems (4)
lore
Share & tools
lore

Andrew Morton

author maintainer
#0 lore raw

2 patches, based on d615b5416f8a1afeb82d13b238f8152c572d59c0.

Subsystems affected by this patch series:

mm/kasan
mm/debug

Subsystem: mm/kasan

Zqiang <[email protected]>:
kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time

Subsystem: mm/debug

Akira Yokosawa <[email protected]>:
docs: vm/page_owner: use literal blocks for param description

 Documentation/vm/page_owner.rst |    5 +++--
 mm/kasan/quarantine.c           |    7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
author maintainer
#1 lore raw

PATCH 1/2 kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time

From: Zqiang <[email protected]>
Subject: kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time

kasan_quarantine_remove_cache() is called in kmem_cache_shrink()/ destroy(). The kasan_quarantine_remove_cache() call is protected by cpuslock in kmem_cache_destroy() to ensure serialization with kasan_cpu_offline().

However the kasan_quarantine_remove_cache() call is not protected by cpuslock in kmem_cache_shrink(). When a CPU is going offline and cache shrink occurs at same time, the cpu_quarantine may be corrupted by interrupt (per_cpu_remove_cache operation).

So add a cpu_quarantine offline flags check in per_cpu_remove_cache().

---

 mm/kasan/quarantine.c |    7 +++++++
 1 file changed, 7 insertions(+)
mm/kasan/quarantine.c renamed from mm/kasan/quarantine.c~kasan-prevent-cpu_quarantine-corruption-when-cpu-offline-and-cache-shrink-occur-at-same-time +7 -0
@@ -315,6 +315,13 @@ static void per_cpu_remove_cache(void *a
 	struct qlist_head *q;
 
 	q = this_cpu_ptr(&cpu_quarantine);
+	/*
+	 * Ensure the ordering between the writing to q->offline and
+	 * per_cpu_remove_cache.  Prevent cpu_quarantine from being corrupted
+	 * by interrupt.
+	 */
+	if (READ_ONCE(q->offline))
+		return;
 	qlist_move_cache(q, &to_free, cache);
 	qlist_free_all(&to_free, cache);
 }

_

author maintainer
#2 lore raw

PATCH 2/2 docs: vm/page_owner: use literal blocks for param description

In reply to Andrew Morton

From: Akira Yokosawa <[email protected]>
Subject: docs: vm/page_owner: use literal blocks for param description

Sphinx generates hard-to-read lists of parameters at the bottom of the page. Fix them by putting literal-block markers of "::" in front of them.

Fixes 57f2b54a9379 ("Documentation/vm/page_owner.rst: update the documentation")
Cc Shenghong Han <[email protected]>
Cc Haowen Bai <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Alex Shi <[email protected]>

---

 Documentation/vm/page_owner.rst |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/vm/page_owner.rst renamed from Documentation/vm/page_owner.rst~docs-vm-page_owner-use-literal-blocks-for-param-description +3 -2
@@ -110,7 +110,7 @@ Usage
    If you want to sort by the page nums of buf, use the ``-m`` parameter.
    The detailed parameters are:
 
-   fundamental function:
+   fundamental function::
 
 	Sort:
 		-a		Sort by memory allocation time.
@@ -122,7 +122,7 @@ Usage
 		-s		Sort by stack trace.
 		-t		Sort by times (default).
 
-   additional function:
+   additional function::
 
 	Cull:
 		--cull <rules>
@@ -153,6 +153,7 @@ Usage
 
 STANDARD FORMAT SPECIFIERS
 ==========================
+::
 
 	KEY		LONG		DESCRIPTION
 	p		pid		process ID

_