lkml.org 
[lkml]   [2023]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 02/46] hugetlb: remove mk_huge_pte; it is unused
    From
    mk_huge_pte is unused and not necessary. pte_mkhuge is the appropriate
    function to call to create a HugeTLB PTE (see
    Documentation/mm/arch_pgtable_helpers.rst).

    It is being removed now to avoid complicating the implementation of
    HugeTLB high-granularity mapping.

    Acked-by: Peter Xu <peterx@redhat.com>
    Acked-by: Mina Almasry <almasrymina@google.com>
    Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
    Signed-off-by: James Houghton <jthoughton@google.com>
    ---
    arch/s390/include/asm/hugetlb.h | 5 -----
    include/asm-generic/hugetlb.h | 5 -----
    mm/debug_vm_pgtable.c | 2 +-
    mm/hugetlb.c | 7 +++----
    4 files changed, 4 insertions(+), 15 deletions(-)

    diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h
    index ccdbccfde148..c34893719715 100644
    --- a/arch/s390/include/asm/hugetlb.h
    +++ b/arch/s390/include/asm/hugetlb.h
    @@ -77,11 +77,6 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
    set_huge_pte_at(mm, addr, ptep, pte_wrprotect(pte));
    }

    -static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
    -{
    - return mk_pte(page, pgprot);
    -}
    -
    static inline int huge_pte_none(pte_t pte)
    {
    return pte_none(pte);
    diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h
    index d7f6335d3999..be2e763e956f 100644
    --- a/include/asm-generic/hugetlb.h
    +++ b/include/asm-generic/hugetlb.h
    @@ -5,11 +5,6 @@
    #include <linux/swap.h>
    #include <linux/swapops.h>

    -static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
    -{
    - return mk_pte(page, pgprot);
    -}
    -
    static inline unsigned long huge_pte_write(pte_t pte)
    {
    return pte_write(pte);
    diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
    index c631ade3f1d2..643cce3493cc 100644
    --- a/mm/debug_vm_pgtable.c
    +++ b/mm/debug_vm_pgtable.c
    @@ -900,7 +900,7 @@ static void __init hugetlb_basic_tests(struct pgtable_debug_args *args)
    * as it was previously derived from a real kernel symbol.
    */
    page = pfn_to_page(args->fixed_pmd_pfn);
    - pte = mk_huge_pte(page, args->page_prot);
    + pte = mk_pte(page, args->page_prot);

    WARN_ON(!huge_pte_dirty(huge_pte_mkdirty(pte)));
    WARN_ON(!huge_pte_write(huge_pte_mkwrite(huge_pte_wrprotect(pte))));
    diff --git a/mm/hugetlb.c b/mm/hugetlb.c
    index b061e31c1fb8..7e9793b602ac 100644
    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -4870,11 +4870,10 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
    unsigned int shift = huge_page_shift(hstate_vma(vma));

    if (writable) {
    - entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_huge_pte(page,
    - vma->vm_page_prot)));
    + entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_pte(page,
    + vma->vm_page_prot)));
    } else {
    - entry = huge_pte_wrprotect(mk_huge_pte(page,
    - vma->vm_page_prot));
    + entry = huge_pte_wrprotect(mk_pte(page, vma->vm_page_prot));
    }
    entry = pte_mkyoung(entry);
    entry = arch_make_huge_pte(entry, shift, vma->vm_flags);
    --
    2.39.0.314.g84b9a713c41-goog
    \
     
     \ /
      Last update: 2023-03-26 23:28    [W:4.058 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site