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=-5.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT 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 D95C6C43219 for ; Thu, 2 May 2019 13:46:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A9C732133F for ; Thu, 2 May 2019 13:46:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eAK2+5bI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9C732133F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LEeWrYM8beVwR8JFGAaOqWS530LijtTVcBKh/fNUEao=; b=eAK2+5bItd9y17 uHYs02IE4lZ9710WLz3CQAPgkuGZmi/0GN3Ba2ucTpwl8IbvCHJRh1tyJQ0pVBXNnDZM0G0z88b6t +uX41rfbspokz3i0b+TNtTiH7W0TYM5K4CWxgmfaG+xAxbHeACzeTX5TN3e/xIkiuJ1EkfaAxUBrG IQSUffVw/MmlPxdcPYJ/U2twstZBeL4Hg0gMrKuYHocwn7Hn0uNe1DC6XfNNpLnetWH0p8XnLsU6j 9w/rGbTlWB3+U7xRKNRDaBWhubz9gpZyx7qqzxe9k8l76RoXpWxUs1gCwwOlFiDO1yKg2Mme/IPN8 lf7mPlpb5ym+QwBSEExA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMC2d-0007T7-3M; Thu, 02 May 2019 13:46:27 +0000 Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMC2Z-0007SZ-Pj; Thu, 02 May 2019 13:46:23 +0000 Date: Thu, 2 May 2019 06:46:23 -0700 From: Matthew Wilcox To: Anshuman Khandual Subject: Re: [PATCH] mm/pgtable: Drop pgtable_t variable from pte_fn_t functions Message-ID: <20190502134623.GA18948@bombadil.infradead.org> References: <1556803126-26596-1-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1556803126-26596-1-git-send-email-anshuman.khandual@arm.com> User-Agent: Mutt/1.9.2 (2017-12-15) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Catalin Marinas , Will Deacon , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, linux-efi@vger.kernel.org, Thomas Gleixner , x86@kernel.org, Russell King , Ingo Molnar , xen-devel@lists.xenproject.org, intel-gfx@lists.freedesktop.org, jglisse@redhat.com, Mike Rapoport , Dan Williams , linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com, akpm@linux-foundation.org, Logan Gunthorpe , "Kirill A. Shutemov" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, May 02, 2019 at 06:48:46PM +0530, Anshuman Khandual wrote: > Drop the pgtable_t variable from all implementation for pte_fn_t as none of > them use it. apply_to_pte_range() should stop computing it as well. Should > help us save some cycles. You didn't add Martin Schwidefsky for some reason. He introduced it originally for s390 for sub-page page tables back in 2008 (commit 2f569afd9c). I think he should confirm that he no longer needs it. > --- > - Boot tested on arm64 and x86 platforms. > - Build tested on multiple platforms with their defconfig > > arch/arm/kernel/efi.c | 3 +-- > arch/arm/mm/dma-mapping.c | 3 +-- > arch/arm/mm/pageattr.c | 3 +-- > arch/arm64/kernel/efi.c | 3 +-- > arch/arm64/mm/pageattr.c | 3 +-- > arch/x86/xen/mmu_pv.c | 3 +-- > drivers/gpu/drm/i915/i915_mm.c | 3 +-- > drivers/xen/gntdev.c | 6 ++---- > drivers/xen/privcmd.c | 6 ++---- > drivers/xen/xlate_mmu.c | 3 +-- > include/linux/mm.h | 3 +-- > mm/memory.c | 5 +---- > mm/vmalloc.c | 2 +- > 13 files changed, 15 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/kernel/efi.c b/arch/arm/kernel/efi.c > index 9f43ba012d10..b1f142a01f2f 100644 > --- a/arch/arm/kernel/efi.c > +++ b/arch/arm/kernel/efi.c > @@ -11,8 +11,7 @@ > #include > #include > > -static int __init set_permissions(pte_t *ptep, pgtable_t token, > - unsigned long addr, void *data) > +static int __init set_permissions(pte_t *ptep, unsigned long addr, void *data) > { > efi_memory_desc_t *md = data; > pte_t pte = *ptep; > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c > index 43f46aa7ef33..739286511a18 100644 > --- a/arch/arm/mm/dma-mapping.c > +++ b/arch/arm/mm/dma-mapping.c > @@ -496,8 +496,7 @@ void __init dma_contiguous_remap(void) > } > } > > -static int __dma_update_pte(pte_t *pte, pgtable_t token, unsigned long addr, > - void *data) > +static int __dma_update_pte(pte_t *pte, unsigned long addr, void *data) > { > struct page *page = virt_to_page(addr); > pgprot_t prot = *(pgprot_t *)data; > diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c > index 1403cb4a0c3d..c8b500940e1f 100644 > --- a/arch/arm/mm/pageattr.c > +++ b/arch/arm/mm/pageattr.c > @@ -22,8 +22,7 @@ struct page_change_data { > pgprot_t clear_mask; > }; > > -static int change_page_range(pte_t *ptep, pgtable_t token, unsigned long addr, > - void *data) > +static int change_page_range(pte_t *ptep, unsigned long addr, void *data) > { > struct page_change_data *cdata = data; > pte_t pte = *ptep; > diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c > index 4f9acb5fbe97..230cff073a08 100644 > --- a/arch/arm64/kernel/efi.c > +++ b/arch/arm64/kernel/efi.c > @@ -86,8 +86,7 @@ int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md) > return 0; > } > > -static int __init set_permissions(pte_t *ptep, pgtable_t token, > - unsigned long addr, void *data) > +static int __init set_permissions(pte_t *ptep, unsigned long addr, void *data) > { > efi_memory_desc_t *md = data; > pte_t pte = READ_ONCE(*ptep); > diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c > index 6cd645edcf35..0be077628b21 100644 > --- a/arch/arm64/mm/pageattr.c > +++ b/arch/arm64/mm/pageattr.c > @@ -27,8 +27,7 @@ struct page_change_data { > > bool rodata_full __ro_after_init = IS_ENABLED(CONFIG_RODATA_FULL_DEFAULT_ENABLED); > > -static int change_page_range(pte_t *ptep, pgtable_t token, unsigned long addr, > - void *data) > +static int change_page_range(pte_t *ptep, unsigned long addr, void *data) > { > struct page_change_data *cdata = data; > pte_t pte = READ_ONCE(*ptep); > diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c > index a21e1734fc1f..308a6195fd26 100644 > --- a/arch/x86/xen/mmu_pv.c > +++ b/arch/x86/xen/mmu_pv.c > @@ -2702,8 +2702,7 @@ struct remap_data { > struct mmu_update *mmu_update; > }; > > -static int remap_area_pfn_pte_fn(pte_t *ptep, pgtable_t token, > - unsigned long addr, void *data) > +static int remap_area_pfn_pte_fn(pte_t *ptep, unsigned long addr, void *data) > { > struct remap_data *rmd = data; > pte_t pte = pte_mkspecial(mfn_pte(*rmd->pfn, rmd->prot)); > diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_mm.c > index e4935dd1fd37..c23bb29e6d3e 100644 > --- a/drivers/gpu/drm/i915/i915_mm.c > +++ b/drivers/gpu/drm/i915/i915_mm.c > @@ -35,8 +35,7 @@ struct remap_pfn { > pgprot_t prot; > }; > > -static int remap_pfn(pte_t *pte, pgtable_t token, > - unsigned long addr, void *data) > +static int remap_pfn(pte_t *pte, unsigned long addr, void *data) > { > struct remap_pfn *r = data; > > diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c > index 7cf9c51318aa..f0df481e2697 100644 > --- a/drivers/xen/gntdev.c > +++ b/drivers/xen/gntdev.c > @@ -264,8 +264,7 @@ void gntdev_put_map(struct gntdev_priv *priv, struct gntdev_grant_map *map) > > /* ------------------------------------------------------------------ */ > > -static int find_grant_ptes(pte_t *pte, pgtable_t token, > - unsigned long addr, void *data) > +static int find_grant_ptes(pte_t *pte, unsigned long addr, void *data) > { > struct gntdev_grant_map *map = data; > unsigned int pgnr = (addr - map->vma->vm_start) >> PAGE_SHIFT; > @@ -292,8 +291,7 @@ static int find_grant_ptes(pte_t *pte, pgtable_t token, > } > > #ifdef CONFIG_X86 > -static int set_grant_ptes_as_special(pte_t *pte, pgtable_t token, > - unsigned long addr, void *data) > +static int set_grant_ptes_as_special(pte_t *pte, unsigned long addr, void *data) > { > set_pte_at(current->mm, addr, pte, pte_mkspecial(*pte)); > return 0; > diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c > index b24ddac1604b..4c7268869e2c 100644 > --- a/drivers/xen/privcmd.c > +++ b/drivers/xen/privcmd.c > @@ -730,8 +730,7 @@ struct remap_pfn { > unsigned long i; > }; > > -static int remap_pfn_fn(pte_t *ptep, pgtable_t token, unsigned long addr, > - void *data) > +static int remap_pfn_fn(pte_t *ptep, unsigned long addr, void *data) > { > struct remap_pfn *r = data; > struct page *page = r->pages[r->i]; > @@ -965,8 +964,7 @@ static int privcmd_mmap(struct file *file, struct vm_area_struct *vma) > * on a per pfn/pte basis. Mapping calls that fail with ENOENT > * can be then retried until success. > */ > -static int is_mapped_fn(pte_t *pte, struct page *pmd_page, > - unsigned long addr, void *data) > +static int is_mapped_fn(pte_t *pte, unsigned long addr, void *data) > { > return pte_none(*pte) ? 0 : -EBUSY; > } > diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c > index e7df65d32c91..ba883a80b3c0 100644 > --- a/drivers/xen/xlate_mmu.c > +++ b/drivers/xen/xlate_mmu.c > @@ -93,8 +93,7 @@ static void setup_hparams(unsigned long gfn, void *data) > info->fgfn++; > } > > -static int remap_pte_fn(pte_t *ptep, pgtable_t token, unsigned long addr, > - void *data) > +static int remap_pte_fn(pte_t *ptep, unsigned long addr, void *data) > { > struct remap_data *info = data; > struct page *page = info->pages[info->index++]; > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 6b10c21630f5..f9509d57edc6 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2595,8 +2595,7 @@ static inline int vm_fault_to_errno(vm_fault_t vm_fault, int foll_flags) > return 0; > } > > -typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, > - void *data); > +typedef int (*pte_fn_t)(pte_t *pte, unsigned long addr, void *data); > extern int apply_to_page_range(struct mm_struct *mm, unsigned long address, > unsigned long size, pte_fn_t fn, void *data); > > diff --git a/mm/memory.c b/mm/memory.c > index ab650c21bccd..dd0e64c94ddc 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -1952,7 +1952,6 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, > { > pte_t *pte; > int err; > - pgtable_t token; > spinlock_t *uninitialized_var(ptl); > > pte = (mm == &init_mm) ? > @@ -1965,10 +1964,8 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, > > arch_enter_lazy_mmu_mode(); > > - token = pmd_pgtable(*pmd); > - > do { > - err = fn(pte++, token, addr, data); > + err = fn(pte++, addr, data); > if (err) > break; > } while (addr += PAGE_SIZE, addr != end); > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index e86ba6e74b50..94533beb6b68 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2332,7 +2332,7 @@ void __weak vmalloc_sync_all(void) > } > > > -static int f(pte_t *pte, pgtable_t table, unsigned long addr, void *data) > +static int f(pte_t *pte, unsigned long addr, void *data) > { > pte_t ***p = data; > > -- > 2.20.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel