Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
CC:     "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        Liam Howlett <liam.howlett@oracle.com>,
        Vlastimil Babka <vbabka@suse.cz>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v13 10/70] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Topic: [PATCH v13 10/70] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Index: AQHYtjhEHxcmbGvBzECjHa4oIETwhQ==
Date:   Mon, 22 Aug 2022 15:02:58 +0000
Message-ID: <20220822150128.1562046-11-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?yHMuLZLSky6+QA3y0MYkpn0Bw9PbGdczzNe/otVPuJ4DC05ui5sc1CFONr?=
 =?iso-8859-1?Q?IFvMGC/J6iOV88nfpvt7PYLxx6LPhzl85sMVGNqBox/ydKntRUv8wtj2BN?=
 =?iso-8859-1?Q?4jPfQx17o3WZDgtMTsOewq8fRW6Xy91eQlURiuVmpr4LJfovfxHivU/W5/?=
 =?iso-8859-1?Q?MMIEynI2pbfJokBbVOq0wEDTn7D9TCLPZuwYtj5ClPK+iQv740vhT2UrE1?=
 =?iso-8859-1?Q?Lv4qMCoc1bfqyD7XP+/1I8rt9JLbjCNS0usg1stH6W9MYDDDOwhFHUIbrm?=
 =?iso-8859-1?Q?fxePIsljQ09QkSFxuScMcUEOcVvNnEyQvRjjfDB8bKB9DU4bZM5SsR4eVL?=
 =?iso-8859-1?Q?7mkA0DzhHAycfhUpLZFJzrBX2bSkXzG08GeW1dyRqI0cQprcM2tp0EKF7z?=
 =?iso-8859-1?Q?biNLuuLyUsQ1dsq+evgGTnOxqUwZXv4mvKEmLSE+4LhJZvOzsCzqxWvxH8?=
 =?iso-8859-1?Q?bGsY//ymd5+Xj/Zq4xvR/o8dp0P0lSTU1IE7tyi26uYRS5UlIyFwE7BgGP?=
 =?iso-8859-1?Q?hbABSGqirQM1OaCLAC6bwA3gP/v+iHk+m3IFqhK6DFcXCdBK9UlapjvMwo?=
 =?iso-8859-1?Q?IyFjFojbuppz5P04cmK434zAAI4TmuFepfTHlnqWpQ10s9x0hd9nW5iLlc?=
 =?iso-8859-1?Q?To1+D3XXbu2vVK+diiB2NbvJDvS25KWKzOrEC5JGOgKJ7kq/2nKcor8PUQ?=
 =?iso-8859-1?Q?mHxLG28tXDA+XQTbQdt1ABqJ5FxI0SkyUOjCzeFNZd5OZ7MzBoJWdnQm4o?=
 =?iso-8859-1?Q?zNdKhQDXC7U9j5/ROo2MPPYBPxdcSpKcoW7E0hDa5xX0ERECwXePjiS370?=
 =?iso-8859-1?Q?D8oULFtcJLeehZN4oU4SqiAzUo5nfp1P42nEOU3D/wRc8wRl0TNQy+gye7?=
 =?iso-8859-1?Q?8pldnARpbqbtYfsQ82C7KbG3/MksL7Et4unbtejO2EtLHdZs4qp4p//K+X?=
 =?iso-8859-1?Q?/D8m+ohSwJ7vAwPYhC4TeDSXO0JMjoxgVo6KEVcIza6M5RGkir8ER5TGFc?=
 =?iso-8859-1?Q?cyRs02tljS+yg05wHKH08YRGU6nkI3jYZDqqqSbTJdfxIc+VXV2AcFV/qh?=
 =?iso-8859-1?Q?PDOt0KTAWXTV1TTsUOfh74C29/zJoMNm5i8b8IcNpba6jRob8izwEZEg5o?=
 =?iso-8859-1?Q?NLwVnX5IeHntnMMgpr+FiJmh5VqkNhJ/FA9EUqEx1PV9ujOCmiDkC7NHmp?=
 =?iso-8859-1?Q?eUCGcm6KbY3h28yNL6h5Cn34kbaA6TKRnChRBlbQlCjrNnhGO6W+mGd0ZF?=
 =?iso-8859-1?Q?IiHfpoO5eOzyyXEK7jiOU6rUJH7X1i2LCdrGWj3Dl/er0NgW855R96pJli?=
 =?iso-8859-1?Q?wczgDCv7helqXkbp7T2L66kAJKGJ2I5D8B5Dej7VAOb1GEzu/jhfd7ZjAl?=
 =?iso-8859-1?Q?6uCR4c+Rpcs8QiGHSHb9tRU87TQDYh6M3olNE35NSTmdnL1EI7GDtDiz2T?=
 =?iso-8859-1?Q?T++KWv7hzcNG03um1dpNPwYRmlQCkKG3DJNuPh1GWqoHGVFxeejezRgSzg?=
 =?iso-8859-1?Q?7jEiZ7mnbgIMQaSZRVTlKz6NDKzdf39EiN3uzOnwVz/m2TBYMun3ucZ2jv?=
 =?iso-8859-1?Q?oEXfhlVDKxFkw8rWxMH3LWmG6XX7veeWgQsSIUjl79Xvv4GLdRHssihwQ/?=
 =?iso-8859-1?Q?jefnAOKj/ItQ/pGcgKictTLIlDvLV8JDzV/8AWkWuQLYxa21lJORcGjA?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3f84e806-108b-4d27-d9a9-08da844f7129
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:02:58.5334
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: IQplAZO0rR+17+ZGlY1vFHomBJdycNbQRy1r4wDHyFOnKpjbOELDNnkJuYRrXBivmQ4zUiM6F1BNmw8csONBQg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR10MB3506
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0
 mlxlogscore=999 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208220064
X-Proofpoint-GUID: CS0ZLHTViSESKrdDSz2GZox142z3XWU_
X-Proofpoint-ORIG-GUID: CS0ZLHTViSESKrdDSz2GZox142z3XWU_
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

This simplifies the implementation and is faster than using the linked
list.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
 mm/mmap.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 20718645d82f..f1b07751a1e4 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -629,29 +629,19 @@ munmap_vma_range(struct mm_struct *mm, unsigned long =
start, unsigned long len,
=20
 	return 0;
 }
+
 static unsigned long count_vma_pages_range(struct mm_struct *mm,
 		unsigned long addr, unsigned long end)
 {
-	unsigned long nr_pages =3D 0;
+	VMA_ITERATOR(vmi, mm, addr);
 	struct vm_area_struct *vma;
+	unsigned long nr_pages =3D 0;
=20
-	/* Find first overlapping mapping */
-	vma =3D find_vma_intersection(mm, addr, end);
-	if (!vma)
-		return 0;
-
-	nr_pages =3D (min(end, vma->vm_end) -
-		max(addr, vma->vm_start)) >> PAGE_SHIFT;
-
-	/* Iterate over the rest of the overlaps */
-	for (vma =3D vma->vm_next; vma; vma =3D vma->vm_next) {
-		unsigned long overlap_len;
-
-		if (vma->vm_start > end)
-			break;
+	for_each_vma_range(vmi, vma, end) {
+		unsigned long vm_start =3D max(addr, vma->vm_start);
+		unsigned long vm_end =3D min(end, vma->vm_end);
=20
-		overlap_len =3D min(end, vma->vm_end) - vma->vm_start;
-		nr_pages +=3D overlap_len >> PAGE_SHIFT;
+		nr_pages +=3D PHYS_PFN(vm_end - vm_start);
 	}
=20
 	return nr_pages;
--=20
2.35.1