From patchwork Tue Feb 2 11:05:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 12061387 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,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 2F388C433E0 for ; Tue, 2 Feb 2021 11:07:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 DA43D64DDC for ; Tue, 2 Feb 2021 11:07:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA43D64DDC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EFJXeZ6adnAZ/chqFvGDcbbEVIhC8rCLvTg8MjVyjic=; b=Mh3SE5fH8Ez0SwxSgnoO9j86Z Ms7LVMLQO2aK3HvsB5Koluy3kX3cZ+YJ+a9QCnuo6n+oo2sug1hchDPZYPH3coHpioi0FYr8EBOp5 Sx3JMxakWC/MjUpl1lp9iAm4Ei81Y8yhSDjX82t+/B4EkhOd1DupS13s3hu939LV3mzcr9iZGOljs 0cbqRfEmKAX2iQFKbRAoLMLQL6soi0eSWmbWYppO5BdDT3JREaoXYHhLEDVVp1epGaShRknU/RufA hNnahPE6XKTlpayCapGC2Xs2b07LD9sDj1n92WEgk1NekNUJxfiDMzjMmu7Krysx1b+YbnKuDtTqH E+vCIxgrA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6tVm-0002On-UK; Tue, 02 Feb 2021 11:06:23 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6tVf-0002M7-Ii for linux-arm-kernel@lists.infradead.org; Tue, 02 Feb 2021 11:06:21 +0000 Received: by mail-pj1-x1034.google.com with SMTP id g15so2143016pjd.2 for ; Tue, 02 Feb 2021 03:06:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0fqvAYwIAe6qA/JSpZVbQ06eMe+7hHIC7Sc9a7+Vq/o=; b=Ew7anYoUzsCcdkDZLXFJNPgKKFbi6sCOtcJGX2pvEQMezt2zeIjGg+R2rV97DUM9hR PaqMXOPH+r238OPk5ITQ0RPjyR6yL/6GAeAPQE5ISBl79MjPMS7hIe+xd53kfA3Pu7DW W4ge10bzA38Cg1fkC+JWZJP89h4jkP2ufsRvldjaPm2oDbDk7iAXpYwR6+vzdbg1F7tj d68X9e+cqe/l4dO/MOF9CmiaYZXiVfVoCQIRFpiv2Bn+8GvwL6pdUvXmAIYV+QNGD4/u vpJ8crKLT3pkNG2Iqh0qA6eOwXCDHKjBvMCpkE1so5sXtQ9kjC2WTZ2q6BU/Rvo6Kqo5 TSQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0fqvAYwIAe6qA/JSpZVbQ06eMe+7hHIC7Sc9a7+Vq/o=; b=ACxgKlnYD6E9hLsozwaOcvhwSk1I83F1r2qphdTfLX6pP4vUaiDbStL2CKeHxYtheS 8hepYXZgX9u84Qj5tCsTxFDtoAyHVlZmXDJfusQkd4jPbySvJ46OKFYdvSr8dKCyMcrR 1F0JHdpwwvy8EZhPSYLItgPIFgvPPkJRFyLm7+yJboVM9T+Y6PycS6lcqIWUGlARlnWj iwuPtdjo80WhvPNJ3DtTR1aG46oH8yhC6H6uwhFsDTb1GJUjYVIqPRcJnoC5pcopKzIG XDzQsX+P+tsEbwyjl1j1svspvJi7H3yok15WmpMbFgEZbioctK6CMhzAsrGu3nbDe9v6 AYhw== X-Gm-Message-State: AOAM533A58zuuSu6/HMeXVaw1dlycU/SFdkKtxmu4X7cZg6DoJe/raAI 1KXE08362u41IbeOXg3pMi8= X-Google-Smtp-Source: ABdhPJwEywoaUK5j84T1+nbm5zee6fxaujESGdsYB3RA5gho5MzJxB+eCjX6lQcCnsBJZGxQQVpuKw== X-Received: by 2002:a17:902:684c:b029:e1:902a:7d67 with SMTP id f12-20020a170902684cb02900e1902a7d67mr1120466pln.22.1612263972865; Tue, 02 Feb 2021 03:06:12 -0800 (PST) Received: from bobo.ozlabs.ibm.com (60-242-11-44.static.tpgi.com.au. [60.242.11.44]) by smtp.gmail.com with ESMTPSA id g19sm3188979pfk.113.2021.02.02.03.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 03:06:12 -0800 (PST) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Subject: [PATCH v12 08/14] arm64: inline huge vmap supported functions Date: Tue, 2 Feb 2021 21:05:09 +1000 Message-Id: <20210202110515.3575274-9-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210202110515.3575274-1-npiggin@gmail.com> References: <20210202110515.3575274-1-npiggin@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210202_060615_667007_BF2F0BFA X-CRM114-Status: GOOD ( 14.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Will Deacon , Catalin Marinas , Ding Tianhong , linux-kernel@vger.kernel.org, Nicholas Piggin , Christoph Hellwig , Christophe Leroy , Jonathan Cameron , Rick Edgecombe , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This allows unsupported levels to be constant folded away, and so p4d_free_pud_page can be removed because it's no longer linked to. Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Acked-by: Catalin Marinas Signed-off-by: Nicholas Piggin --- arch/arm64/include/asm/vmalloc.h | 23 ++++++++++++++++++++--- arch/arm64/mm/mmu.c | 26 -------------------------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/arch/arm64/include/asm/vmalloc.h b/arch/arm64/include/asm/vmalloc.h index 597b40405319..fc9a12d6cc1a 100644 --- a/arch/arm64/include/asm/vmalloc.h +++ b/arch/arm64/include/asm/vmalloc.h @@ -4,9 +4,26 @@ #include #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP -bool arch_vmap_p4d_supported(pgprot_t prot); -bool arch_vmap_pud_supported(pgprot_t prot); -bool arch_vmap_pmd_supported(pgprot_t prot); +static inline bool arch_vmap_p4d_supported(pgprot_t prot) +{ + return false; +} + +static inline bool arch_vmap_pud_supported(pgprot_t prot) +{ + /* + * Only 4k granule supports level 1 block mappings. + * SW table walks can't handle removal of intermediate entries. + */ + return IS_ENABLED(CONFIG_ARM64_4K_PAGES) && + !IS_ENABLED(CONFIG_PTDUMP_DEBUGFS); +} + +static inline bool arch_vmap_pmd_supported(pgprot_t prot) +{ + /* See arch_vmap_pud_supported() */ + return !IS_ENABLED(CONFIG_PTDUMP_DEBUGFS); +} #endif #endif /* _ASM_ARM64_VMALLOC_H */ diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 1613d290cbd1..ab9ba7c36dae 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1313,27 +1313,6 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot) return dt_virt; } -bool arch_vmap_p4d_supported(pgprot_t prot) -{ - return false; -} - -bool arch_vmap_pud_supported(pgprot_t prot) -{ - /* - * Only 4k granule supports level 1 block mappings. - * SW table walks can't handle removal of intermediate entries. - */ - return IS_ENABLED(CONFIG_ARM64_4K_PAGES) && - !IS_ENABLED(CONFIG_PTDUMP_DEBUGFS); -} - -bool arch_vmap_pmd_supported(pgprot_t prot) -{ - /* See arch_vmap_pud_supported() */ - return !IS_ENABLED(CONFIG_PTDUMP_DEBUGFS); -} - int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot) { pud_t new_pud = pfn_pud(__phys_to_pfn(phys), mk_pud_sect_prot(prot)); @@ -1425,11 +1404,6 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr) return 1; } -int p4d_free_pud_page(p4d_t *p4d, unsigned long addr) -{ - return 0; /* Don't attempt a block mapping */ -} - #ifdef CONFIG_MEMORY_HOTPLUG static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size) {