From patchwork Fri Dec 9 17:01:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13070022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C16FC4332F for ; Fri, 9 Dec 2022 17:01:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0A4E8E000D; Fri, 9 Dec 2022 12:01:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C93C28E0001; Fri, 9 Dec 2022 12:01:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE9E18E000D; Fri, 9 Dec 2022 12:01:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8B78F8E0001 for ; Fri, 9 Dec 2022 12:01:40 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 45E954125B for ; Fri, 9 Dec 2022 17:01:40 +0000 (UTC) X-FDA: 80223384360.22.26C8C5C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 2E5F520039 for ; Fri, 9 Dec 2022 17:01:37 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IQNOl9Vn; spf=pass (imf13.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670605298; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=L7MEdlvbVLjBM5+9KWX/Vi/7wZkpFuDB6TgvbozGtp8=; b=yGeJ5eeTgJa0cHniAHAQGHxEXRk6dq2f5EI8iZNKdrwOefO9goUsjy811hdobbEhhh9uJS ekWBeURH8AzzH53yBnOj2O1Zqn6kNa6OC6MjPmSN8bP7ya/IQnTJZt4YLLr0HiHrCfMcBY DWH0k7AwYwb0VlNZKWvG4wQu+2AIjUU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IQNOl9Vn; spf=pass (imf13.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670605298; a=rsa-sha256; cv=none; b=LM3fWlU4HtaStnhZmqHHHgkeux1IQ4FOVudRe8vvYRgNHjz/cVbZMeuyClkpYbzmMdnM9u rvjZezmr09teiLr/RrQLxF5iG/QpZuA8TVJi9N/DCU/TFPOL3HJpYhKBs/aiXUFMowaL79 YVATBVCG3p/vAE33PRizHb6fsEXHgJo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L7MEdlvbVLjBM5+9KWX/Vi/7wZkpFuDB6TgvbozGtp8=; b=IQNOl9Vn1d7CZvjuP9glpRe4g9KqZR2RgfWVQZORWLdVyfmAQmhKTgzM4XyaWgdExjarfQ ddHckQQ4UAkomyy+xXfzAhU+6VMF9VRZsX/uei/4tQxiZMf7Jr5KfAjUbpzJFmhjamUsSZ gAbqJZ7zb/5voPrbQijixSsKxgSG9Dg= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-630-bGAjMfiKOwW4Zs2unQkrAQ-1; Fri, 09 Dec 2022 12:01:35 -0500 X-MC-Unique: bGAjMfiKOwW4Zs2unQkrAQ-1 Received: by mail-pf1-f197.google.com with SMTP id n16-20020a056a000d5000b005764608bb24so3657590pfv.12 for ; Fri, 09 Dec 2022 09:01:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L7MEdlvbVLjBM5+9KWX/Vi/7wZkpFuDB6TgvbozGtp8=; b=m7rOPxiNAFYTbVYwsIPKMAGjZyIH0XZQdz7yEX5NjxU2Y2t+NFl/esXoaCUOKyahXm R7G2g4WdKhaTX77Oupsxnz5O96eF00pN7jCa6OQi9HYt9eaKZ4PmaDXBYRbkWQlFWDGp 25t0vJ+AxlIcFKhQ0aaFETKwl/eDXCkZE488GP5DEQyIoHsofQ/3p4JIu7F1mGh4Fw8z DUBCPQpdFH2PojAEQZkJSEEEwrGsO4qZZ1wwzJEi/5n6MlsAcqaz/pBacvzJ+dbBKroB raSFgNxXI5EM1c5PNrctoitoNRCxncUEM45l7aevc+oxbN+Ql1xuJw0Z2Lm3TjTY+Xqj YWBw== X-Gm-Message-State: ANoB5pkJCwZvRs/aS/19SGNgOFJEjqhYJDB2ACKgHvqFlhHcmDQfIyy7 7ueM5Lxuu1nkZuhds8tZNJrxaNUCHd9o/UiimCNzHvtzYe3Rr76a0W+jU+PiUk1HM2sNVEF5Gwi UYUF9GVRngzQUDKMMdOIHh36uZMebCvVwWvdLT0OfgKXc9yFyh9SSMqVGUt91 X-Received: by 2002:a05:6a20:9f4a:b0:9d:efbf:6618 with SMTP id ml10-20020a056a209f4a00b0009defbf6618mr9037945pzb.38.1670605292630; Fri, 09 Dec 2022 09:01:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf4691rJPo5hULuegymNELlZK/OS4Isy0pkxFdZAl/xogaBGdec9hd8nNWbKv9OTMLROMYo/pQ== X-Received: by 2002:a05:6a20:9f4a:b0:9d:efbf:6618 with SMTP id ml10-20020a056a209f4a00b0009defbf6618mr9037889pzb.38.1670605292058; Fri, 09 Dec 2022 09:01:32 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id q7-20020a05620a0d8700b006cf38fd659asm178907qkl.103.2022.12.09.09.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 09:01:30 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , Miaohe Lin , David Hildenbrand , Nadav Amit , peterx@redhat.com, Andrea Arcangeli , Jann Horn , John Hubbard , Mike Kravetz , James Houghton , Rik van Riel , Muchun Song Subject: [PATCH v3 9/9] mm/hugetlb: Introduce hugetlb_walk() Date: Fri, 9 Dec 2022 12:01:00 -0500 Message-Id: <20221209170100.973970-10-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221209170100.973970-1-peterx@redhat.com> References: <20221209170100.973970-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2E5F520039 X-Stat-Signature: 8i1r4bqazzuojwfqfo53xgshqkwm49sg X-HE-Tag: 1670605297-409401 X-HE-Meta: U2FsdGVkX18s3haomX616Uxwd9LTaE706qT1YgKRh+OhnH6pXMKHTbQ+97XIHRyeaQU29BgOjhU/YrrALHNZuM9OdgkhLupoNtg9vGUxanme1qGVOaIh0lmmuAj6sDXtmPf8v5TXopdHTVL64opqGmR5+Xa1zk/aljXru3U6c7zv9sD+3BC94Q5uPWWGjgWY7LDbTc5kP19um5izWQDiCJDYdrik+0OWPlXEWLfM3c8xcjJhTDZW+/tqm64HUyfpWssjo43Vv6TIeJIoTd43Ndg24/DpiQRK6qOq+VVdWH89x8/0ffws/atXZFDGy2f1bo5BMkSJ6EN1srz6u1Irr6dqAtkk0PqPS2J4IDKPEoNp6REj4xWhGAWDdR9VarJXopD8L+1NRTZ4IKrz/EYZhz/2zBgR7hbfPUz2arJkeqDFhusWXYm7KHEREYgQ7LzAft6/VvNq2+SZhRcqDfVUr32P5CpVLYy7ZYI+QrkfOK3g/G68ngNaOmHxtMrTHpTqLc0mKj932wqbCjcvcPE7mX/3bs9epZOfohcXJdKF9qlebpePAKCKA2Q2gkH7QiItux/GCLXygwx8a4EYeWf1GKH98x94JCXOIQuE68K3M2J8BpElCzOwT0cZZd5LBcy3HlKs74wmTDEW+O36ZCgrGrbrW3FpkY1oCMIrKFQR32vLj917+Ya92KfNjwvxVhJ/fPMqqNCBw8SSSi4N4eCv74UI+uecH1AGH4892DieSceZE7xLfmtFOvTevkfr+hgWFwjCo4vE1O7uEXBliGeO+PtO+x5coxc56ECrAz6mhI7FQhxJZkDgf4nVANIf/vQdvJ/iADW5xT9Ziies1q8n+zN/Rp0ia+7Vb2bVO4yZ9jFkNuG9oVfhsUF0CLqTlACDl+FEDdYObK1MoC2Apj5YxLAhSX+6R320a39/eXzBa62nYY16b1ElKcdV7ij6AmIt4TpUZNsffamJVh+kHRw mkJZeq0e kaqVv9X9/8Xd53yu+0m/LOrniFVPaDfls3MCnyJPeaKKJqa7sispbhr4snd4AYEddSCQHqP3Tzd/svuf9kMJC+l9xbna0j5psGMwObinVSVlMxZahpVLDc/qB98eHbdK3J/ol0cfdaTjGNHl7nA0pymGM4ZNOIQEd+M9FKJe/bUz1GSDtFse41wFC+A2huB3SkCjkHQX3wfEW+JEoU1kMPg8SNvn6coB7sPp2B9yRFKSFqtY63T1e1sb60MQGrKKyQiQ43GRiNXRE8Nc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: huge_pte_offset() is the main walker function for hugetlb pgtables. The name is not really representing what it does, though. Instead of renaming it, introduce a wrapper function called hugetlb_walk() which will use huge_pte_offset() inside. Assert on the locks when walking the pgtable. Note, the vma lock assertion will be a no-op for private mappings. Document the last special case in the page_vma_mapped_walk() path where we don't need any more lock to call hugetlb_walk(). Taking vma lock there is not needed because either: (1) potential callers of hugetlb pvmw holds i_mmap_rwsem already (from one rmap_walk()), or (2) the caller will not walk a hugetlb vma at all so the hugetlb code path not reachable (e.g. in ksm or uprobe paths). It's slightly implicit for future page_vma_mapped_walk() callers on that lock requirement. But anyway, when one day this rule breaks, one will get a straightforward warning in hugetlb_walk() with lockdep, then there'll be a way out. Reviewed-by: Mike Kravetz Signed-off-by: Peter Xu Reviewed-by: John Hubbard --- fs/hugetlbfs/inode.c | 4 +--- fs/userfaultfd.c | 6 ++---- include/linux/hugetlb.h | 39 +++++++++++++++++++++++++++++++++++++++ mm/hugetlb.c | 32 +++++++++++++------------------- mm/page_vma_mapped.c | 9 ++++++--- mm/pagewalk.c | 4 +--- 6 files changed, 62 insertions(+), 32 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index fdb16246f46e..48f1a8ad2243 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -388,9 +388,7 @@ static bool hugetlb_vma_maps_page(struct vm_area_struct *vma, { pte_t *ptep, pte; - ptep = huge_pte_offset(vma->vm_mm, addr, - huge_page_size(hstate_vma(vma))); - + ptep = hugetlb_walk(vma, addr, huge_page_size(hstate_vma(vma))); if (!ptep) return false; diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 969f4be967c6..6a278941ec84 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -237,14 +237,12 @@ static inline bool userfaultfd_huge_must_wait(struct userfaultfd_ctx *ctx, unsigned long flags, unsigned long reason) { - struct mm_struct *mm = ctx->mm; pte_t *ptep, pte; bool ret = true; - mmap_assert_locked(mm); - - ptep = huge_pte_offset(mm, address, vma_mmu_pagesize(vma)); + mmap_assert_locked(ctx->mm); + ptep = hugetlb_walk(vma, address, vma_mmu_pagesize(vma)); if (!ptep) goto out; diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index d755e2a7c0db..a5e87ec7fa6e 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -2,6 +2,7 @@ #ifndef _LINUX_HUGETLB_H #define _LINUX_HUGETLB_H +#include #include #include #include @@ -196,6 +197,11 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, * huge_pte_offset(): Walk the hugetlb pgtable until the last level PTE. * Returns the pte_t* if found, or NULL if the address is not mapped. * + * IMPORTANT: we should normally not directly call this function, instead + * this is only a common interface to implement arch-specific + * walker. Please use hugetlb_walk() instead, because that will attempt to + * verify the locking for you. + * * Since this function will walk all the pgtable pages (including not only * high-level pgtable page, but also PUD entry that can be unshared * concurrently for VM_SHARED), the caller of this function should be @@ -1229,4 +1235,37 @@ bool want_pmd_share(struct vm_area_struct *vma, unsigned long addr); #define flush_hugetlb_tlb_range(vma, addr, end) flush_tlb_range(vma, addr, end) #endif +static inline bool +__vma_shareable_flags_pmd(struct vm_area_struct *vma) +{ + return vma->vm_flags & (VM_MAYSHARE | VM_SHARED) && + vma->vm_private_data; +} + +/* + * Safe version of huge_pte_offset() to check the locks. See comments + * above huge_pte_offset(). + */ +static inline pte_t * +hugetlb_walk(struct vm_area_struct *vma, unsigned long addr, unsigned long sz) +{ +#if defined(CONFIG_HUGETLB_PAGE) && \ + defined(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) && defined(CONFIG_LOCKDEP) + struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; + + /* + * If pmd sharing possible, locking needed to safely walk the + * hugetlb pgtables. More information can be found at the comment + * above huge_pte_offset() in the same file. + * + * NOTE: lockdep_is_held() is only defined with CONFIG_LOCKDEP. + */ + if (__vma_shareable_flags_pmd(vma)) + WARN_ON_ONCE(!lockdep_is_held(&vma_lock->rw_sema) && + !lockdep_is_held( + &vma->vm_file->f_mapping->i_mmap_rwsem)); +#endif + return huge_pte_offset(vma->vm_mm, addr, sz); +} + #endif /* _LINUX_HUGETLB_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9d8bb6508288..b20120d14a71 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4814,7 +4814,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, } else { /* * For shared mappings the vma lock must be held before - * calling huge_pte_offset in the src vma. Otherwise, the + * calling hugetlb_walk() in the src vma. Otherwise, the * returned ptep could go away if part of a shared pmd and * another thread calls huge_pmd_unshare. */ @@ -4824,7 +4824,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, last_addr_mask = hugetlb_mask_last_page(h); for (addr = src_vma->vm_start; addr < src_vma->vm_end; addr += sz) { spinlock_t *src_ptl, *dst_ptl; - src_pte = huge_pte_offset(src, addr, sz); + src_pte = hugetlb_walk(src_vma, addr, sz); if (!src_pte) { addr |= last_addr_mask; continue; @@ -5028,7 +5028,7 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, hugetlb_vma_lock_write(vma); i_mmap_lock_write(mapping); for (; old_addr < old_end; old_addr += sz, new_addr += sz) { - src_pte = huge_pte_offset(mm, old_addr, sz); + src_pte = hugetlb_walk(vma, old_addr, sz); if (!src_pte) { old_addr |= last_addr_mask; new_addr |= last_addr_mask; @@ -5091,7 +5091,7 @@ static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct last_addr_mask = hugetlb_mask_last_page(h); address = start; for (; address < end; address += sz) { - ptep = huge_pte_offset(mm, address, sz); + ptep = hugetlb_walk(vma, address, sz); if (!ptep) { address |= last_addr_mask; continue; @@ -5404,7 +5404,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, mutex_lock(&hugetlb_fault_mutex_table[hash]); hugetlb_vma_lock_read(vma); spin_lock(ptl); - ptep = huge_pte_offset(mm, haddr, huge_page_size(h)); + ptep = hugetlb_walk(vma, haddr, huge_page_size(h)); if (likely(ptep && pte_same(huge_ptep_get(ptep), pte))) goto retry_avoidcopy; @@ -5442,7 +5442,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, * before the page tables are altered */ spin_lock(ptl); - ptep = huge_pte_offset(mm, haddr, huge_page_size(h)); + ptep = hugetlb_walk(vma, haddr, huge_page_size(h)); if (likely(ptep && pte_same(huge_ptep_get(ptep), pte))) { /* Break COW or unshare */ huge_ptep_clear_flush(vma, haddr, ptep); @@ -6228,7 +6228,7 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, return NULL; hugetlb_vma_lock_read(vma); - pte = huge_pte_offset(mm, haddr, huge_page_size(h)); + pte = hugetlb_walk(vma, haddr, huge_page_size(h)); if (!pte) goto out_unlock; @@ -6293,8 +6293,8 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, * * Note that page table lock is not held when pte is null. */ - pte = huge_pte_offset(mm, vaddr & huge_page_mask(h), - huge_page_size(h)); + pte = hugetlb_walk(vma, vaddr & huge_page_mask(h), + huge_page_size(h)); if (pte) ptl = huge_pte_lock(h, mm, pte); absent = !pte || huge_pte_none(huge_ptep_get(pte)); @@ -6480,7 +6480,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, last_addr_mask = hugetlb_mask_last_page(h); for (; address < end; address += psize) { spinlock_t *ptl; - ptep = huge_pte_offset(mm, address, psize); + ptep = hugetlb_walk(vma, address, psize); if (!ptep) { address |= last_addr_mask; continue; @@ -6858,12 +6858,6 @@ void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma, *end = ALIGN(*end, PUD_SIZE); } -static bool __vma_shareable_flags_pmd(struct vm_area_struct *vma) -{ - return vma->vm_flags & (VM_MAYSHARE | VM_SHARED) && - vma->vm_private_data; -} - void hugetlb_vma_lock_read(struct vm_area_struct *vma) { if (__vma_shareable_flags_pmd(vma)) { @@ -7029,8 +7023,8 @@ pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma, saddr = page_table_shareable(svma, vma, addr, idx); if (saddr) { - spte = huge_pte_offset(svma->vm_mm, saddr, - vma_mmu_pagesize(svma)); + spte = hugetlb_walk(svma, saddr, + vma_mmu_pagesize(svma)); if (spte) { get_page(virt_to_page(spte)); break; @@ -7388,7 +7382,7 @@ void hugetlb_unshare_all_pmds(struct vm_area_struct *vma) hugetlb_vma_lock_write(vma); i_mmap_lock_write(vma->vm_file->f_mapping); for (address = start; address < end; address += PUD_SIZE) { - ptep = huge_pte_offset(mm, address, sz); + ptep = hugetlb_walk(vma, address, sz); if (!ptep) continue; ptl = huge_pte_lock(h, mm, ptep); diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 93e13fc17d3c..f3729b23dd0e 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -168,9 +168,12 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) /* The only possible mapping was handled on last iteration */ if (pvmw->pte) return not_found(pvmw); - - /* when pud is not present, pte will be NULL */ - pvmw->pte = huge_pte_offset(mm, pvmw->address, size); + /* + * All callers that get here will already hold the + * i_mmap_rwsem. Therefore, no additional locks need to be + * taken before calling hugetlb_walk(). + */ + pvmw->pte = hugetlb_walk(vma, pvmw->address, size); if (!pvmw->pte) return false; diff --git a/mm/pagewalk.c b/mm/pagewalk.c index d98564a7be57..cb23f8a15c13 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -305,13 +305,11 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end, hugetlb_vma_lock_read(vma); do { next = hugetlb_entry_end(h, addr, end); - pte = huge_pte_offset(walk->mm, addr & hmask, sz); - + pte = hugetlb_walk(vma, addr & hmask, sz); if (pte) err = ops->hugetlb_entry(pte, hmask, addr, next, walk); else if (ops->pte_hole) err = ops->pte_hole(addr, next, -1, walk); - if (err) break; } while (addr = next, addr != end);