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:     David Hildenbrand <david@redhat.com>
CC:     "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>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>
Subject: Re: [PATCH v10 10/69] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Topic: [PATCH v10 10/69] mmap: use the VMA iterator in
 count_vma_pages_range()
Thread-Index: AQHYhbAKPwckVgdT3kiIP9lsHoyywa1aXCSAgAQv6oA=
Date:   Fri, 24 Jun 2022 13:10:10 +0000
Message-ID: <20220624131003.zydflhstzhx4clty@revolver>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
 <20220621204632.3370049-11-Liam.Howlett@oracle.com>
 <5d3bf51b-3bba-3bd4-db1f-1c0a3930a1e4@redhat.com>
In-Reply-To: <5d3bf51b-3bba-3bd4-db1f-1c0a3930a1e4@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?l2lShuprGykUth8jG6ltJ+V+6uPoYBJQH6lMe8OjDhG4P5Bq0bi8p25ScovD?=
 =?us-ascii?Q?RiOvP/fS4WABBAzeb2BwyMUDioXWjfNDY9zPUZVzbWdVdLhMmHfACYW05uve?=
 =?us-ascii?Q?hHS0Y60ErXcdCMWsG5aKSGjPRIjFMlxz52U+UIf+RhOOApeqTk6H9KoA0CLJ?=
 =?us-ascii?Q?//lspAOxuqIlVd+ztb7GMsK3WoFMF3yyNqyXbufYQOl7c0jHtD9bpE8GpIZu?=
 =?us-ascii?Q?T7VUJSxzC5pBEqVqN5UtDUvDsdo/04cwlZwFtE/Y0ALTww3XvdkeBB1/Q2Hz?=
 =?us-ascii?Q?Dsh1JdNOJlHoQ7KoxlWNC07zJY0I5WgbmPeiqqgKNEtyGjrbkC6ZIY6InOlt?=
 =?us-ascii?Q?z+SR7m/0QS2DLWsvTaJ7AowV8N4w4U9ts7oJaLkS/xf7PrMkFpitEmkD1KAp?=
 =?us-ascii?Q?hlj/njY1RlmolPdSmJcgq7Y4E+28/8bipvElLZHf4HPOYuJPuzLZXJ50w/G6?=
 =?us-ascii?Q?C5esAun5WVSnbVIRN5dK7rPxlQJvZIiy2F4orV7JNMfv36PKiARZckchLaeJ?=
 =?us-ascii?Q?iBESj+TMf9HtgwISChSoe5nxcIM+KLKr2A7k66N5UQpdowAbSpVs7gbmPeA9?=
 =?us-ascii?Q?oy5899LzA3Z1jep7KUSDGi+X183InNAJOvKJL5byDv46sQc09oJPRmY/l+Ic?=
 =?us-ascii?Q?GRCWLnPW2a49TKaVUoRpSW4LKCaO7AQQCLLATIsKgBDFXWhuFKMcfHXkpqxF?=
 =?us-ascii?Q?bYRroJMVnyQuR22al1ejcpFd+aXO5TJix9pfWBNe3hzpyvXsqpJ3VimYNByE?=
 =?us-ascii?Q?Ywgt6uMC8Jsw2YmgaiBjPwv/myRB7gfPFGkTbHcPJMwGLH1VFUDhmZqFJfX/?=
 =?us-ascii?Q?yVhW2uKUtxYKnGUUKW5X36aeODLyNoieoHBPr1ln1qLjyVwYmkAAOIOrHv7M?=
 =?us-ascii?Q?pnDmoTyk60Na2P+JPsc17sKwVZwP2POhMgiF62I5E3mCoOvtXb/xuxdzD041?=
 =?us-ascii?Q?KZuN0phJJk2sSNlOAWgmmecN6agHKNHUu9FceRuSIbS6FYcfZ1Vdnj8RmaVT?=
 =?us-ascii?Q?3+zlLTC217haqtet1glKN1p6MWPHTC7+hO2CyEWcszqF59s+W6FyL3f+5OrE?=
 =?us-ascii?Q?M5HxsCLvdtqN1pRtVFDa/n8Sn1lLs9a8EJ5XaIiPV3RnMTLQvd7qkQKuMqZ/?=
 =?us-ascii?Q?+ICi1z0s4E09Ik4LMQKi9My3UgfW9JrWpiHuxAGhCTm3VUutKCRH18s3UuXZ?=
 =?us-ascii?Q?g/0JI6NCjVEd9JXc6yCLcN5dfc7BRTgPEcntKXR1wh+V6v8IwmckhfniuXob?=
 =?us-ascii?Q?9U6Qdf0LzfU8LoMqAjGBKT0alMEf7f4urODPbpIrwXnxPF8Bzgi7xZr+Ld2U?=
 =?us-ascii?Q?xbqw+aBbUUTEJdC3cyQPboBkZ3D0InpkcB1aZJnY4xX5FnPo4Uf05thQUFpT?=
 =?us-ascii?Q?PKAEhnJD3RjkaarQw0ByLVIXtuYAAvRKEyrzbbo6MMFHwGm0roANGCGLJZxN?=
 =?us-ascii?Q?LlJb+H3ltsjZjGCdP1l6AAboMD/tgFCownTvL/kUtBvCkC6Vf5VUkaFtY0oX?=
 =?us-ascii?Q?763CxNgOEpb61WiqfpZ0OGNzYkJLsMhawIGNNMFRMx33s39XSEOlQItymu8D?=
 =?us-ascii?Q?39CZXDft4vYG5PQon+k6X1M8QQMW5ahy4FdTV6oaYFQB90F1RMVPnuzsVUFI?=
 =?us-ascii?Q?+Q=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <E9D495ED8A27674E90A967CD1C9A8B0E@namprd10.prod.outlook.com>
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: 8e00d607-62a2-4a78-e6a1-08da55e2de47
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jun 2022 13:10:10.6101
 (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: 3bbFXqYHVs2E3yPcIneWMcDEozGjK6BIymtBHOclYNlY6Emp38IaIZBgMhZ2tw0AgJSgG7RizXzNcH2XgxPJKQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4826
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-24_07:2022-06-23,2022-06-24 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999
 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206240051
X-Proofpoint-GUID: 49OxhX8UAQ1mKEVc4DG1a14ZJw9Kkqf9
X-Proofpoint-ORIG-GUID: 49OxhX8UAQ1mKEVc4DG1a14ZJw9Kkqf9
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

* David Hildenbrand <david@redhat.com> [220621 17:13]:
> On 21.06.22 22:46, Liam Howlett wrote:
> > From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
> >=20
> > This simplifies the implementation and is faster than using the linked
> > list.
> >=20
> > Link: https://lkml.kernel.org/r/20220504010716.661115-12-Liam.Howlett@o=
racle.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>
> > 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(-)
> >=20
> > diff --git a/mm/mmap.c b/mm/mmap.c
> > index 6be7833c781b..d7e6baa2f40f 100644
> > --- a/mm/mmap.c
> > +++ b/mm/mmap.c
> > @@ -675,29 +675,19 @@ munmap_vma_range(struct mm_struct *mm, unsigned l=
ong 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
> I thought using max_t and min_t was the latest advisory. I might be
> wrong and simply kept doing it that way ;)

They are the same type so I think this is okay.

>=20
> > =20
> > -		overlap_len =3D min(end, vma->vm_end) - vma->vm_start;
> > -		nr_pages +=3D overlap_len >> PAGE_SHIFT;
> > +		nr_pages +=3D (vm_end - vm_start) / PAGE_SIZE;
>=20
> PHYS_PFN(vm_end - vm_start)
>=20
> >  	}
> > =20
> >  	return nr_pages;
>=20
> Reviewed-by: David Hildenbrand <david@redhat.com>
>=20
> --=20
> Thanks,
>=20
> David / dhildenb
> =