lkml.org 
[lkml]   [2019]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] x86,mm/pat: Drop rbt suffix from external memtype calls
    Date
    Drop the rbt_memtype_* calls (those used by pat.c) as we
    no longer use an rbtree directly.

    Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
    ---
    arch/x86/mm/pat.c | 8 ++++----
    arch/x86/mm/pat_internal.h | 20 ++++++++++----------
    arch/x86/mm/pat_rbtree.c | 12 ++++++------
    3 files changed, 20 insertions(+), 20 deletions(-)

    diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
    index d9fbd4f69920..2d758e19ef22 100644
    --- a/arch/x86/mm/pat.c
    +++ b/arch/x86/mm/pat.c
    @@ -603,7 +603,7 @@ int reserve_memtype(u64 start, u64 end, enum page_cache_mode req_type,

    spin_lock(&memtype_lock);

    - err = rbt_memtype_check_insert(new, new_type);
    + err = memtype_check_insert(new, new_type);
    if (err) {
    pr_info("x86/PAT: reserve_memtype failed [mem %#010Lx-%#010Lx], track %s, req %s\n",
    start, end - 1,
    @@ -650,7 +650,7 @@ int free_memtype(u64 start, u64 end)
    }

    spin_lock(&memtype_lock);
    - entry = rbt_memtype_erase(start, end);
    + entry = memtype_erase(start, end);
    spin_unlock(&memtype_lock);

    if (IS_ERR(entry)) {
    @@ -693,7 +693,7 @@ static enum page_cache_mode lookup_memtype(u64 paddr)

    spin_lock(&memtype_lock);

    - entry = rbt_memtype_lookup(paddr);
    + entry = memtype_lookup(paddr);
    if (entry != NULL)
    rettype = entry->type;
    else
    @@ -1109,7 +1109,7 @@ static struct memtype *memtype_get_idx(loff_t pos)
    return NULL;

    spin_lock(&memtype_lock);
    - ret = rbt_memtype_copy_nth_element(print_entry, pos);
    + ret = memtype_copy_nth_element(print_entry, pos);
    spin_unlock(&memtype_lock);

    if (!ret) {
    diff --git a/arch/x86/mm/pat_internal.h b/arch/x86/mm/pat_internal.h
    index eeb5caeb089b..79a06684349e 100644
    --- a/arch/x86/mm/pat_internal.h
    +++ b/arch/x86/mm/pat_internal.h
    @@ -29,20 +29,20 @@ static inline char *cattr_name(enum page_cache_mode pcm)
    }

    #ifdef CONFIG_X86_PAT
    -extern int rbt_memtype_check_insert(struct memtype *new,
    - enum page_cache_mode *new_type);
    -extern struct memtype *rbt_memtype_erase(u64 start, u64 end);
    -extern struct memtype *rbt_memtype_lookup(u64 addr);
    -extern int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos);
    +extern int memtype_check_insert(struct memtype *new,
    + enum page_cache_mode *new_type);
    +extern struct memtype *memtype_erase(u64 start, u64 end);
    +extern struct memtype *memtype_lookup(u64 addr);
    +extern int memtype_copy_nth_element(struct memtype *out, loff_t pos);
    #else
    -static inline int rbt_memtype_check_insert(struct memtype *new,
    - enum page_cache_mode *new_type)
    +static inline int memtype_check_insert(struct memtype *new,
    + enum page_cache_mode *new_type)
    { return 0; }
    -static inline struct memtype *rbt_memtype_erase(u64 start, u64 end)
    +static inline struct memtype *memtype_erase(u64 start, u64 end)
    { return NULL; }
    -static inline struct memtype *rbt_memtype_lookup(u64 addr)
    +static inline struct memtype *memtype_lookup(u64 addr)
    { return NULL; }
    -static inline int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos)
    +static inline int memtype_copy_nth_element(struct memtype *out, loff_t pos)
    { return 0; }
    #endif

    diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
    index 7974136ea1f6..ef59e0ab00ed 100644
    --- a/arch/x86/mm/pat_rbtree.c
    +++ b/arch/x86/mm/pat_rbtree.c
    @@ -109,8 +109,8 @@ static int memtype_check_conflict(u64 start, u64 end,
    return -EBUSY;
    }

    -int rbt_memtype_check_insert(struct memtype *new,
    - enum page_cache_mode *ret_type)
    +int memtype_check_insert(struct memtype *new,
    + enum page_cache_mode *ret_type)
    {
    int err = 0;

    @@ -126,13 +126,13 @@ int rbt_memtype_check_insert(struct memtype *new,
    return err;
    }

    -struct memtype *rbt_memtype_erase(u64 start, u64 end)
    +struct memtype *memtype_erase(u64 start, u64 end)
    {
    struct memtype *data;

    /*
    * Since the memtype_rbroot tree allows overlapping ranges,
    - * rbt_memtype_erase() checks with EXACT_MATCH first, i.e. free
    + * memtype_erase() checks with EXACT_MATCH first, i.e. free
    * a whole node for the munmap case. If no such entry is found,
    * it then checks with END_MATCH, i.e. shrink the size of a node
    * from the end for the mremap case.
    @@ -158,14 +158,14 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end)
    return data;
    }

    -struct memtype *rbt_memtype_lookup(u64 addr)
    +struct memtype *memtype_lookup(u64 addr)
    {
    return memtype_interval_iter_first(&memtype_rbroot, addr,
    addr + PAGE_SIZE);
    }

    #if defined(CONFIG_DEBUG_FS)
    -int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos)
    +int memtype_copy_nth_element(struct memtype *out, loff_t pos)
    {
    struct memtype *match;
    int i = 1;
    --
    2.16.4
    \
     
     \ /
      Last update: 2019-10-22 01:23    [W:2.613 / U:2.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site