lkml.org 
[lkml]   [2018]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH 10/10] x86/mm/cpa: Rename @addrinarray
    The CPA_ARRAY interface works in single pages, and everything, except
    in these 'few' locations is this variable called 'numpages'. Remove
    this abberation.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    arch/x86/mm/pageattr.c | 52 ++++++++++++++++++++++++-------------------------
    1 file changed, 26 insertions(+), 26 deletions(-)

    --- a/arch/x86/mm/pageattr.c
    +++ b/arch/x86/mm/pageattr.c
    @@ -1805,14 +1805,14 @@ int set_memory_uc(unsigned long addr, in
    }
    EXPORT_SYMBOL(set_memory_uc);

    -static int _set_memory_array(unsigned long *addr, int addrinarray,
    +static int _set_memory_array(unsigned long *addr, int numpages,
    enum page_cache_mode new_type)
    {
    enum page_cache_mode set_type;
    int i, j;
    int ret;

    - for (i = 0; i < addrinarray; i++) {
    + for (i = 0; i < numpages; i++) {
    ret = reserve_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE,
    new_type, NULL);
    if (ret)
    @@ -1823,11 +1823,11 @@ static int _set_memory_array(unsigned lo
    set_type = (new_type == _PAGE_CACHE_MODE_WC) ?
    _PAGE_CACHE_MODE_UC_MINUS : new_type;

    - ret = change_page_attr_set(addr, addrinarray,
    + ret = change_page_attr_set(addr, numpages,
    cachemode2pgprot(set_type), 1);

    if (!ret && new_type == _PAGE_CACHE_MODE_WC)
    - ret = change_page_attr_set_clr(addr, addrinarray,
    + ret = change_page_attr_set_clr(addr, numpages,
    cachemode2pgprot(
    _PAGE_CACHE_MODE_WC),
    __pgprot(_PAGE_CACHE_MASK),
    @@ -1844,21 +1844,21 @@ static int _set_memory_array(unsigned lo
    return ret;
    }

    -int set_memory_array_uc(unsigned long *addr, int addrinarray)
    +int set_memory_array_uc(unsigned long *addr, int numpages)
    {
    - return _set_memory_array(addr, addrinarray, _PAGE_CACHE_MODE_UC_MINUS);
    + return _set_memory_array(addr, numpages, _PAGE_CACHE_MODE_UC_MINUS);
    }
    EXPORT_SYMBOL(set_memory_array_uc);

    -int set_memory_array_wc(unsigned long *addr, int addrinarray)
    +int set_memory_array_wc(unsigned long *addr, int numpages)
    {
    - return _set_memory_array(addr, addrinarray, _PAGE_CACHE_MODE_WC);
    + return _set_memory_array(addr, numpages, _PAGE_CACHE_MODE_WC);
    }
    EXPORT_SYMBOL(set_memory_array_wc);

    -int set_memory_array_wt(unsigned long *addr, int addrinarray)
    +int set_memory_array_wt(unsigned long *addr, int numpages)
    {
    - return _set_memory_array(addr, addrinarray, _PAGE_CACHE_MODE_WT);
    + return _set_memory_array(addr, numpages, _PAGE_CACHE_MODE_WT);
    }
    EXPORT_SYMBOL_GPL(set_memory_array_wt);

    @@ -1940,18 +1940,18 @@ int set_memory_wb(unsigned long addr, in
    }
    EXPORT_SYMBOL(set_memory_wb);

    -int set_memory_array_wb(unsigned long *addr, int addrinarray)
    +int set_memory_array_wb(unsigned long *addr, int numpages)
    {
    int i;
    int ret;

    /* WB cache mode is hard wired to all cache attribute bits being 0 */
    - ret = change_page_attr_clear(addr, addrinarray,
    + ret = change_page_attr_clear(addr, numpages,
    __pgprot(_PAGE_CACHE_MASK), 1);
    if (ret)
    return ret;

    - for (i = 0; i < addrinarray; i++)
    + for (i = 0; i < numpages; i++)
    free_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE);

    return 0;
    @@ -2081,7 +2081,7 @@ int set_pages_uc(struct page *page, int
    }
    EXPORT_SYMBOL(set_pages_uc);

    -static int _set_pages_array(struct page **pages, int addrinarray,
    +static int _set_pages_array(struct page **pages, int numpages,
    enum page_cache_mode new_type)
    {
    unsigned long start;
    @@ -2091,7 +2091,7 @@ static int _set_pages_array(struct page
    int free_idx;
    int ret;

    - for (i = 0; i < addrinarray; i++) {
    + for (i = 0; i < numpages; i++) {
    if (PageHighMem(pages[i]))
    continue;
    start = page_to_pfn(pages[i]) << PAGE_SHIFT;
    @@ -2104,10 +2104,10 @@ static int _set_pages_array(struct page
    set_type = (new_type == _PAGE_CACHE_MODE_WC) ?
    _PAGE_CACHE_MODE_UC_MINUS : new_type;

    - ret = cpa_set_pages_array(pages, addrinarray,
    + ret = cpa_set_pages_array(pages, numpages,
    cachemode2pgprot(set_type));
    if (!ret && new_type == _PAGE_CACHE_MODE_WC)
    - ret = change_page_attr_set_clr(NULL, addrinarray,
    + ret = change_page_attr_set_clr(NULL, numpages,
    cachemode2pgprot(
    _PAGE_CACHE_MODE_WC),
    __pgprot(_PAGE_CACHE_MASK),
    @@ -2127,21 +2127,21 @@ static int _set_pages_array(struct page
    return -EINVAL;
    }

    -int set_pages_array_uc(struct page **pages, int addrinarray)
    +int set_pages_array_uc(struct page **pages, int numpages)
    {
    - return _set_pages_array(pages, addrinarray, _PAGE_CACHE_MODE_UC_MINUS);
    + return _set_pages_array(pages, numpages, _PAGE_CACHE_MODE_UC_MINUS);
    }
    EXPORT_SYMBOL(set_pages_array_uc);

    -int set_pages_array_wc(struct page **pages, int addrinarray)
    +int set_pages_array_wc(struct page **pages, int numpages)
    {
    - return _set_pages_array(pages, addrinarray, _PAGE_CACHE_MODE_WC);
    + return _set_pages_array(pages, numpages, _PAGE_CACHE_MODE_WC);
    }
    EXPORT_SYMBOL(set_pages_array_wc);

    -int set_pages_array_wt(struct page **pages, int addrinarray)
    +int set_pages_array_wt(struct page **pages, int numpages)
    {
    - return _set_pages_array(pages, addrinarray, _PAGE_CACHE_MODE_WT);
    + return _set_pages_array(pages, numpages, _PAGE_CACHE_MODE_WT);
    }
    EXPORT_SYMBOL_GPL(set_pages_array_wt);

    @@ -2153,7 +2153,7 @@ int set_pages_wb(struct page *page, int
    }
    EXPORT_SYMBOL(set_pages_wb);

    -int set_pages_array_wb(struct page **pages, int addrinarray)
    +int set_pages_array_wb(struct page **pages, int numpages)
    {
    int retval;
    unsigned long start;
    @@ -2161,12 +2161,12 @@ int set_pages_array_wb(struct page **pag
    int i;

    /* WB cache mode is hard wired to all cache attribute bits being 0 */
    - retval = cpa_clear_pages_array(pages, addrinarray,
    + retval = cpa_clear_pages_array(pages, numpages,
    __pgprot(_PAGE_CACHE_MASK));
    if (retval)
    return retval;

    - for (i = 0; i < addrinarray; i++) {
    + for (i = 0; i < numpages; i++) {
    if (PageHighMem(pages[i]))
    continue;
    start = page_to_pfn(pages[i]) << PAGE_SHIFT;

    \
     
     \ /
      Last update: 2018-12-03 18:15    [W:2.778 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site