From patchwork Tue Aug 16 16:36:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 12945075 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 09231C2BB41 for ; Tue, 16 Aug 2022 16:37:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73B096B0073; Tue, 16 Aug 2022 12:37:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6EAB16B0075; Tue, 16 Aug 2022 12:37:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58BA58D0001; Tue, 16 Aug 2022 12:37:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 42CBA6B0073 for ; Tue, 16 Aug 2022 12:37:41 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 201CF1411E5 for ; Tue, 16 Aug 2022 16:37:41 +0000 (UTC) X-FDA: 79806011922.27.979C079 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) by imf14.hostedemail.com (Postfix) with ESMTP id 03495100069 for ; Tue, 16 Aug 2022 16:37:37 +0000 (UTC) Received: by mail-ed1-f73.google.com with SMTP id g8-20020a056402424800b0043e81c582a4so7027458edb.17 for ; Tue, 16 Aug 2022 09:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc; bh=Bt86ycU5TqIe5DWAivAOKuWY2/WSOfZm/1Ale3yOGtg=; b=qLBFcuLAhlDwJfDACSf2gt/J+hZ5HtnFVGcb/nrGUjJCkIsoRyLc6pgG87MjjR8KIQ 5Iz1bYpH9D6l6+a2yXEoF1qmbqsfO3LSbDkEQeRvX5ucEx2BqTk5HTxQmnGstdvJ2/Z2 YzWpn4+XRNNACYVTttlB2gPuTIQYUoVVf38GfoZerRGl9jB1RxdEpsDA2NaNBgqtb4Vj BnblFZJWuEkSo0udCHh6tFwqzcPKu6LI4BbFd2cQnQWmcEuRRgSoT6yiJLCOQU55+jP9 aiutqycGzt4DBlwwmbrM9c1zKuDLUCGppvkHPVvSSLp/Pgkw/eKflRRZhpcxWOYy3qMo fFBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc; bh=Bt86ycU5TqIe5DWAivAOKuWY2/WSOfZm/1Ale3yOGtg=; b=S1V9M++H1ByZ6SfOYA340TZNBV9e1hFgRzdl39rbaLLoKj3n6oHgWHK2o/vdW6C+0l n7t733dgwMUOGo6sUEYzp7cCcplB7OPQujFP2OZkGmJHq1JYaisjq7pqpnold+vDStin FvyhAoFYtwmRhr+hvw1B9ueLLeCoaOjaDcFn88pbeBK2AeGU4VH5VTTSvgb8MvrQRnSh Cut+8wBQg+plMqLrq/r8e6PX1pIfuvtlEoRoRO9CSIF+fX66C2HGp+62iBxYHDKNOhRA pt7ZxNDsXbuUHVqWOvLmxqsp1vhlvx/5U5Go9g5FUKHbDWXmVPYdfsWRKIfWjAcxFwgv 41lQ== X-Gm-Message-State: ACgBeo0P04VNpacLr937QsqGbOdmX8vxogvc+asWKn8bJrmRtHw49CWI TvPdfsBLxWyDawuYo/vcXeVk42/UVQ== X-Google-Smtp-Source: AA6agR7puhx9qSi+R3MTquY9NGN8yzzazt4EdG1n9Sdj8HxHiF3+944McfTa/YkTSASAVUo0d2GXJFjQsg== X-Received: from elver.muc.corp.google.com ([2a00:79e0:9c:201:b8f6:52b8:6a74:6073]) (user=elver job=sendgmr) by 2002:a05:6402:4282:b0:43e:612c:fcf7 with SMTP id g2-20020a056402428200b0043e612cfcf7mr18989740edc.242.1660667856291; Tue, 16 Aug 2022 09:37:36 -0700 (PDT) Date: Tue, 16 Aug 2022 18:36:41 +0200 Message-Id: <20220816163641.2359996-1-elver@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH 5.19.y] Revert "mm: kfence: apply kmemleak_ignore_phys on early allocated pool" From: Marco Elver To: elver@google.com, stable@vger.kernel.org, Greg Kroah-Hartman Cc: Alexander Potapenko , Dmitry Vyukov , Andrew Morton , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Will Deacon , Catalin Marinas , Yee Lee , Max Schulze ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660667860; a=rsa-sha256; cv=none; b=J+S0RoHIJSuMA88eDU35s6brBpBb6QMMGU54mc1hFBRBDY8j5VPOdXMmZuKpoqb/1Y6KZq uPa86FFKLs6k/13CFKWEwE+j4VAx4N0P9sH/tnkcN/24eDZS5+xEQJvQy2W2ithfTsrFVz 8YRvIt4b4YNXl4C+/5wzVTQiIQI0ebA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=qLBFcuLA; spf=pass (imf14.hostedemail.com: domain of 30Mf7YgUKCG0PWgPcRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--elver.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=30Mf7YgUKCG0PWgPcRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--elver.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660667860; 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: references:dkim-signature; bh=Bt86ycU5TqIe5DWAivAOKuWY2/WSOfZm/1Ale3yOGtg=; b=et+yLSKWY0hIPYzw9ZoNiNfpMq/FReJn0Ma0016vkhrVcfZZu/it7FT47IGHzJnYcZyKjp LxvgkY8IHmtqTdsRHSLMnzdzi/7P/W6x+bavcoeAiOarIY/nC0wCUXDRSCKdblzCcINfzU 1b9mtham08mv683z6yHzPD1/LyHuLiw= Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=qLBFcuLA; spf=pass (imf14.hostedemail.com: domain of 30Mf7YgUKCG0PWgPcRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--elver.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=30Mf7YgUKCG0PWgPcRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--elver.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 03495100069 X-Stat-Signature: e7cnjar3ruc1gsnzxrhqwm348ww3t5hz X-Rspam-User: X-HE-Tag: 1660667857-12623 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: This reverts commit 07313a2b29ed1079eaa7722624544b97b3ead84b. Commit 0c24e061196c21d5 ("mm: kmemleak: add rbtree and store physical address for objects allocated with PA") is not yet in 5.19 (but appears in 6.0). Without 0c24e061196c21d5, kmemleak still stores phys objects and non-phys objects in the same tree, and ignoring (instead of freeing) will cause insertions into the kmemleak object tree by the slab post-alloc hook to conflict with the pool object (see comment). Reports such as the following would appear on boot, and effectively disable kmemleak: | kmemleak: Cannot insert 0xffffff806e24f000 into the object search tree (overlaps existing) | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.19.0-v8-0815+ #5 | Hardware name: Raspberry Pi Compute Module 4 Rev 1.0 (DT) | Call trace: | dump_backtrace.part.0+0x1dc/0x1ec | show_stack+0x24/0x80 | dump_stack_lvl+0x8c/0xb8 | dump_stack+0x1c/0x38 | create_object.isra.0+0x490/0x4b0 | kmemleak_alloc+0x3c/0x50 | kmem_cache_alloc+0x2f8/0x450 | __proc_create+0x18c/0x400 | proc_create_reg+0x54/0xd0 | proc_create_seq_private+0x94/0x120 | init_mm_internals+0x1d8/0x248 | kernel_init_freeable+0x188/0x388 | kernel_init+0x30/0x150 | ret_from_fork+0x10/0x20 | kmemleak: Kernel memory leak detector disabled | kmemleak: Object 0xffffff806e24d000 (size 2097152): | kmemleak: comm "swapper", pid 0, jiffies 4294892296 | kmemleak: min_count = -1 | kmemleak: count = 0 | kmemleak: flags = 0x5 | kmemleak: checksum = 0 | kmemleak: backtrace: | kmemleak_alloc_phys+0x94/0xb0 | memblock_alloc_range_nid+0x1c0/0x20c | memblock_alloc_internal+0x88/0x100 | memblock_alloc_try_nid+0x148/0x1ac | kfence_alloc_pool+0x44/0x6c | mm_init+0x28/0x98 | start_kernel+0x178/0x3e8 | __primary_switched+0xc4/0xcc Reported-by: Max Schulze Signed-off-by: Marco Elver --- mm/kfence/core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 6aff49f6b79e..4b5e5a3d3a63 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -603,6 +603,14 @@ static unsigned long kfence_init_pool(void) addr += 2 * PAGE_SIZE; } + /* + * The pool is live and will never be deallocated from this point on. + * Remove the pool object from the kmemleak object tree, as it would + * otherwise overlap with allocations returned by kfence_alloc(), which + * are registered with kmemleak through the slab post-alloc hook. + */ + kmemleak_free(__kfence_pool); + return 0; } @@ -615,16 +623,8 @@ static bool __init kfence_init_pool_early(void) addr = kfence_init_pool(); - if (!addr) { - /* - * The pool is live and will never be deallocated from this point on. - * Ignore the pool object from the kmemleak phys object tree, as it would - * otherwise overlap with allocations returned by kfence_alloc(), which - * are registered with kmemleak through the slab post-alloc hook. - */ - kmemleak_ignore_phys(__pa(__kfence_pool)); + if (!addr) return true; - } /* * Only release unprotected pages, and do not try to go back and change