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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78289C433FE for ; Fri, 22 Oct 2021 12:22:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 14D1961208 for ; Fri, 22 Oct 2021 12:22:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 14D1961208 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id AEEAF940007; Fri, 22 Oct 2021 08:22:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9D94900002; Fri, 22 Oct 2021 08:22:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9647B940007; Fri, 22 Oct 2021 08:22:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0156.hostedemail.com [216.40.44.156]) by kanga.kvack.org (Postfix) with ESMTP id 894CD900002 for ; Fri, 22 Oct 2021 08:22:51 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5500C31E43 for ; Fri, 22 Oct 2021 12:22:51 +0000 (UTC) X-FDA: 78723987342.05.A15D97E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf07.hostedemail.com (Postfix) with ESMTP id C39B210000AA for ; Fri, 22 Oct 2021 12:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634905370; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lm3PNIF2S0K4K4WLBOwjvTNY9grqBtS5TFJa0ZgTsDk=; b=YofnUkF7u2uGwbb/WNkFipnx32kmum23+RUKyp7jO9oIvmUHVQrMSwJm8gM9l4e+WPxlkA 7oFQmRDCYHrqguBQp65I9eRXH3p/KTcUUY9MbyY3OvfDJq1vQXVNOXn6v7V9+pZwtDR51T RB/oHH5LdNVxgrChrnx6x8aPCmXT8bg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-iwgkDGY4NPSaxh9U8YJSsw-1; Fri, 22 Oct 2021 08:22:47 -0400 X-MC-Unique: iwgkDGY4NPSaxh9U8YJSsw-1 Received: by mail-wm1-f72.google.com with SMTP id n189-20020a1c27c6000000b00322f2e380f2so1082470wmn.6 for ; Fri, 22 Oct 2021 05:22:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=Lm3PNIF2S0K4K4WLBOwjvTNY9grqBtS5TFJa0ZgTsDk=; b=Hr91PlT9WOXlcU0U7NL60TlySGfDrxrG6MGGurjLicbnaok0/jzEYQGS/okMCpNL4Y JRpW/aeYWbS3ixq0VsMev0UkI6465zQGri/Lp2S3rR7tHSlgd5W2+xcag/iN8TTCQ77r WR7E1Q1y2DbDMhQOoqn5pj7+0rVoeSOvb+Fpmzjo9/fozNVbPsqnFJJ57U8s+knYcxyr 2QaHo0FdPpwAD0at5yfKknikrUdZlgI/cNJZ9DmphG3NG3ACWX6STALG3Yq0oz5p4KzP P8/jufLEOpaBUpor770bdoNYd+P3/NvwWpBxh6t+oWy70HDJeShs9E91f04eS//554NF A6XQ== X-Gm-Message-State: AOAM531ofkCsQ/VreiJkAt+21oIKb6dvkkLQ1QU34Po95543YqTUgJx8 QIwWgd0ChcnNZHoZxNQ5eFDhnTeXqg08nuSt+DxecBi8p3yl8qPx/xRpUnpA+kAxWG8V24L90+R sc8ZNaDzrDSw= X-Received: by 2002:a5d:6442:: with SMTP id d2mr15549580wrw.356.1634905366092; Fri, 22 Oct 2021 05:22:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9Ax08EtLUCC0p7CmqxJQykoibwilBZDOykjM7r34VB3UtotJaWTHceuBHMMxN5DPCje07gQ== X-Received: by 2002:a5d:6442:: with SMTP id d2mr15549549wrw.356.1634905365864; Fri, 22 Oct 2021 05:22:45 -0700 (PDT) Received: from [192.168.3.132] (p5b0c6324.dip0.t-ipconnect.de. [91.12.99.36]) by smtp.gmail.com with ESMTPSA id k17sm7652830wrc.93.2021.10.22.05.22.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Oct 2021 05:22:45 -0700 (PDT) Message-ID: <3cd2d3d2-6d97-3cd6-b273-6e52aa6066c9@redhat.com> Date: Fri, 22 Oct 2021 14:22:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH v2 2/2] memblock: exclude MEMBLOCK_NOMAP regions from kmemleak To: Mike Rapoport , linux-mm@kvack.org Cc: Andrew Morton , Catalin Marinas , Linus Torvalds , Mike Rapoport , Qian Cai , Vladimir Zapolskiy , linux-kernel@vger.kernel.org References: <20211021070929.23272-1-rppt@kernel.org> <20211021070929.23272-3-rppt@kernel.org> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20211021070929.23272-3-rppt@kernel.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: 1qqabkz9nwaqss13hks7peiddkw7mu31 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C39B210000AA Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YofnUkF7; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf07.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=david@redhat.com X-HE-Tag: 1634905375-728383 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: On 21.10.21 09:09, Mike Rapoport wrote: > From: Mike Rapoport > > Vladimir Zapolskiy reports: > > commit a7259df76702 ("memblock: make memblock_find_in_range method private") > invokes a kernel panic while running kmemleak on OF platforms with nomaped > regions: > > Unable to handle kernel paging request at virtual address fff000021e00000 > [...] > scan_block+0x64/0x170 > scan_gray_list+0xe8/0x17c > kmemleak_scan+0x270/0x514 > kmemleak_write+0x34c/0x4ac > > The memory allocated from memblock is registered with kmemleak, but if it > is marked MEMBLOCK_NOMAP it won't have linear map entries so an attempt to > scan such areas will fault. > > Ideally, memblock_mark_nomap() would inform kmemleak to ignore > MEMBLOCK_NOMAP memory, but it can be called before kmemleak interfaces > operating on physical addresses can use __va() conversion. > > Make sure that functions that mark allocated memory as MEMBLOCK_NOMAP take > care of informing kmemleak to ignore such memory. > > Link: https://lore.kernel.org/all/8ade5174-b143-d621-8c8e-dc6a1898c6fb@linaro.org > Link: https://lore.kernel.org/all/c30ff0a2-d196-c50d-22f0-bd50696b1205@quicinc.com > Fixes: a7259df76702 ("memblock: make memblock_find_in_range method private") > Reported-by: Vladimir Zapolskiy > Signed-off-by: Mike Rapoport > --- > drivers/acpi/tables.c | 3 +++ > drivers/of/of_reserved_mem.c | 2 ++ > mm/memblock.c | 3 +++ > 3 files changed, 8 insertions(+) > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index f9383736fa0f..71419eb16e09 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include "internal.h" > > #ifdef CONFIG_ACPI_CUSTOM_DSDT > @@ -601,6 +602,8 @@ void __init acpi_table_upgrade(void) > */ > arch_reserve_mem_area(acpi_tables_addr, all_tables_size); > > + kmemleak_ignore_phys(acpi_tables_addr); > + > /* > * early_ioremap only can remap 256k one time. If we map all > * tables one time, we will hit the limit. Need to map chunks > diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c > index 59c1390cdf42..9da8835ba5a5 100644 > --- a/drivers/of/of_reserved_mem.c > +++ b/drivers/of/of_reserved_mem.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > > #include "of_private.h" > > @@ -46,6 +47,7 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, > err = memblock_mark_nomap(base, size); > if (err) > memblock_free(base, size); > + kmemleak_ignore_phys(base); > } > > return err; > diff --git a/mm/memblock.c b/mm/memblock.c > index 184dcd2e5d99..dab804b09d62 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -932,6 +932,9 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) > * covered by the memory map. The struct page representing NOMAP memory > * frames in the memory map will be PageReserved() > * > + * Note: if the memory being marked %MEMBLOCK_NOMAP was allocated from > + * memblock, the caller must inform kmemleak to ignore that memory > + * > * Return: 0 on success, -errno on failure. > */ > int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb