The patch titled
Subject: mm/pgtable: drop pgtable_t variable from pte_fn_t functions
has been added to the -mm tree. Its filename is
mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Subject: mm/pgtable: drop pgtable_t variable from pte_fn_t functions
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.
Link: http://lkml.kernel.org/r/1556803126-26596-1-git-send-email-anshuman.khandual@xxxxxxx
Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Acked-by: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Logan Gunthorpe <logang@xxxxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: <jglisse@xxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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(-)
--- a/arch/arm64/kernel/efi.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/arch/arm64/kernel/efi.c
@@ -86,8 +86,7 @@ int __init efi_create_mapping(struct mm_
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);
--- a/arch/arm64/mm/pageattr.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/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);
--- a/arch/arm/kernel/efi.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/arch/arm/kernel/efi.c
@@ -11,8 +11,7 @@
#include <asm/mach/map.h>
#include <asm/mmu_context.h>
-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;
--- a/arch/arm/mm/dma-mapping.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/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;
--- a/arch/arm/mm/pageattr.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/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;
--- a/arch/x86/xen/mmu_pv.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/arch/x86/xen/mmu_pv.c
@@ -2700,8 +2700,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));
--- a/drivers/gpu/drm/i915/i915_mm.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/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;
--- a/drivers/xen/gntdev.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/drivers/xen/gntdev.c
@@ -264,8 +264,7 @@ void gntdev_put_map(struct gntdev_priv *
/* ------------------------------------------------------------------ */
-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, p
}
#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;
--- a/drivers/xen/privcmd.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/drivers/xen/privcmd.c
@@ -731,8 +731,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];
@@ -966,8 +965,7 @@ static int privcmd_mmap(struct file *fil
* 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;
}
--- a/drivers/xen/xlate_mmu.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/drivers/xen/xlate_mmu.c
@@ -93,8 +93,7 @@ static void setup_hparams(unsigned long
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++];
--- a/include/linux/mm.h~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/include/linux/mm.h
@@ -2653,8 +2653,7 @@ static inline int vm_fault_to_errno(vm_f
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);
--- a/mm/memory.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/mm/memory.c
@@ -2036,7 +2036,6 @@ static int apply_to_pte_range(struct mm_
{
pte_t *pte;
int err;
- pgtable_t token;
spinlock_t *uninitialized_var(ptl);
pte = (mm == &init_mm) ?
@@ -2049,10 +2048,8 @@ static int apply_to_pte_range(struct mm_
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);
--- a/mm/vmalloc.c~mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions
+++ a/mm/vmalloc.c
@@ -3005,7 +3005,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;
_
Patches currently in -mm which might be from anshuman.khandual@xxxxxxx are
mm-dev_pfn-exclude-memory_device_private-while-computing-virtual-address.patch
mm-pgtable-drop-pgtable_t-variable-from-pte_fn_t-functions.patch
