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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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=ham 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 D06FCC433DB for ; Sun, 24 Jan 2021 08:23:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 668BB22582 for ; Sun, 24 Jan 2021 08:23:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 668BB22582 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F3AB46B0012; Sun, 24 Jan 2021 03:23:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EC3CE6B0022; Sun, 24 Jan 2021 03:23:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D648A6B0023; Sun, 24 Jan 2021 03:23:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0253.hostedemail.com [216.40.44.253]) by kanga.kvack.org (Postfix) with ESMTP id BCDE86B0012 for ; Sun, 24 Jan 2021 03:23:29 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 898E3363F for ; Sun, 24 Jan 2021 08:23:29 +0000 (UTC) X-FDA: 77739979338.26.title52_0f12bc62757b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 6BBE61804B655 for ; Sun, 24 Jan 2021 08:23:29 +0000 (UTC) X-HE-Tag: title52_0f12bc62757b X-Filterd-Recvd-Size: 5643 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Sun, 24 Jan 2021 08:23:28 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id u4so6595067pjn.4 for ; 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=qQsN2wZ4wJ8Pr2g7mvFHr/IX0CuKm0qflHtGQ1o0kSWannVpM90ikwAgl7bcsI9Cga f1RspRqAv5MBGHNGt+dr5LgLPtMCI/Cd3dQGAmPaeoD0O+pHOHTe+gEQkB5JT9+2GIgm iIdaTJkjVDiIQ2AlBFsvIFFZwfzFh4HlFN903WccY6Q17Luc20mBiVYHEIVu3XW+k83N ROI+FBwjmfQYJ7mWIqm5+ZxLof3L+Ps9h4+RlXEOJ18Db0kSD/DKuCsgW71/SzglYloA n2fk5/HpP0XHTbA9ivN7AWMngZj5QlaNrNDjnZO4aGOUB+GDatVO3A5+MVQfC6Qo4d6o Avew== X-Gm-Message-State: AOAM533bDzPe3Wc1kcgKWvfLqyddcsDMHVrw19T0zNIvrp8RgcW+Ko26 VfUrtOw9rV3uScNpp/nKB5XGt3FCQ9Q= 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: quoted-printable 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: 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/as= m/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 =20 +#include #include =20 #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 =20 #endif /* _ASM_POWERPC_VMALLOC_H */ diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/b= ook3s64/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); } =20 -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 =3D (pte_t *)pud; @@ -1181,8 +1165,3 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long add= r) =20 return 1; } - -bool arch_vmap_p4d_supported(pgprot_t prot) -{ - return false; -} --=20 2.23.0