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,URIBL_BLOCKED, 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 C1ADEC433E0 for ; Tue, 26 Jan 2021 04:46:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6672E22B3B for ; Tue, 26 Jan 2021 04:46:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6672E22B3B 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 B3A198D0080; Mon, 25 Jan 2021 23:45:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B10C08D0076; Mon, 25 Jan 2021 23:45:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A280F8D0080; Mon, 25 Jan 2021 23:45:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 8B7728D0076 for ; Mon, 25 Jan 2021 23:45:59 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 5366F180ACF0D for ; Tue, 26 Jan 2021 04:45:59 +0000 (UTC) X-FDA: 77746688838.15.drink15_0a1026e2758b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 30F7C1814B0CC for ; Tue, 26 Jan 2021 04:45:59 +0000 (UTC) X-HE-Tag: drink15_0a1026e2758b X-Filterd-Recvd-Size: 5671 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 Jan 2021 04:45:58 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id t25so2840060pga.2 for ; Mon, 25 Jan 2021 20:45:58 -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=UTrRvj+rnu7uKdZtV7JH3e3eOXXmQ1na85awbCCwCy8/ezrTVzuL4hM7i17R36CISo vA5licXCN3L52RaCW5nz8WMkZJWyjk6z+O5uc86SwYV0Rc0Z6aMY3yAyqsIgxgxa6RQn xLv9Y9/UubZCB3mFxi4kXiudgQJ1+JufRrX6PQjvPxuihsFJoENHOrSILcih8O8Alihn rTQ31CMp7RSbP5oztcXpLLxoKlHRFIsACwhq57+abN9DFSnBawWgKWSpSMkF1wf4iDBK Oc3D1RbiTsV9Z7SCqr+RILFm3SL6OaaHQEHT7GB0Q6vJbZaLSNXvD2t+WoJ2pZ9Mvr6N OYtA== X-Gm-Message-State: AOAM533ZkTJNNJkfdvmHbfIEmtgrIo0vnwm8F4k8R5rzNbax2Jk3ZvwN kkkvT5Mg2Dq4wx8vQIoamaeMSmj3Mkg= 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: 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