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>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v10 68/69] mm/mmap: drop range_has_overlap() function
Thread-Topic: [PATCH v10 68/69] mm/mmap: drop range_has_overlap() function
Thread-Index: AQHYhbAWuXAUjaJmkECqTvbxhyfcKg==
Date:   Tue, 21 Jun 2022 20:47:14 +0000
Message-ID: <20220621204632.3370049-69-Liam.Howlett@oracle.com>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220621204632.3370049-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?4eMXH2UOPubKk8Kxcq/XC1eASKBgouzItRrf2tm/iNkkksIkYXhLiVsNjt?=
 =?iso-8859-1?Q?rJmv08rfSRFsB5oM4mEExsqjdYOP72cijjT4S9MSWXooMrLrZV0eYJZBfa?=
 =?iso-8859-1?Q?uTfzMwUUiSsbXa+y9a3H2oCcR+DdO6b2KgTjRxt1E8SQo1ejwEk+Tlp4qZ?=
 =?iso-8859-1?Q?Za7yejKvY86/jT8t6K5OQtlVtYNd9yigCapdowQ2WzNY3P+vKqWTc2oy6i?=
 =?iso-8859-1?Q?rqKoMtJo0O+AAQ2opd3InEgh/a1TRpipJbrUxg2tJPY+4BuY+mygeAoajK?=
 =?iso-8859-1?Q?o40VojHODzfChOAGra1uG2/SzhvtCuKRmQCQxqknepcSEIsZLVswe6Cw2n?=
 =?iso-8859-1?Q?ByeuFGwYjvcrqihWZ+Wfjzg8KLKXrbr2YIzUpeeOYvRNAAwuKgxhAJSpIa?=
 =?iso-8859-1?Q?AjpNIKC/bnQLwOMZlfGdHs3do8RdIgN1faK4MqHEJNiSGBqxlfSnjIfbu1?=
 =?iso-8859-1?Q?T4GzlBPsMyUDzfYLHsiMVRz3yz4W9vwMyyZ2zL9Qqyg3s9Ea9wSuKaY/BJ?=
 =?iso-8859-1?Q?iJb32LW7L7pM79NSbvzoNPLhDBi1TJV1MpUAP6bcBnjuAJmAe/8U2OyQYo?=
 =?iso-8859-1?Q?gnSr+gj30uinwqisIeOkaLvKSFQ+/7kSTyDBRTbsHWWPMSKiYzp0J9Bc9w?=
 =?iso-8859-1?Q?mvle403wF2tQxOSTm7KfX4C5vwDRxyjt7dMiYtXGjpRKV9f8//5Giba45j?=
 =?iso-8859-1?Q?kddPxgEceh9R3GrDd315RDkQK2twEQvsjDFrXG2hAqbsM+lTQW1b6NGBi4?=
 =?iso-8859-1?Q?ZJHc914elk4Yab9U5HZlC3mkGHpHwQ8QpZBLccrC0dPDrDjHv4lFJy9k9r?=
 =?iso-8859-1?Q?3L4txAGc2rL1jXRLYZ/tQpSeo2G49mi4Of7e7e+wKUi4McP3S8v3IiEywV?=
 =?iso-8859-1?Q?31iHhXtzyteMag+XKFEh03Fu72O2izlI9RayBAwHH97WNj0ypdlrtGZW6B?=
 =?iso-8859-1?Q?+z3TjpKFSsqikHH10tEX3Axm5b5fPuqJ5grx+Wu6U+wAfLfulgQ2K6XFON?=
 =?iso-8859-1?Q?FoefiO2rtVxL5aW18Ph7L+FpV4TUx4P3auukJ7c7fqWxfHDC41gz6/1eLs?=
 =?iso-8859-1?Q?C5TQy0HUAXloTZ13tFcNtcNukh5X9+uMd3J6LQG5VzejYUxr3EM1OWNzsZ?=
 =?iso-8859-1?Q?oXtYcPBBEgOs/I7otRWaKoYI+yRCj1IQaOI5jQMLNc2LlqcG9OcvNgXtTg?=
 =?iso-8859-1?Q?n0/T5OzMXBGCdCfYK7RaEAUN1hGggKOCEHmwQEGO2rARmHsqBH8srTkeJO?=
 =?iso-8859-1?Q?dDuOjyZB6ZoWjVZcHrOb72asTmENfBNioNs1V1FH1xhzFCvrMk3+dVi/84?=
 =?iso-8859-1?Q?shdazdwkLALTn5GytTlWKkAj9AjiqFjXwZlbsZxPlWcHmKsWzWEkMU7J2G?=
 =?iso-8859-1?Q?hL8xtUE4j83hBRBkYwcqSKI+DFlpm+zMIMfPlh8rZZUoWdvnUE9G7SwoBd?=
 =?iso-8859-1?Q?uLfbwZ18CEdov4D58pt33KRiVh9NTgRm43doZG3P3BB4O14sJtN7l7bTBE?=
 =?iso-8859-1?Q?UKGb3NbsaLCH0ezMdQmpFoigt511QRDSX7OPsJyMIOSnMMVcWf/XTxQ9rU?=
 =?iso-8859-1?Q?R6picV4ZmmpDrvkUYLjiXcSaM2j/cnodyRj7HpBWt9ELI9SECYRuaCiq3P?=
 =?iso-8859-1?Q?6sr19SaqIiYvPo5ujcSDEfPPoYsjoQLsa93w9h1rqc21HeMGK1qnjuFqoM?=
 =?iso-8859-1?Q?NDi+F59O42m0EWJDP5bO+eUQt5evSG8UuirYT/WLeuR8CKy43cRYUfyxeA?=
 =?iso-8859-1?Q?Vkm0eveuytB8NGg38dEMxYQ6VzGQRenhAZIhnF7InOkn4JsjbjlIiXuioT?=
 =?iso-8859-1?Q?ThQeTqXAT2ed+mGukJ67iKozTak0tY0=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: 100fc710-bf76-4880-441f-08da53c766a2
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:14.6280
 (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: XvSvVzVRvi7GVRmp5TNrtecqux7S6GwcO2VrAQXEyyF2kxAhGmUOoqk+UdkAYWG2RFqMg2QH+bhSknWYpjIoMQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3869
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-21_09:2022-06-21,2022-06-21 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0
 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206210087
X-Proofpoint-ORIG-GUID: LFrBc2HtaboVNbyTKB2jQi2gXdncosCK
X-Proofpoint-GUID: LFrBc2HtaboVNbyTKB2jQi2gXdncosCK
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: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

Since there is no longer a linked list, the range_has_overlap() function
is identical to the find_vma_intersection() function.

Link: https://lkml.kernel.org/r/20220504011345.662299-53-Liam.Howlett@oracl=
e.com
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: "Matthew Wilcox (Oracle)" <willy@infradead.org>
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 | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 507efa222b8a..2a73467670e7 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -437,30 +437,6 @@ anon_vma_interval_tree_post_update_vma(struct vm_area_=
struct *vma)
 		anon_vma_interval_tree_insert(avc, &avc->anon_vma->rb_root);
 }
