From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3A71C48BEB for ; Wed, 21 Feb 2024 19:42:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1A076B00C5; Wed, 21 Feb 2024 14:42:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DA3BB6B00C6; Wed, 21 Feb 2024 14:42:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BCE1F6B00C7; Wed, 21 Feb 2024 14:42:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A3E696B00C5 for ; Wed, 21 Feb 2024 14:42:12 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 81C8E80BB8 for ; Wed, 21 Feb 2024 19:42:12 +0000 (UTC) X-FDA: 81816832104.05.E71109C Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf04.hostedemail.com (Postfix) with ESMTP id BB7D340004 for ; Wed, 21 Feb 2024 19:42:10 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Gv2P6COm; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3EVLWZQYKCEQy0xkthmuumrk.iusrot03-ssq1giq.uxm@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3EVLWZQYKCEQy0xkthmuumrk.iusrot03-ssq1giq.uxm@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708544530; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CzDIuQ0nYms/65bHZ69fKMNRRXjNNeWyOZfzFtq6j+Q=; b=wMJ+Kl2+2kZGnMYsgdujyEymE41WmXiAin++Vm6TSCmr6K6U5oX4pIRyWEu53k8bGUlBd9 LGC0DvO+IJZk/2GkXbpsSS4sTciTotSulyjlmngMgPjCRG1OITxIaEOkzEq/n4Ffsm6Hd+ HptgurRxIbdzuqcFGyRpRHB9nfF7FcU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Gv2P6COm; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3EVLWZQYKCEQy0xkthmuumrk.iusrot03-ssq1giq.uxm@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3EVLWZQYKCEQy0xkthmuumrk.iusrot03-ssq1giq.uxm@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708544530; a=rsa-sha256; cv=none; b=lp/cmfoaIKdh8nQUr10QJW2bCxtEFT3ScA8zjb0LnQm65vBiiogOa8GPOUTIAoZ+u5wCZQ rHQ9ui5EwE9IuxHEGkRUzj1HFwbRtdXUsZ6qIjoyRcjSxijZscJa5+LT8aiNLB9AN1lZH/ vRBt1i53dFMWDRjksg4nZp2WQo68G4k= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60802b0afd2so1243527b3.1 for ; Wed, 21 Feb 2024 11:42:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708544530; x=1709149330; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=CzDIuQ0nYms/65bHZ69fKMNRRXjNNeWyOZfzFtq6j+Q=; b=Gv2P6COmYBgKMLUowpG/6Q9LeAYT9QTkFwjQ0M6SUU4H9i9c2zcJ2w3bHgwuldNfre L04SJvmI+SoSer7gsPGNvWX1MEqV/wKZW2tJliukAnjHFAQjTD0CgBLEoUsa2QG77FMY aOFSmqcEjD6vfV8Qq4+eK9VSp/N3koDTxh3DO4+CSG9fYFKTkvLKEH//t0bmac7EAU1d aCXYh5tDtA/NLFupdAs7J19N5vVWHiny/jz6pXXRPfg2drhBr/VT0HBNF7sF6A5JotEZ IswDYhxY0XC3ECcGUe1wtsiLMgZcJwK7R/Gm0IX5hp9YuemDWZQU0i8kE4+c8igU8Dvl OsUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708544530; x=1709149330; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CzDIuQ0nYms/65bHZ69fKMNRRXjNNeWyOZfzFtq6j+Q=; b=H4n/V3f8jGazaOoT2AKGDBZ3CiH1z25eucX7MVaoCB9IEqT+MZIoXRrkgiaeTqvUcT WaWzyw3fU1ZvwugkULpJcdw2V0kypS+svWQ1xeny0TjEpFattWuqTnNofNThAohE2X0W u9QoxaImJpR3ok1yHL1T8M2A2zvqFs2veERxm5r2QVL0HXYyNt3ehwnNTlV7DLkn4YKb 11Hg80E0zB85bHIHK5r7HnK/JQ1k/yCe6cIUjhf54+lZOKbsrxApGi9P1hPjbJf0Ex8x nuin5BbnuZhyvykv9KFFSXQic5VKJLg3eSu5jW5zsinxfpv/qj2O/4MIgrCCEOo38SiD oy7Q== X-Forwarded-Encrypted: i=1; AJvYcCXegAZ8MlS5OqmquGBF1pDSc960Z7mIY9nyRp3OxoaYoVaTC5Osl1OcudgTbv7RIGcY7w1YZQzWM0WkAjDpVIEFeZQ= X-Gm-Message-State: AOJu0YzyuNtdq4nDw8Vp8qbt/yhI2GQJSUvpSjH7qqpjQPn+Qx+469gH Z7BirYjgtgC0t0oWlMQVVV8VqrTwcb4AqT+YMRv832QtSvmGG0Yoy3HykNT33qziFwVNvH6CC8q zbA== X-Google-Smtp-Source: AGHT+IFe7qNCg82jNJD+RarPvS2YBMTSZ7x4HEvuAvHP+lTF13VKJQxl18VpWOGqr99d4PU9keICw1gSItE= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:953b:9a4e:1e10:3f07]) (user=surenb job=sendgmr) by 2002:a81:b287:0:b0:608:6b9:bf09 with SMTP id q129-20020a81b287000000b0060806b9bf09mr97625ywh.1.1708544529717; Wed, 21 Feb 2024 11:42:09 -0800 (PST) Date: Wed, 21 Feb 2024 11:40:46 -0800 In-Reply-To: <20240221194052.927623-1-surenb@google.com> Mime-Version: 1.0 References: <20240221194052.927623-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240221194052.927623-34-surenb@google.com> Subject: [PATCH v4 33/36] codetag: debug: mark codetags for reserved pages as empty From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: BB7D340004 X-Stat-Signature: 8wq791znqqmksfnkyhgfzx7jgk6m8iy9 X-Rspam-User: X-HE-Tag: 1708544530-267487 X-HE-Meta: U2FsdGVkX19j6igEOvD/cYjTZKW0nPJzvaHsDT973mA8hbxkgs7it3/9is3pLPw+Y0F2AV0T5TaH42PiTvzha6DasyDz7K6q0z3YFWskkQMHyOMCTQinEzeu6Mt4gRfDZ7tk+Khyow1KWnZ9YPYHhp10hUHDD7q2PMa99GmvcbB34BQeaCnzmKcOlGJsXBnhHSBeBegRuOeVlSYD5Lnrcb0QY8mbITtyn0UDHwQrOlJaECueOl66Vl+FxqtV30tZb8iZfLSp2A90utvG8EEigLqaJQJ0XbTEuoYjOtqOOj/A/aEbPDH+d00AprR6sgUdNCbXyTD/yVYrC5AeFh3b/ZlYQ7Yqoc/U5pDWf3/rOwcdo3RI98NEoU0hmZ6ZkyZExOYrqsillVdDY8ePQTk/vL1UXc53XKaRJ2YfSzzVn0EljI4fRCr5Ni8oD8SLXDbdLCzZ+xk8hh0GTRq73xDDnV8jbbaNuWGPhID7XbF+AP+c1o5RApYAhqYPhm3gdsDgdvKIy6lqY0chwnq8Jy8o/taPTMdOXNjqCn6AIGXj1TWoXAE+17/6P4Uusbizr0XUs1QAmhC/X+JIMkzg4XihtbWuF+sfsNVSA+PVYNtH0sPUlMlcjeF+mKGIvjHuLsKYKZ3JFCRomIv2Q7FUPceByxOdyrSFGoFQTH3oC30PdTkZs5JH622eXpaNxyRM5iEzp0j7DYOelTYULYXC9vSAxhYiLK1VTlUxCKszjTy0aeRUEeGkqKFDNxK9AMjJkxgH7R9mIGiGaN9TZ8baBhhSAcwK5fxJ74XPTOHkgXmBFV4JmFrorOzNkVFeWQ0Uh6oBfE9a3xcKGwPfeMe/Gl2jXjyIh8MSowuWjZyFIo5KT31cUg2HUDGErtvKEDq7l6a00QYZtbtP5j27HhPqxXMll7/ftghRE+63W6Tul+Xc+asvP2BugGKRM3d0V5bA5FGHWuf6pKXXS7Kx/b5bRUc cQUIdF+q vZD6ededOU/X+5vyk/5+lKpUW2g1ai1NKoB32pu4XwDvQfShTTL1LCjEvb/eXwymJHBAq08e26f7340Cj7LayjAo/hiAlwt/KwxUfzln4alAiuQPdYRemBhGUwr7FrPlyxBVqyU1pEgglGzit0Voz1leynTrMzJSFt4vHhfYlSjKnjmVBlH2K2n+tYm3sZs3RXkIBdoCKXDVYKgG1wOrNTF/iewxtCK8Pc5e0RQqlmjwFClS4FPEYKzVJe6Y/1fzTqdyc9ly9M/rGoKdzUDwC9Q4pJNzqbHxjLRllRaeXL2uykCnSmWapS4By6QrWFJhkSjIS/Vf/NGRsdjUOk+Y4fUuQBnOtMw//9+PqjexAyOqtp+CuRFKcmr1xnCLtT4AxLH7xnZz0gKBaGtAXVkOXptKHTuX14kxhzyFEHY897tsjb/uUzBdIl/OtmYQSNOMieBj48Ks+snXgHdLCmVv/kncdDcyEcFYpgbZW7U+x6iUA6gHrpPLrQ7yoV05UunlAy+NkBScl8OW03Y0mll3pdkUsaXtNRs1F55KefXDt+e/bgKUZmiExevfp+RVSn9jzrD0V5Q/+iYCu5HZlDwN/8Abj31egFU9JP9Awmkb/5g2qJ3PqdJPzJlkgC6205s+18Z8xGmZ07b7n9XOzarZCVcFa8uQLUtna+GVSeZ+7OxMlxu6jL6nW0YM7qHplW+9xwGR6j6kNv4Ehi+6S5oqRC+Jb3C6/625hwyltDnXkYwRw2/c= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: To avoid debug warnings while freeing reserved pages which were not allocated with usual allocators, mark their codetags as empty before freeing. Signed-off-by: Suren Baghdasaryan Reviewed-by: Kees Cook --- include/linux/alloc_tag.h | 1 + include/linux/mm.h | 9 +++++++++ include/linux/pgalloc_tag.h | 2 ++ mm/mm_init.c | 12 +++++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/include/linux/alloc_tag.h b/include/linux/alloc_tag.h index 4a3fc865d878..64aa9557341e 100644 --- a/include/linux/alloc_tag.h +++ b/include/linux/alloc_tag.h @@ -46,6 +46,7 @@ static inline void set_codetag_empty(union codetag_ref *ref) #else /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */ static inline bool is_codetag_empty(union codetag_ref *ref) { return false; } +static inline void set_codetag_empty(union codetag_ref *ref) {} #endif /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */ diff --git a/include/linux/mm.h b/include/linux/mm.h index f5a97dec5169..b9a4e2cb3ac1 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -3112,6 +3113,14 @@ extern void reserve_bootmem_region(phys_addr_t start, /* Free the reserved page into the buddy system, so it gets managed. */ static inline void free_reserved_page(struct page *page) { + if (mem_alloc_profiling_enabled()) { + union codetag_ref *ref = get_page_tag_ref(page); + + if (ref) { + set_codetag_empty(ref); + put_page_tag_ref(ref); + } + } ClearPageReserved(page); init_page_count(page); __free_page(page); diff --git a/include/linux/pgalloc_tag.h b/include/linux/pgalloc_tag.h index 9e6ad8e0e4aa..7a41ed612423 100644 --- a/include/linux/pgalloc_tag.h +++ b/include/linux/pgalloc_tag.h @@ -98,6 +98,8 @@ static inline void pgalloc_tag_split(struct page *page, unsigned int nr) #else /* CONFIG_MEM_ALLOC_PROFILING */ +static inline union codetag_ref *get_page_tag_ref(struct page *page) { return NULL; } +static inline void put_page_tag_ref(union codetag_ref *ref) {} static inline void pgalloc_tag_add(struct page *page, struct task_struct *task, unsigned int order) {} static inline void pgalloc_tag_sub(struct page *page, unsigned int order) {} diff --git a/mm/mm_init.c b/mm/mm_init.c index e9ea2919d02d..6b5410a5112c 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2566,7 +2566,6 @@ void __init set_dma_reserve(unsigned long new_dma_reserve) void __init memblock_free_pages(struct page *page, unsigned long pfn, unsigned int order) { - if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) { int nid = early_pfn_to_nid(pfn); @@ -2578,6 +2577,17 @@ void __init memblock_free_pages(struct page *page, unsigned long pfn, /* KMSAN will take care of these pages. */ return; } + + /* pages were reserved and not allocated */ + if (mem_alloc_profiling_enabled()) { + union codetag_ref *ref = get_page_tag_ref(page); + + if (ref) { + set_codetag_empty(ref); + put_page_tag_ref(ref); + } + } + __free_pages_core(page, order); } -- 2.44.0.rc0.258.g7320e95886-goog