Skip to content

Commit 0fe9a44

Browse files
tehcastertorvalds
authored andcommitted
mm, page_owner: decouple freeing stack trace from debug_pagealloc
Commit 8974558 ("mm, page_owner, debug_pagealloc: save and dump freeing stack trace") enhanced page_owner to also store freeing stack trace, when debug_pagealloc is also enabled. KASAN would also like to do this [1] to improve error reports to debug e.g. UAF issues. Kirill has suggested that the freeing stack trace saving should be also possible to be enabled separately from KASAN or debug_pagealloc, i.e. with an extra boot option. Qian argued that we have enough options already, and avoiding the extra overhead is not worth the complications in the case of a debugging option. Kirill noted that the extra stack handle in struct page_owner requires 0.1% of memory. This patch therefore enables free stack saving whenever page_owner is enabled, regardless of whether debug_pagealloc or KASAN is also enabled. KASAN kernels booted with page_owner=on will thus benefit from the improved error reports. [1] https://bugzilla.kernel.org/show_bug.cgi?id=203967 [vbabka@suse.cz: v3] Link: http://lkml.kernel.org/r/20191007091808.7096-3-vbabka@suse.cz Link: http://lkml.kernel.org/r/20190930122916.14969-3-vbabka@suse.cz Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Reviewed-by: Qian Cai <cai@lca.pw> Suggested-by: Dmitry Vyukov <dvyukov@google.com> Suggested-by: Walter Wu <walter-zh.wu@mediatek.com> Suggested-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Suggested-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Suggested-by: Qian Cai <cai@lca.pw> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 5556cfe commit 0fe9a44

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

Documentation/dev-tools/kasan.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ smaller binary while the latter is 1.1 - 2 times faster.
4141
Both KASAN modes work with both SLUB and SLAB memory allocators.
4242
For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.
4343

44+
To augment reports with last allocation and freeing stack of the physical page,
45+
it is recommended to enable also CONFIG_PAGE_OWNER and boot with page_owner=on.
46+
4447
To disable instrumentation for specific files or directories, add a line
4548
similar to the following to the respective kernel Makefile:
4649

mm/page_owner.c

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ struct page_owner {
2424
short last_migrate_reason;
2525
gfp_t gfp_mask;
2626
depot_stack_handle_t handle;
27-
#ifdef CONFIG_DEBUG_PAGEALLOC
2827
depot_stack_handle_t free_handle;
29-
#endif
3028
};
3129

32-
static bool page_owner_disabled = true;
30+
static bool page_owner_enabled = false;
3331
DEFINE_STATIC_KEY_FALSE(page_owner_inited);
3432

3533
static depot_stack_handle_t dummy_handle;
@@ -44,18 +42,15 @@ static int __init early_page_owner_param(char *buf)
4442
return -EINVAL;
4543

4644
if (strcmp(buf, "on") == 0)
47-
page_owner_disabled = false;
45+
page_owner_enabled = true;
4846

4947
return 0;
5048
}
5149
early_param("page_owner", early_page_owner_param);
5250

5351
static bool need_page_owner(void)
5452
{
55-
if (page_owner_disabled)
56-
return false;
57-
58-
return true;
53+
return page_owner_enabled;
5954
}
6055

6156
static __always_inline depot_stack_handle_t create_dummy_stack(void)
@@ -84,7 +79,7 @@ static noinline void register_early_stack(void)
8479

8580
static void init_page_owner(void)
8681
{
87-
if (page_owner_disabled)
82+
if (!page_owner_enabled)
8883
return;
8984

9085
register_dummy_stack();
@@ -148,25 +143,18 @@ void __reset_page_owner(struct page *page, unsigned int order)
148143
{
149144
int i;
150145
struct page_ext *page_ext;
151-
#ifdef CONFIG_DEBUG_PAGEALLOC
152146
depot_stack_handle_t handle = 0;
153147
struct page_owner *page_owner;
154148

155-
if (debug_pagealloc_enabled())
156-
handle = save_stack(GFP_NOWAIT | __GFP_NOWARN);
157-
#endif
149+
handle = save_stack(GFP_NOWAIT | __GFP_NOWARN);
158150

159151
page_ext = lookup_page_ext(page);
160152
if (unlikely(!page_ext))
161153
return;
162154
for (i = 0; i < (1 << order); i++) {
163155
__clear_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags);
164-
#ifdef CONFIG_DEBUG_PAGEALLOC
165-
if (debug_pagealloc_enabled()) {
166-
page_owner = get_page_owner(page_ext);
167-
page_owner->free_handle = handle;
168-
}
169-
#endif
156+
page_owner = get_page_owner(page_ext);
157+
page_owner->free_handle = handle;
170158
page_ext = page_ext_next(page_ext);
171159
}
172160
}
@@ -450,7 +438,6 @@ void __dump_page_owner(struct page *page)
450438
stack_trace_print(entries, nr_entries, 0);
451439
}
452440

453-
#ifdef CONFIG_DEBUG_PAGEALLOC
454441
handle = READ_ONCE(page_owner->free_handle);
455442
if (!handle) {
456443
pr_alert("page_owner free stack trace missing\n");
@@ -459,7 +446,6 @@ void __dump_page_owner(struct page *page)
459446
pr_alert("page last free stack trace:\n");
460447
stack_trace_print(entries, nr_entries, 0);
461448
}
462-
#endif
463449

464450
if (page_owner->last_migrate_reason != -1)
465451
pr_alert("page has been migrated, last migrate reason: %s\n",

0 commit comments

Comments
 (0)