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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 10/69] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Topic: [PATCH v12 10/69] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Index: AQHYm97magwbQUK8Vk+hz9mX8bBJBQ==
Date:   Wed, 20 Jul 2022 02:17:46 +0000
Message-ID: <20220720021727.17018-11-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?teVNXIoGEoi/O6zJAknkzWqC8iZi59UzelE4bHlP5RizgWmgpDVJ8SFLy8?=
 =?iso-8859-1?Q?JbyOd7gNIGwvh3nzcwRw6HVP3NdNzy0pCB8HNPL0tViQyQQOQwMRcMtdXU?=
 =?iso-8859-1?Q?SfPp8n+CKUefSJkBD0Z6ZyDsZiXZc/RlHSKlq+Dql6PXBkHPw5FyNSrElS?=
 =?iso-8859-1?Q?R6hIZctkfiqdN4vdP1UTXKo3jrRfEH1R2TakddI5bzqFYYqw52O2P6ExSN?=
 =?iso-8859-1?Q?Be0e3fpZMmx3NgZId0S8uL5GXzBBWQH5MQARK2f1tVNw5emgrpGeZa1Zcm?=
 =?iso-8859-1?Q?H11t3dPr8h494iF193xnaMn7iA3Ctr4VGOvMCBvf7Pqfd4HbFI/Muz/JTK?=
 =?iso-8859-1?Q?ok91YyZvq8VqPxo0cozZZsophQsBYwi61HwiH+KrmgO/cUXrGbQ0+m5XaZ?=
 =?iso-8859-1?Q?TEkN8UgOVAvOBE9491YyC3uZ4f9kmx4MPtzb0IF6vlygS3q4L5JhWaUb06?=
 =?iso-8859-1?Q?cCOuVqsmqJCycFe2QDfZ564Hpw+DKDFEmUG0+Ux75SM5QT/1D064Y4+1BU?=
 =?iso-8859-1?Q?7s6Rle9w9VvnHOGQFP2a0RaY2+30+gsxavGR7Rj17Btb57MH9PXFuMeiH0?=
 =?iso-8859-1?Q?9MomTU+3jJV2ltAblVX70Il0XufMpruO88DdFnukjaLyGUvZ22j9y17iW8?=
 =?iso-8859-1?Q?DUM3uN1KMfGzzGxdRb72vsls2b0i1HR6rLfCdvtFTGzbtZ+zKle5kkBvcG?=
 =?iso-8859-1?Q?qV+6OXQuEvPo+hpjIMun77YEcDdzs7YR8KsMJNWqL0uuQs9gNx0GfH8Z3M?=
 =?iso-8859-1?Q?vmFlT+xB967ZnIpRv7WATfqLlV37wDsawhVMBqu5HrNTNizn77+qjkWOIF?=
 =?iso-8859-1?Q?mhpP0Qhjh+COQgdYW7MSJYNlM7etccuVJoHzyYuoOVXfDP4NgZ+kvbby7U?=
 =?iso-8859-1?Q?Cf34Q3B8xQNhQ7BdP5TdNKoXsmv3cppUmBJ2qPh0jamdQWcWkuiK2n63XR?=
 =?iso-8859-1?Q?xi5kRttctEIgePOD2uRq5+j228ZLNLCA/JH2f4kwNMliwFe1rcgTdfe0+L?=
 =?iso-8859-1?Q?kKylKMdL4EwYTimpSp62U4KF4Wv+j/OESqBOD6rTIV24vdjD9rQYIF9eK1?=
 =?iso-8859-1?Q?+VY79j2ws09iliIhSJtRepZZsSvvmKIgRMKU4e/iBlwvNxyZ3wbJlzPCPM?=
 =?iso-8859-1?Q?h2xYwH7cJwpVtph0cXY4aAjST404/t3xO78FvhC7G2li36s7rT2KJUBNXA?=
 =?iso-8859-1?Q?ncJDALo/hPUcZk9y1WffX1KjnZ/yLxU2w7+GoMi5rG4Cw711NvPR61GEx8?=
 =?iso-8859-1?Q?BbbFY1Tmb8L+FONn0VbnkKZU2dPbyy0rjeshEIQ3bbGjMmhQJ3HMSkpsZ3?=
 =?iso-8859-1?Q?9OygolwL/d2I0ETBPCDtK7T8EwfVOYv4CL+q/SSsbPqY2hOsUglbI6Mv1M?=
 =?iso-8859-1?Q?ZkRcxWNUSrR98qgVwO6TLKOCwpf1RCbFQtRbfaonk/E+lnWm7a6uO4bgD7?=
 =?iso-8859-1?Q?MjYV9azgLKMsvmSyxQghsYT9k/wxWNGXOnL/R+IxnZltA813vi5J5VcTj6?=
 =?iso-8859-1?Q?tTfFJSARKEs2JOAIoC1Y3WdoXtnRYC11q2LOHU3K0TBsJbeD7M6h3RDzbx?=
 =?iso-8859-1?Q?ulUZnszra/yDcaxV+ryfEGP8fBHPTMaG2RldJ1C4jL8g3uEbFwJgxrNFKt?=
 =?iso-8859-1?Q?KJ1CGbT0Hs1jLRaLaDX7IHymkSvFuhbc9DzeSALnkeOL6IN+KpBDuRVw?=
 =?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: 8b233ce8-16eb-4993-d122-08da69f60a63
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:46.7908
 (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: XCvQvkHCWpJ+mhjXP8djGeFXc23/xpinoQ0MYO7v6w+39UgNhmoWDNoeB8tgBA8Vd4Q8nGMY7gg+Vb+KEQ0j7g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6243
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: ptcJsO_4QBtVskj2IBt9BxYO1THRsa3m
X-Proofpoint-ORIG-GUID: ptcJsO_4QBtVskj2IBt9BxYO1THRsa3m
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 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.

Link: https://lkml.kernel.org/r/20220504010716.661115-12-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-11-Liam.Howlett@orac=
le.com
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>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/mmap.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index ba754a3cfbd8..1a209b61896f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -676,29 +676,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