=20
-/*
- * range_has_overlap() - Check the @start - @end range for overlapping VMA=
s and
- * sets up a pointer to the previous VMA
- * @mm: the mm struct
- * @start: the start address of the range
- * @end: the end address of the range
- * @pprev: the pointer to the pointer of the previous VMA
- *
- * Returns: True if there is an overlapping VMA, false otherwise
- */
-static inline
-bool range_has_overlap(struct mm_struct *mm, unsigned long start,
-		       unsigned long end, struct vm_area_struct **pprev)
-{
-	struct vm_area_struct *existing;
-
-	MA_STATE(mas, &mm->mm_mt, start, start);
-	rcu_read_lock();
-	existing =3D mas_find(&mas, end - 1);
-	*pprev =3D mas_prev(&mas, 0);
-	rcu_read_unlock();
-	return existing ? true : false;
-}
-
 static unsigned long count_vma_pages_range(struct mm_struct *mm,
 		unsigned long addr, unsigned long end)
 {
@@ -3287,9 +3263,7 @@ void exit_mmap(struct mm_struct *mm)
  */
 int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
 {
-	struct vm_area_struct *prev;
-
-	if (range_has_overlap(mm, vma->vm_start, vma->vm_end, &prev))
+	if (find_vma_intersection(mm, vma->vm_start, vma->vm_end))
 		return -ENOMEM;
=20
 	if ((vma->vm_flags & VM_ACCOUNT) &&
--=20
2.35.1