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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 4FA9CC433E0 for ; Wed, 27 Jan 2021 08:42:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A2EB2067B for ; Wed, 27 Jan 2021 08:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S316853AbhAZXLR (ORCPT ); Tue, 26 Jan 2021 18:11:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727448AbhAZEqh (ORCPT ); Mon, 25 Jan 2021 23:46:37 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BACAC061786; Mon, 25 Jan 2021 20:45:57 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id o16so1150579pgg.5; Mon, 25 Jan 2021 20:45:57 -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=6FRU9caWwWjvnrqszVqRsss5Upxnc33B3OfV8qLPoO8=; b=W4RA86kLnjWTiuxUVbhONI6Bm+cKfU0zTwzeNm5Bh2PbwqcffIaLtWkSkMYi9d74KQ YEw21XNE3s/6pt6oWrl33dPhznWfHD9G0D36P7KyBrgUXzdxHUgr7slPtOfwICeSOtfK bGdsVWUXp6Xdbr4MtOOiC7eleBcaVYUzllWgVMgPFJ56fuV1J3PXJ64m5CEhUV/Iz/l1 RzTxY0RCEAQ+DMUXEM+Gzn26nxeLSgMQZ8q6edNT4k8ioRm5dw+igsdP+aErr8FOPKf0 3KpLEgbCEQHzq+Gn0Q4K0EmZW589YkLiZVc4Sjp4qewZX1RlbqdDBRTv8Dv9skqCbZ+Q XJVg== 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=6FRU9caWwWjvnrqszVqRsss5Upxnc33B3OfV8qLPoO8=; b=ZB8BJSqWGPMRo77IreJ0ftIGo8qS14OE/vWKsVCXO5zlJ9Dm7EGV20qGQbANoqilhj R8LcL9lg1WJS3q9z0F+cmTKtGTVCbwFEQqHqsjIJZ2YLdwI2KeVjVS8AmcR9fX8U2aQH wqNdxFn6F6pqoUNOIj/13jqCo5IYnp8T/muOVWVdETfgOq84AO1RC1ZmyPicsBs+PB2E tWyMnxbEUBPSVP+L2TRiFld2NY1Q0RxAAkJSdoNNioSlF6EniyxIhLbR2pfnq995daEy x1ppQRVJSgP0hGVyt9x2YQLesRw9g4BjP8S4s+l/36sFP8pqIv+SuMyiryI6YKGypwRa ZzAg== X-Gm-Message-State: AOAM532+FpLp5VMYZBB1JeDwiBGoua+g15nF5mnReMBxjqwTOIN0GBKW UzNqqcQTB5a9KWzNR8OJQD0= X-Google-Smtp-Source: ABdhPJwh8Tjq5Jl4agwd7Q0coDWv3fX5SZ4w1pL9yRhmvQDkl3nOUH6J4NwYY7EEGKRaZEhSNooRCA== X-Received: by 2002:a63:505d:: with SMTP id q29mr3910504pgl.241.1611636357203; Mon, 25 Jan 2021 20:45:57 -0800 (PST) Received: from bobo.ozlabs.ibm.com (192.156.221.203.dial.dynamic.acc50-nort-cbr.comindico.com.au. [203.221.156.192]) by smtp.gmail.com with ESMTPSA id 68sm19272293pfg.90.2021.01.25.20.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 20:45:56 -0800 (PST) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Jonathan Cameron , Christoph Hellwig , Christophe Leroy , Rick Edgecombe , Ding Tianhong , Michael Ellerman Subject: [PATCH v11 06/13] powerpc: inline huge vmap supported functions Date: Tue, 26 Jan 2021 14:45:03 +1000 Message-Id: <20210126044510.2491820-7-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210126044510.2491820-1-npiggin@gmail.com> References: <20210126044510.2491820-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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: linuxppc-dev@lists.ozlabs.org Acked-by: Michael Ellerman Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/vmalloc.h | 19 ++++++++++++++++--- arch/powerpc/mm/book3s64/radix_pgtable.c | 21 --------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/arch/powerpc/include/asm/vmalloc.h b/arch/powerpc/include/asm/vmalloc.h index 105abb73f075..3f0c153befb0 100644 --- a/arch/powerpc/include/asm/vmalloc.h +++ b/arch/powerpc/include/asm/vmalloc.h @@ -1,12 +1,25 @@ #ifndef _ASM_POWERPC_VMALLOC_H #define _ASM_POWERPC_VMALLOC_H +#include #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) +{ + /* HPT does not cope with large pages in the vmalloc area */ + return radix_enabled(); +} + +static inline bool arch_vmap_pmd_supported(pgprot_t prot) +{ + return radix_enabled(); +} #endif #endif /* _ASM_POWERPC_VMALLOC_H */ diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 743807fc210f..8da62afccee5 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1082,22 +1082,6 @@ void radix__ptep_modify_prot_commit(struct vm_area_struct *vma, set_pte_at(mm, addr, ptep, pte); } -bool arch_vmap_pud_supported(pgprot_t prot) -{ - /* HPT does not cope with large pages in the vmalloc area */ - return radix_enabled(); -} - -bool arch_vmap_pmd_supported(pgprot_t prot) -{ - return radix_enabled(); -} - -int p4d_free_pud_page(p4d_t *p4d, unsigned long addr) -{ - return 0; -} - int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) { pte_t *ptep = (pte_t *)pud; @@ -1181,8 +1165,3 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) return 1; } - -bool arch_vmap_p4d_supported(pgprot_t prot) -{ - return false; -} -- 2.23.0