From patchwork Wed Apr 21 06:51:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12215521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02D46C433B4 for ; Wed, 21 Apr 2021 06:54:11 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 691AB6140F for ; Wed, 21 Apr 2021 06:54:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 691AB6140F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rdotE376tKyHyVczWhAf6AeicCVV1nLNMZUh2c+RgXw=; b=RuV8kVriqAsTeqJlX37YCpEzN 2s8NxJ+jW2BXxE7YkTxbc5r09zZQALInHDbi9FXyj5ma6wV+0bHWYcAJkcPd9pCH4FPc7/GqkQT3r dXEkhfhneTYxUzuyjPLgxtr70RrVQo4/YYhoulzL4I3SHCf9GWG3+Vu4VlY4nH4+x+qoWdzKoVLW6 2WdydysMLldyoH+gbNCw70hmZ2DldaZFutJ8TZvA+oOGm9PDqViXZuQd9Zy6vNPbOPVBmZCai7m4j Si6Ig8K7dpxONPvNfQz4+kpnYBDwZtQ54/kFO77EDa4YDgBEkjUbt91kAJg5Gvq0T1xWgbxMKHf+u E1b9qMJQA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZ6ib-00DqnU-0x; Wed, 21 Apr 2021 06:52:15 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ6hz-00Dqj7-NU for linux-arm-kernel@desiato.infradead.org; Wed, 21 Apr 2021 06:51:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=cdZiNc98+r3CttZjNO/BJKXCTRmKdKJLAArSv2gsoGY=; b=gsNCFEQseJuVLvPkEyd+yw/WhS 8WJPdLqMbrqPVSWnuNlJKfK/WjkBIUq2zZ4c0YJ8B0geKcN0JKA5z/Zb9PPqocBkONNduDFeAsdJY mGFzEBA7iQCuaf+ShfGxoQ8Tn1FIYhifN5OILipXRNOPkCykrg1l/gsGLi6oSZxksjI94+MJXLSDL 0/JFtvXCFKju/LURN39gzzSn0yKqABqmNILco/VzVMAfP3SPFHnlyPAtnlPwupmrWJujQMtCdnjWX lshscX7hXA6RgYSb6JwWDEhRuDWkKPeDwhKw0T/ZV9D22Bzo5hB+JgEJGeZefjbW45hnt1fweQfZT POQ2kLOg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ6hx-00CeUk-6m for linux-arm-kernel@lists.infradead.org; Wed, 21 Apr 2021 06:51:34 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 63128613ED; Wed, 21 Apr 2021 06:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618987892; bh=15Yty9Stc/s7dDkOEgwIyIbN8ST3TSGYU3qMkcXC9hU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TmrcFIb08lfBH7VLeugKq4BbEtT6ScBiCAusHWFXcACDAT9opqtVqCujIpyrOKLH6 HmEMAvcHI/0+ziMxSNgj7LAnWtjlra9aVXMDDZgbt6gxW73TntknR63NiRjV7E+YPB 2FeVpn/9oGhfE6uGETTV12ae5sk0dIXAc3hWUamjsew5hccK6HCjX+/V/S5rHE+EXj gu3G/Ez8OOl4UFKHMqPV15Ycke5deiFTulaN4l2hXOXl4s74Tb6aIeYzh7NkgShF60 aeG8U7oUpz5xSpmhsQdZlkFEHobmPMmkiunZI+xgWK5kpoKT9dnC5/TmjhQz1LYQzK nVWz+T/5RCEFA== From: Mike Rapoport To: linux-arm-kernel@lists.infradead.org Cc: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Marc Zyngier , Mark Rutland , Mike Rapoport , Mike Rapoport , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 4/4] arm64: drop pfn_valid_within() and simplify pfn_valid() Date: Wed, 21 Apr 2021 09:51:08 +0300 Message-Id: <20210421065108.1987-5-rppt@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210421065108.1987-1-rppt@kernel.org> References: <20210421065108.1987-1-rppt@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210420_235133_341731_489B0ED7 X-CRM114-Status: GOOD ( 17.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mike Rapoport The arm64's version of pfn_valid() differs from the generic because of two reasons: * Parts of the memory map are freed during boot. This makes it necessary to verify that there is actual physical memory that corresponds to a pfn which is done by querying memblock. * There are NOMAP memory regions. These regions are not mapped in the linear map and until the previous commit the struct pages representing these areas had default values. As the consequence of absence of the special treatment of NOMAP regions in the memory map it was necessary to use memblock_is_map_memory() in pfn_valid() and to have pfn_valid_within() aliased to pfn_valid() so that generic mm functionality would not treat a NOMAP page as a normal page. Since the NOMAP regions are now marked as PageReserved(), pfn walkers and the rest of core mm will treat them as unusable memory and thus pfn_valid_within() is no longer required at all and can be disabled by removing CONFIG_HOLES_IN_ZONE on arm64. pfn_valid() can be slightly simplified by replacing memblock_is_map_memory() with memblock_is_memory(). Signed-off-by: Mike Rapoport Acked-by: David Hildenbrand --- arch/arm64/Kconfig | 3 --- arch/arm64/mm/init.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e4e1b6550115..58e439046d05 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1040,9 +1040,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK def_bool y depends on NUMA -config HOLES_IN_ZONE - def_bool y - source "kernel/Kconfig.hz" config ARCH_SPARSEMEM_ENABLE diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index dc03bdc12c0f..eb3f56fb8c7c 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -243,7 +243,7 @@ int pfn_valid(unsigned long pfn) /* * ZONE_DEVICE memory does not have the memblock entries. - * memblock_is_map_memory() check for ZONE_DEVICE based + * memblock_is_memory() check for ZONE_DEVICE based * addresses will always fail. Even the normal hotplugged * memory will never have MEMBLOCK_NOMAP flag set in their * memblock entries. Skip memblock search for all non early @@ -254,7 +254,7 @@ int pfn_valid(unsigned long pfn) return pfn_section_valid(ms, pfn); } #endif - return memblock_is_map_memory(addr); + return memblock_is_memory(addr); } EXPORT_SYMBOL(pfn_valid);