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 23/69] mm: use maple tree operations for
 find_vma_intersection()
Thread-Topic: [PATCH v11 23/69] mm: use maple tree operations for
 find_vma_intersection()
Thread-Index: AQHYmYdzdmx4mBu7fkql9efdAg92rQ==
Date:   Sun, 17 Jul 2022 02:46:44 +0000
Message-ID: <20220717024615.2106835-24-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?wO2nzQYCgZVPu56kUK+YWygZcxTPsy6qNBjo+eiGgds9SjddvLgt8rL2LN?=
 =?iso-8859-1?Q?hdJg7nXnKHYvwHhwKmvqS9kUoQxPhqDJySIBQX9dNLtKKlSxgFXL/h0eeQ?=
 =?iso-8859-1?Q?BQriEHU1E75UbIc3tZbd2Uqx651U2mYOuEZydvP85JgtfU0Ec8COEaDZaP?=
 =?iso-8859-1?Q?Vd2ly/JF77G5xfrYSsCzLZ2EB9Z8HJ3YgL+dNlVGJanaE6Hl1Tokj2Zqi1?=
 =?iso-8859-1?Q?EScveHX7CfyEMlsDiK4G7LoOuALfor9nTTpT7/VCqoAYjhGRcb0kFaYpZy?=
 =?iso-8859-1?Q?VcH1ISa0zKeGqNRBygzyriOuYpDjH/8UiS/wz0kMLJoa2pUD1uHai3Opa8?=
 =?iso-8859-1?Q?YE//kkpXg7K2H205/EfxlECpBkpvQ/sNYdzPyfZTS45gvGQ+57tRj5HGqw?=
 =?iso-8859-1?Q?TxwzVsSe952cZmQTd25zDFY4QEbnnV/gtvs7UtGFJhvvKvLkRhAeQOm1E7?=
 =?iso-8859-1?Q?zxFQkZTfSoS7XriV7ypVJ7n6SMgIPL6PNKxegjAZfdILhCIrgpOOs3RHUj?=
 =?iso-8859-1?Q?xXfPZ9j0574o+hEyKUN3TG/kJqJGbT9P6XdVEZwjPGRMulixgh4qQhmHJi?=
 =?iso-8859-1?Q?9rx3uPD1El+KrogEqbLXyA2Di0BxMOaP+s5HDiC5VXP05p8omGnpRMWrND?=
 =?iso-8859-1?Q?a/XXbfJCACBQ54dRtVI/ZeHOJJ+wuhl0AFASMP0IHxGTa2vNVztZfX+kOC?=
 =?iso-8859-1?Q?LlpdC7B4iBen2Ji22koLCnFbqzIrSf+r3V1ATgKC6I33YKhWkpcUPYFTcN?=
 =?iso-8859-1?Q?8mxWCmilSHyeCdKpl2n7xb1DQRkBKVzL4vjf5DSF/DKD8aQP7qJNvw1xvF?=
 =?iso-8859-1?Q?WFD77gTuJe+vTIYYr7UtZUV7RITMxXDb1dqOgYryefly2FN4CBPe+HrXT+?=
 =?iso-8859-1?Q?AQ9ztkvHQwkQL+57coubDKH2OC3lauU7bkR8cNFmMtnoonI2ePX5k71kp3?=
 =?iso-8859-1?Q?YctTebXZJ7SSFKxhlE9I0/JGIrjlRyfie0Qv1wNADpAdhSBQ0HhZVH66Cj?=
 =?iso-8859-1?Q?uzk59FIbmTN2jF77mIPKsmBX1RXD/TblEIsuIEB1AhRTtXQ2kl3bzHyXZv?=
 =?iso-8859-1?Q?Pfbg1W4Wevkv5TNYryaUAqnNKw8rQqGgwcyh59U+dRGOgjwPqIprqvNCYP?=
 =?iso-8859-1?Q?b/U0A1GgYhUw3aYre2GvR801LE7qLejrMZYiZHehx09loPcbH6hvQiCq9j?=
 =?iso-8859-1?Q?n/Sc5IyNogvLnvgqG3TnQmsiEqoiOw5f1debWaWStuokd2CQXPi3E/zmvu?=
 =?iso-8859-1?Q?W8gdv75ODCyPnIaGMT6tcOeCzn3diQU6GHEmNZ0JiZZ4EgSFmVzwTVQFGR?=
 =?iso-8859-1?Q?V5ci3+maYaPFQE/GwxUIGfYDEoll9+uD8aYwZoSAN4POHVQ4+mlKGrpAoY?=
 =?iso-8859-1?Q?rSFPeRvNLUxLE1Djh4C1vvYG/0GQjhY9kqLpFfFYT6JapGQFgRqqg4fEU2?=
 =?iso-8859-1?Q?2NlMLq9Kl0+ZNldKhDuq5+8deHSa0zlVz0uGvYWDI3i0BZwoBmIsop+Y6t?=
 =?iso-8859-1?Q?S50+CNjBsdPx9CppkWGl+O4Y7EWtrh6qi3d+5TIuC1ty2+Mat3tgBWEREL?=
 =?iso-8859-1?Q?8+f5K/D/nG7HTxFGDTbmc0W0rdUebY05XnrJHUa0lhqNWnvVGiHm+1EY2P?=
 =?iso-8859-1?Q?MPEw/M+mO2Cc1pi0xSBppbUrw9MxfEsJpOPEL70Cu468hj7sk+Ok2elA?=
 =?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: 443ed970-6f2c-4b20-920e-08da679e9842
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:44.2873
 (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: hq2jkzucTTh2p7/+EnUpRqNKXVONnJvm5acRW1HJHXXTQON8BefYrk/5CVsgVndgkrdON3vbQQeUXZeFGdvLGQ==
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 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-2207170010
X-Proofpoint-GUID: 0jOAdhb12ME4mOGwY3JG0MZF9u0Qq8fR
X-Proofpoint-ORIG-GUID: 0jOAdhb12ME4mOGwY3JG0MZF9u0Qq8fR
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>

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.

Link: https://lkml.kernel.org/r/20220504011345.662299-8-Liam.Howlett@oracle=
.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-24-Liam.Howlett@orac=
le.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
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: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 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 8207fbc6ed87..55b4b53895e8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2792,26 +2792,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 7570e008ef52..378275cc390b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2110,6 +2110,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 f2031f865dbb..b098c0251137 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -642,6 +642,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