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>
Subject: [PATCH v9 23/69] mm: use maple tree operations for
 find_vma_intersection()
Thread-Topic: [PATCH v9 23/69] mm: use maple tree operations for
 find_vma_intersection()
Thread-Index: AQHYX1Q3mlFRYcoQUEaWWiN5amr27g==
Date:   Wed, 4 May 2022 01:13:51 +0000
Message-ID: <20220504011345.662299-8-Liam.Howlett@oracle.com>
References: <20220504002554.654642-1-Liam.Howlett@oracle.com>
 <20220504011345.662299-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220504011345.662299-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?Db+hNN1bm1PN6NAuNhZsXFcJ2ktCHLdxN8QmvCkotta0NoPSG6qH00d49V?=
 =?iso-8859-1?Q?FPfOVWZam6vo6nxDRGfl4w/o9QE0Tgkvdr+tw6MCJut+owdiTcg9uwWjRU?=
 =?iso-8859-1?Q?cZZkLDqGq2s25+yY0KZdIuoFJ5/NCsnJ+6RbQ37k/FDw5B79ItuCgAcVgB?=
 =?iso-8859-1?Q?OBIqmuodJFRDcxnypz5hm4nPcJZL8ssHWeDkXr2aQv4/fylgL7swS7EB5y?=
 =?iso-8859-1?Q?O3redzejFm+I4LNH+HlVL3DWmZd8bBOxpr6/cXUOsInQEkRckXNyCgOZxH?=
 =?iso-8859-1?Q?xgjOWae2Q5AW131xQ3SzGDCCD9R+QZTl2SFyrJJrhm9FcE/4vPAOt4V0a+?=
 =?iso-8859-1?Q?Q97gSSuVC+Prj8HmeoH9y4vNxBVZEyBgoeCfikwoU2rfLcuq0bFlecGC/4?=
 =?iso-8859-1?Q?SRhG501Ah9PfUPddynO4ScmYUuWzbI/rB0XzsULSdzIrZGZ5cHt+p0LOIH?=
 =?iso-8859-1?Q?7m0CTb89vH4IDnGPGG5G0Iy3R0gqgAzFcmqrk4rbmB1fFodhs9dwMLI+EI?=
 =?iso-8859-1?Q?cXV7PzeQBxFG1+GNmcwIsxzGdcE5Q8YkgPZ5sTbE26Mlrs1eecSy/m2YWz?=
 =?iso-8859-1?Q?FnEY+YeedVP9996K5zGw11GgCF8JovgPXhZd04mJNPus5d6xly1iA5prcM?=
 =?iso-8859-1?Q?I1xXz7C2RLpxT+h/8j/1i7WyRpXyontnNBNmqrjnR3Y3hIaJiCRSkbplpt?=
 =?iso-8859-1?Q?OZppmrUHfbErz4aAtx+tuIuBl+hOBBUMbq5yhCsWQ2aiobTAvXVJVm4hOF?=
 =?iso-8859-1?Q?19V1vT9Ht04dfdAYmiMYg1pR7C/lAuUO1OVPcKGTJiJW7rK61HibmSAut5?=
 =?iso-8859-1?Q?B55TA8FVky79+k8s5R3I90XvpzLRh5n33SMntlQmRlHWvxaS5Ea0IQ5iHh?=
 =?iso-8859-1?Q?3oTE6gHnR8vYWU9eCCsivsnddqwadSzGg7g3H9hGhJJBcDoJNQyZbwOSAL?=
 =?iso-8859-1?Q?2ju830O15qhvKnnlcnMZQO1Silno+8lZq2JesboBe0aX2efCGauy4ilihe?=
 =?iso-8859-1?Q?im61w53Nch3nesNyMLVrrqOUXirN0kN4NfWRJoxD7OTmgq3HimZ+fURa8W?=
 =?iso-8859-1?Q?wtNsIOoFjzWmYDfE38grHSAeW8R18MTECmSkuRGUlSTZW73NTqICslr/uI?=
 =?iso-8859-1?Q?QoqZrkQDuTyIVPftI5EZd4sWprbczOmOfaFiAkAsg3HKoNKaQSyQPfKtRU?=
 =?iso-8859-1?Q?pb4jJFkPaTGec9h4YKyNQG6Bf9jdyVeMU+QUg7Erbw4CYfjTOfLdmrZekf?=
 =?iso-8859-1?Q?5ymf5DLL5PA4xlADl+NKFSCRVwovJGWBuia3ROH8oH/mO3mE9J2h7UhhWh?=
 =?iso-8859-1?Q?27YONqpz1s2+3wTH3+cEMVL8kpa7PncIT4eTl1zfqswUuyEq3RIY8l+FrD?=
 =?iso-8859-1?Q?0/79d+V1uqYmC5leqOLBI+6R8R4/pJLbCQBW6qVJ9Ru6snYoMSsVu3oOAY?=
 =?iso-8859-1?Q?jhbzpec32cFwMAyce5trQSq9PisTE/2qEur1USK1DEkpOP+plyc7qxzHne?=
 =?iso-8859-1?Q?eDO1v5FB2HguCbuQSQMVugvji4OKhypZGkoKK+IcF0PKO6JmAJAZyc+84x?=
 =?iso-8859-1?Q?W+FBkb9AYXLUmYd4zFyO8a55A3GIPfqMS44sl3LuZii32PFGh7oD3xq4gs?=
 =?iso-8859-1?Q?t+HzZ4pKMoI2W+4AlklMEkJlmykxm30IGHrOpvo9ASyeo8TdBOuta8LMzo?=
 =?iso-8859-1?Q?v83BYItVrUWTuPxBDvLL/EiSZsH2NoFZiFyc0sKMv+Y0u5oFUtnjNkVeQj?=
 =?iso-8859-1?Q?L29M8WGyjVJBFs66Kpq8GQijMqGv4r2XfvcwKZvb75m1qaeV/xTa+xWUW5?=
 =?iso-8859-1?Q?VfHrc0FUXFgE+zTvkJtGRfNTp0nqbDU=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: 4a1516bf-5e6e-491e-198f-08da2d6b5a14
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:13:51.9707
 (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: ke4Z9OwFQdhkQgd6M0JR74akFIwVBBdqfPCL9XWsR5gUpnoKrOL3Rr87Idu6nxf4yswPwJV2pS/Xr5t7IWitAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5830
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0
 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205040006
X-Proofpoint-ORIG-GUID: VWO3OS50xBdTFgbPBkDwaA1kWGmsqBcO
X-Proofpoint-GUID: VWO3OS50xBdTFgbPBkDwaA1kWGmsqBcO
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,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>

Move find_vma_intersection() to mmap.c and change implementation to maple
tree.

When searching for a vma within a range, it is easier to use the maple
tree interface.

Exported find_vma_intersection() for kvm module.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 include/linux/mm.h | 22 ++++------------------
 mm/mmap.c          | 29 +++++++++++++++++++++++++++++
 mm/nommu.c         | 11 +++++++++++
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0fdb19d1b48b..6db9face6f84 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2780,26 +2780,12 @@ extern struct vm_area_struct * find_vma(struct mm_s=
truct * mm, unsigned long add
 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsign=
ed long addr,
 					     struct vm_area_struct **pprev);
=20
-/**
- * find_vma_intersection() - Look up the first VMA which intersects the in=
terval
- * @mm: The process address space.
- * @start_addr: The inclusive start user address.
- * @end_addr: The exclusive end user address.
- *
- * Returns: The first VMA within the provided range, %NULL otherwise.  Ass=
umes
- * start_addr < end_addr.
+/*
+ * Look up the first VMA which intersects the interval [start_addr, end_ad=
dr)
+ * NULL if none.  Assume start_addr < end_addr.
  */
-static inline
 struct vm_area_struct *find_vma_intersection(struct mm_struct *mm,
-					     unsigned long start_addr,
-					     unsigned long end_addr)
-{
-	struct vm_area_struct *vma =3D find_vma(mm, start_addr);
-
-	if (vma && end_addr <=3D vma->vm_start)
-		vma =3D NULL;
-	return vma;
-}
+			unsigned long start_addr, unsigned long end_addr);
=20
 /**
  * vma_lookup() - Find a VMA at a specific address
diff --git a/mm/mmap.c b/mm/mmap.c
index ec4ce76f02dc..5f948f353376 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2069,6 +2069,35 @@ get_unmapped_area(struct file *file, unsigned long a=
ddr, unsigned long len,
=20
 EXPORT_SYMBOL(get_unmapped_area);
=20
+/**
+ * find_vma_intersection() - Look up the first VMA which intersects the in=
terval
+ * @mm: The process address space.
+ * @start_addr: The inclusive start user address.
+ * @end_addr: The exclusive end user address.
+ *
+ * Returns: The first VMA within the provided range, %NULL otherwise.  Ass=
umes
+ * start_addr < end_addr.
+ */
+struct vm_area_struct *find_vma_intersection(struct mm_struct *mm,
+					     unsigned long start_addr,
+					     unsigned long end_addr)
+{
+	struct vm_area_struct *vma;
+	unsigned long index =3D start_addr;
+
+	mmap_assert_locked(mm);
+	/* Check the cache first. */
+	vma =3D vmacache_find(mm, start_addr);
+	if (likely(vma))
+		return vma;
+
+	vma =3D mt_find(&mm->mm_mt, &index, end_addr - 1);
+	if (vma)
+		vmacache_update(start_addr, vma);
+	return vma;
+}
+EXPORT_SYMBOL(find_vma_intersection);
+
 /**
  * find_vma() - Find the VMA for a given address, or the next vma.
  * @mm: The mm_struct to check
diff --git a/mm/nommu.c b/mm/nommu.c
index 81408d20024f..2870edfad8ed 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -629,6 +629,17 @@ static void delete_vma(struct mm_struct *mm, struct vm=
_area_struct *vma)
 	vm_area_free(vma);
 }
=20
+struct vm_area_struct *find_vma_intersection(struct mm_struct *mm,
+					     unsigned long start_addr,
+					     unsigned long end_addr)
+{
+	unsigned long index =3D start_addr;
+
+	mmap_assert_locked(mm);
+	return mt_find(&mm->mm_mt, &index, end_addr - 1);
+}
+EXPORT_SYMBOL(find_vma_intersection);
+
 /*
  * look up the first VMA in which addr resides, NULL if none
  * - should be called with mm->mmap_lock at least held readlocked
--=20
2.35.1