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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 10/69] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Topic: [PATCH v11 10/69] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Index: AQHYmYdwvlqmdSP7KEito1JvCo2vcg==
Date:   Sun, 17 Jul 2022 02:46:39 +0000
Message-ID: <20220717024615.2106835-11-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-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?bVvRCA8tzEIkJWTs+QZuMarsmA4RG7XpgmajdIHH4YcCm/8H79HacgrFJI?=
 =?iso-8859-1?Q?8ZjmlokuG7usgbLH/qiB9uLIFH5x/lSvLWpA/pUn2wNADCM7rUL2UHyg09?=
 =?iso-8859-1?Q?hr8gRT4S8oX4zNPWM/ckylumDFjODBwPwf2vo1Mo8rtXf1FfogGaJ0JbXs?=
 =?iso-8859-1?Q?Y7ZCjhjaJE1KLprs9jdno7dn6IhsLjClBJkpdSgf0sMePeQdj3qo6x9aaZ?=
 =?iso-8859-1?Q?QltqfcDDOGkEuOThzePjiyYp6dkO2jsr2A8ofCi1HrqtmRVwj/iZu8Ws4g?=
 =?iso-8859-1?Q?qK+kEHcgcLVnLVPCKI/uNMmTGu5jdkmDhi3uY/7ymd/5djFXzlxHPRJrck?=
 =?iso-8859-1?Q?k2lAC7rg6azF9lwZmsmXMlerXZhUv87Hr9urvdZOW2eCWFpE2aYM1XiP7a?=
 =?iso-8859-1?Q?hCXqtKsKc7cAH/+dYUH1R9TI5FzybFohusPZcpbI64kUNm7wW8VTNopxKW?=
 =?iso-8859-1?Q?PQtC2koo6eycyGwb722f36rwThS+GMCrOrFgQlTpfqo15UsWJlZSn/q7kX?=
 =?iso-8859-1?Q?FtGYhQ2lYuB27RJNgBoSG9QuXKix8rv+l4qElDWA5T6mOZS15mUttvJ0WR?=
 =?iso-8859-1?Q?XgU/Fpt1YjMBLu1YlLBciPiHCO7hU7p0N4KhMs2XG737lUvYfimHgqTb/d?=
 =?iso-8859-1?Q?wK317TSeKIvMb2Nue0BP5jdeO/jNIXgCSlXgqz5tAX/IaVmPfhPLYBOuFi?=
 =?iso-8859-1?Q?iFOkDOaJFvaCD8v8321dJ5uFUqWnfzsrVVfGOB4UQeS3yCcvKbMetAbl6+?=
 =?iso-8859-1?Q?07VV97eOBlV6JRYKIfjuDbLvO6N8MhnDJaozUEGiIT7vqEkBGq+wLSQbvB?=
 =?iso-8859-1?Q?Yab/nvmhqLUekeO/nou0eLHKYYNWQTGUWSvgDGHjBWLZi1eoBo8S8m6Vcx?=
 =?iso-8859-1?Q?u9N1PSvXxqK5DS5mKNOEZeSpxB4qzqRW5s4HTFV6I/8UUUrY6hKO4OCVnr?=
 =?iso-8859-1?Q?sV7h84lNcq/w0QOjEp2FNUNXbofXn5LSC1xoOIDB3mIskMgNXLsMQ+aR6O?=
 =?iso-8859-1?Q?QsulpHvuJgtkrmUsmT/6WEQkt6K4s7/Hwy793cH2ABWv/rG7Qm9wDIpji9?=
 =?iso-8859-1?Q?SGc18Yj7JXVAjNUZxxQvz5394f4qXBvFr0uXqqY442oyuiHMeB7rZ2v8Je?=
 =?iso-8859-1?Q?/WeWoMRdN5F318Cw3O2H2UYJc++ye8r838wyrgzMMCdedfFl0SuuiXh+Ms?=
 =?iso-8859-1?Q?M/HsMlZzwUPRFl/JOIeRCh9kYo+3nO/ZNSVQBxwmJFSvfaDp/GqXWV/XGL?=
 =?iso-8859-1?Q?htMyBjj2jscDaprA5JDF8FvofC2Rs0QMVRfPDVgOgoIQB60B0yQcHFG7Ij?=
 =?iso-8859-1?Q?hAcTexLCZSqmczihF2SxJvczNQTNHwtpll9VWO1MKOGehAOsGQqSHPOGKH?=
 =?iso-8859-1?Q?TdVkn3qxOjULSLrv+ymjS83Yt1k5dundUWED1MHZAE+SGFnw6xDGoY3fDB?=
 =?iso-8859-1?Q?i2eSbgsCP0KbV2Zx+g/XhBek37U4Sh4SThvG3r0Q8h96Lpv47qNK3+Oiqd?=
 =?iso-8859-1?Q?I1nH8gAAWffEN9DyVXZVGw/F7xcjqcUD8P5x6Oo56gZLT3mF0TJNYfMvfa?=
 =?iso-8859-1?Q?HlLBBE1Bl15wqAUo1MBb/xoCcqECWMgg+FsWxPushvngNDivLzqmeFGcpG?=
 =?iso-8859-1?Q?4cAdOkzy64LSAC3JKEqQhj0edba90hPA1nYQdiD7vk+xNn/puy1FVPoQ?=
 =?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: 70227de3-2c89-4c14-5a20-08da679e946c
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:39.9751
 (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: Hej5MQyGGOd5Fh9Er2oPj/WimnXm6XzGh8j1lud7/0RhOTkEMF+xV7bbSCPJ91TKWJAUbdyRnFIGY0yNF6fKgA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2908
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-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-ORIG-GUID: BncaZxylsLhEAEatewDt_UxxJaOHtmvs
X-Proofpoint-GUID: BncaZxylsLhEAEatewDt_UxxJaOHtmvs
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 35c4478a8fe4..1ba4074c75cf 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