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 68/69] mm/mmap: drop range_has_overlap() function
Thread-Topic: [PATCH v11 68/69] mm/mmap: drop range_has_overlap() function
Thread-Index: AQHYmYd8ld+czVMa2UKo6R2mOVmwMg==
Date:   Sun, 17 Jul 2022 02:46:59 +0000
Message-ID: <20220717024615.2106835-69-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?pR6U6EcOAIVNwI+66Vyo9mKgNjpOPXT+0xu4ImSqdH26M4qJ2OAZQ9LCOO?=
 =?iso-8859-1?Q?jF3Pp3ON/5hdlXUNLCjPR/Vi963B8j7+1mHVhGvx1BxEG7gpOvXWO09L+P?=
 =?iso-8859-1?Q?UlYy/rvas0wbKoh5SdLDBb2LLaPdzHbylrPV9LQ0mbUcuNgGYwQXpuvyDV?=
 =?iso-8859-1?Q?BbWwwBl0ue4OPjLDMT7NxT4C92tjtCC6aWAe0dcdO0D7KaycRmykRO/wQX?=
 =?iso-8859-1?Q?Ranb5V8fQACyH1J3nPyjMRZleA615lcagrKdTPp8eScHSltAPyhlrXRo7o?=
 =?iso-8859-1?Q?+FHL2TIZUNEoBijvUqJjKSDIC6jDi3yMuYLXm4lwQy2WuGxNWMVbuJpOYQ?=
 =?iso-8859-1?Q?3waOCfVxj2S1URzKxLhyh+7M8htVE0KdPJBnJzgH0nMSQdSa1NMHb18MYR?=
 =?iso-8859-1?Q?ID004jz+l4KPZEpFuAOTYSz/QzE8fOQwXmp6/h2QoTX291zw6Fx2/2hGk/?=
 =?iso-8859-1?Q?cQfa0auEPK71pjbEYg5mxeeRaPpqv1ZQci61/GKX89qCg+64TbzYEgXmLJ?=
 =?iso-8859-1?Q?AAqJwuPPjTlvcsj/1dPAB9NU1wJ0jZfyPqsDk9kYObNzhJYMR3Gs0v5Bab?=
 =?iso-8859-1?Q?+HSMeKRlrtYgtwR6fU/E9aitFt8l6HTnPdp24v6YuD9wyf6QRZ484jT1qX?=
 =?iso-8859-1?Q?sUzN4Shfp+abFb9DqBTQHOeqcm4j4/vUYwZWb+ik2x8JCxqMP4vZClQB6p?=
 =?iso-8859-1?Q?8Rtl9oEfBOcNud3ldTjGdycRpH4Uca4UjUEVWz0ht0xnaCUGcFi5Bi01Bb?=
 =?iso-8859-1?Q?m2LhveFajMyNVjOEd9Q8C0H+qVdpiOKj1HpIs+St9EmaLq8C7G5PdHa3vX?=
 =?iso-8859-1?Q?jcmdiEJ7jr7HsGVRggChJMZCePBygUEMge8MRLlNG79bpljxy0G9h4UtT2?=
 =?iso-8859-1?Q?8IYYbj13A1BdiwS+hkD2DTh/40eAephV7BrFBFfXyZW6LicdaYvQv0oMJK?=
 =?iso-8859-1?Q?wUYe31BNcSaSuR3ZO0rSQKR/FB4e+gko+ZWxBeztsFXd+T1+bZwMRprkKr?=
 =?iso-8859-1?Q?YAEP5vxwb1oSnPxNY4pvYz0Xmjs+73ItISqgycbmMXhTiXQoVmucpqwx6A?=
 =?iso-8859-1?Q?2OVOnXJY4Y+8JpGI5s6KmTJjnJMF156WW1pPL/+a3Px6mNKBS1sozTZdPH?=
 =?iso-8859-1?Q?BjBlpZj9n+qCEcSgp0ViOxD64DKLpmzkr4rYgj84l5bzQ3SAmyqoy3gO6x?=
 =?iso-8859-1?Q?oIEwlC2lf7eGqPyhe100sAv7cyeHvd6zLyWSezgmmGYR2gmsB9LIMfSDt/?=
 =?iso-8859-1?Q?GZ9fWUEgDWbBMjHS+0H18APwGyUDiRRVp7wVQ3MHEN0cyrloQ0MUweKSV9?=
 =?iso-8859-1?Q?vgWRS07ek2SWxVR7Ah3VpbzdwxGzhaMRYuX9fvI8v1zzNLgtpElQ4ncGee?=
 =?iso-8859-1?Q?PTv66gy4PBa29iE+oQJckWDtat/LEUpbszGV/R+fHgZvwkIkYv/Gg1PXfO?=
 =?iso-8859-1?Q?ykV38n3DNbKjF3aINmkhHDVJ9DpN7/FaWVp2LjK5unKWM8BWQTghErP9cO?=
 =?iso-8859-1?Q?Kv41iNs8NxhFz/WAg9rwcClFLt3JrPpYjihcuTyRjLgHwB2qpIfUQki85d?=
 =?iso-8859-1?Q?UIVbAFl+q4MoS1Fm6FbH1TKseR5Prwhjn6jC6FY3Gllu7PPpqwxGdj5skP?=
 =?iso-8859-1?Q?X+TphTMcWixfhR0vfjlSTHC9t0q4yEEc1+TInO8ZmSrCve8AsUbeXPsA?=
 =?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: 0cefb445-683b-4a37-9a17-08da679ec71c
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:59.2551
 (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: KMTX5SM5NeKMsfg/GoV2DPzRaLZ9L0eYgfZtrSJsV7tawoPAGNYGftEfUovPdPPeAwkDsa9vG8DylSBfppDgug==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4504
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 malwarescore=0 bulkscore=0 phishscore=0
 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170011
X-Proofpoint-GUID: EkCJeMo4f95M8N0ziDU3IryKzQHOXlG8
X-Proofpoint-ORIG-GUID: EkCJeMo4f95M8N0ziDU3IryKzQHOXlG8
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: "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
Link: https://lkml.kernel.org/r/20220621204632.3370049-69-Liam.Howlett@orac=
le.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 b494c7e3dcb0..1c35cd0ec4c7 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)
 {
@@ -3282,9 +3258,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