From nobody Fri Apr 10 17:05:25 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B4A2C28D13 for ; Mon, 22 Aug 2022 13:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234696AbiHVNYK convert rfc822-to-8bit (ORCPT ); Mon, 22 Aug 2022 09:24:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232195AbiHVNYD (ORCPT ); Mon, 22 Aug 2022 09:24:03 -0400 X-Greylist: delayed 1163 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 22 Aug 2022 06:24:01 PDT Received: from mx1.emlix.com (mx1.emlix.com [136.243.223.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B72627CED for ; Mon, 22 Aug 2022 06:24:01 -0700 (PDT) Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 3BB495FB1D; Mon, 22 Aug 2022 15:04:37 +0200 (CEST) From: Rolf Eike Beer To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] mm: pagewalk: move variables to more local scope, tweak loops Date: Mon, 22 Aug 2022 15:04:12 +0200 Message-ID: <8155217.NyiUUSuA9g@devpool047> Organization: emlix GmbH In-Reply-To: <3200642.44csPzL39Z@devpool047> References: <3200642.44csPzL39Z@devpool047> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move some variables to more local scopes to make it obvious that they don't carry state. Put the end additions into the for loop instructions to make them easier to read. Signed-off-by: Rolf Eike Beer --- mm/pagewalk.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/mm/pagewalk.c b/mm/pagewalk.c index f816f86588be..d8be8a30b272 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -25,14 +25,12 @@ static int walk_pte_range_inner(pte_t *pte, unsigned lo= ng addr, { const struct mm_walk_ops *ops =3D walk->ops; =20 - for (;;) { + for (;; addr +=3D PAGE_SIZE, pte++) { int err =3D ops->pte_entry(pte, addr, addr + PAGE_SIZE, walk); if (err) return err; if (addr >=3D end - PAGE_SIZE) break; - addr +=3D PAGE_SIZE; - pte++; } return 0; } @@ -42,13 +40,14 @@ static int walk_pte_range(pmd_t *pmd, unsigned long add= r, unsigned long end, { pte_t *pte; int err; - spinlock_t *ptl; =20 if (walk->no_vma) { pte =3D pte_offset_map(pmd, addr); err =3D walk_pte_range_inner(pte, addr, end, walk); pte_unmap(pte); } else { + spinlock_t *ptl; + pte =3D pte_offset_map_lock(walk->mm, pmd, addr, &ptl); err =3D walk_pte_range_inner(pte, addr, end, walk); pte_unmap_unlock(pte, ptl); @@ -71,7 +70,7 @@ static int walk_hugepd_range(hugepd_t *phpd, unsigned lon= g addr, if (addr & (page_size - 1)) return 0; =20 - for (;;) { + for (;; addr +=3D page_size) { pte_t *pte; int err; =20 @@ -84,7 +83,6 @@ static int walk_hugepd_range(hugepd_t *phpd, unsigned lon= g addr, return err; if (addr >=3D end - page_size) break; - addr +=3D page_size; } return 0; } @@ -307,14 +305,13 @@ static int walk_hugetlb_range(unsigned long addr, uns= igned long end, unsigned long next; unsigned long hmask =3D huge_page_mask(h); unsigned long sz =3D huge_page_size(h); - pte_t *pte; const struct mm_walk_ops *ops =3D walk->ops; =20 - do { + for (; addr < end; addr =3D next) { int err; + pte_t *pte =3D huge_pte_offset(walk->mm, addr & hmask, sz); =20 next =3D hugetlb_entry_end(h, addr, end); - pte =3D huge_pte_offset(walk->mm, addr & hmask, sz); =20 if (pte) err =3D ops->hugetlb_entry(pte, hmask, addr, next, walk); @@ -323,7 +320,7 @@ static int walk_hugetlb_range(unsigned long addr, unsig= ned long end, =20 if (err) return err; - } while (addr =3D next, addr !=3D end); + } =20 return 0; } @@ -461,14 +458,13 @@ int walk_page_range(struct mm_struct *mm, unsigned lo= ng start, do { int err; =20 + walk.vma =3D vma; if (!vma) { /* after the last vma */ - walk.vma =3D NULL; next =3D end; } else if (start < vma->vm_start) { /* outside vma */ walk.vma =3D NULL; next =3D min(end, vma->vm_start); } else { /* inside vma */ - walk.vma =3D vma; next =3D min(end, vma->vm_end); vma =3D vma->vm_next; =20 @@ -595,11 +591,11 @@ int walk_page_mapping(struct address_space *mapping, = pgoff_t first_index, }; struct vm_area_struct *vma; pgoff_t vba, vea, cba, cea; - unsigned long start_addr, end_addr; =20 lockdep_assert_held(&mapping->i_mmap_rwsem); vma_interval_tree_foreach(vma, &mapping->i_mmap, first_index, first_index + nr - 1) { + unsigned long start_addr, end_addr; int err; =20 /* Clip to the vma */ --=20 2.37.2 --=20 Rolf Eike Beer, emlix GmbH, http://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Gothaer Platz 3, 37083 G=C3=B6ttingen, Germany Sitz der Gesellschaft: G=C3=B6ttingen, Amtsgericht G=C3=B6ttingen HR B 3160 Gesch=C3=A4ftsf=C3=BChrung: Heike Jordan, Dr. Uwe Kracke =E2=80=93 Ust-IdNr= .: DE 205 198 055 emlix - smart embedded open source