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.8 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,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 1C096C433E0 for ; Sun, 24 Jan 2021 08:25:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5E6222838 for ; Sun, 24 Jan 2021 08:25:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726524AbhAXIZZ (ORCPT ); Sun, 24 Jan 2021 03:25:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726619AbhAXIYW (ORCPT ); Sun, 24 Jan 2021 03:24:22 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21FB0C061788; Sun, 24 Jan 2021 00:23:28 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id g15so6616532pjd.2; Sun, 24 Jan 2021 00:23:28 -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=H9TlhLYPPssMc0ceABPukOINSlBwNuToeKnAunjyAGtSAlzZAV8FrTD6Lyj2mHJJ4i y4AS8SccFUgbMgUGqxrJNvlnwcw1uUaJmyFR1GdTPu+H1SD3vOgb9oX/gJEc8JFUONWW EngXprGRbFCgLjCzEi9PH1wIDD7rNcuaLMsSVvjQIPwrYjUh/GE8q6+rLDgzYqn29KxF 6ekoVrlR8UiPjwHDPFHOXhQUE/LeKI5HZpBrCKcgkali9s8keF65rZq6LBMTdGyeNfjJ KZZe/RghMNEixmN7NhRMTNYeSgJlv5Z1+QQXs+zaH9IZ2Peo9ARAio4V+7lLiz5xkRjK 8xWw== 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=lEvm5melwGsIzSkP0pHY2QIvKKC897nowOhDbxptC6U8wZg+qfSGrRt7AahpUFhpGO RemgJ6QGpCKWsXO3VN3+ad7vwu0dT3dU6KcIMOf2fG7qw46fY1A2OfMpa7C/dPogy0Kb zWPdXYHVK4eyfEZMeGBpE/2KvPNPfiJhQUde48iG0bq0nGYaokBGmY2Sk7djnuswau8C epUupw7nLwN9l8/oXTZvDzKqK7R1vUWdNuLzvyVKIdGhtxFu3wuwj5a27w7X8OPBEe7h xFnm/wXqcFju0gUrA11eyggpXGDVcyVbYuaVzv4FyeaLBpsfA8Ce3AeM7+2vCp1RrLYL Tmzw== X-Gm-Message-State: AOAM531VIrix5w1+dH2tScoU8GP2fz3jUGbJyH/SzXaJPwUL7KVEkJ5o lCiVaZPkSvU3z263iyFyuzI= X-Google-Smtp-Source: ABdhPJwdJIoki6IUcecjOrHd9qF/DDTmYOojoF7Kmx2FLKYrVifE66eYZA1PnPDfTKB+XB3xG/u7JQ== X-Received: by 2002:a17:90b:1196:: with SMTP id gk22mr15333934pjb.168.1611476607794; Sun, 24 Jan 2021 00:23:27 -0800 (PST) Received: from bobo.ozlabs.ibm.com ([124.170.13.62]) by smtp.gmail.com with ESMTPSA id gb12sm11799757pjb.51.2021.01.24.00.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 00:23:27 -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, Zefan Li , Jonathan Cameron , Christoph Hellwig , Christophe Leroy , Rick Edgecombe , Ding Tianhong , Michael Ellerman Subject: [PATCH v10 06/12] powerpc: inline huge vmap supported functions Date: Sun, 24 Jan 2021 18:22:24 +1000 Message-Id: <20210124082230.2118861-7-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210124082230.2118861-1-npiggin@gmail.com> References: <20210124082230.2118861-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