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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 14/69] kernel/fork: use maple tree for dup_mmap() during
 forking
Thread-Topic: [PATCH v12 14/69] kernel/fork: use maple tree for dup_mmap()
 during forking
Thread-Index: AQHYm97nvYlFhXxQ2kKBr2bVDaTmgg==
Date:   Wed, 20 Jul 2022 02:17:48 +0000
Message-ID: <20220720021727.17018-15-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?HN+3hN+UdaDcEV79zgBz0KZMwQrMeRwwy89SJC66hOuk0IF2xTMMpr5lGh?=
 =?iso-8859-1?Q?saWlJKRuDdS3gWcHMG8k2dpLHY5mXvE0XTtwzb6u00mkzOoZAykedKVuvG?=
 =?iso-8859-1?Q?nt92qnttTlaNJLNW9cPs+r/12BocwkmA1Bq4JX8Q7UwFIbZOYVBTTQS6N+?=
 =?iso-8859-1?Q?Fh6JWH5HDwN+F8rR9zR7qzQa76mxqefsxGPCXK0tIsMCKl47CBK3sO4qe7?=
 =?iso-8859-1?Q?zwZx+TAs/hQU7jil4tp7ph8wmLgodaavFJb7J7M/WubK8md2/wUM80g6rc?=
 =?iso-8859-1?Q?EYnjuze4HcDpWYVyQppKF2P7X/ooRuGeAAdetYR97pzC9UdBlIoWErRHK+?=
 =?iso-8859-1?Q?w+6CHszoPXRyEWePKAHusof/L5b0JDApYbcDFUA2jMOs5h1buhwddv4FSe?=
 =?iso-8859-1?Q?hoMpUtUZ5uh+ZrY3hCSsVMs1xTybjXZ7cMb1eIw1SeIVp7d+AtFWmu5D7u?=
 =?iso-8859-1?Q?CxBVJgS4x3iAAJvv+3K67xfdFkET7FPB1dRgtRpamwcHymHfjL+JIz21nE?=
 =?iso-8859-1?Q?4cxvFTj2WPqSywaDgbjOlLI7jLG2o0nAWnpEPu6bVMiLk/4k4j8XOrDKi4?=
 =?iso-8859-1?Q?k62M0/0eb9PuBuxtE/lRhjSM37hyb4YpAwNzUfez5aw06QKJ1h3AJ266pK?=
 =?iso-8859-1?Q?RhTmXUBcSOmc5WUPADdecJvWnMyiW3UN0IIeZjGwRUUYkPGEdmRtElSORD?=
 =?iso-8859-1?Q?TZ5XmRb3EIrZCmxloLS6COQ8/e6JIbfZUKk+ItxZo/J8UtVfwQLG+FEtUq?=
 =?iso-8859-1?Q?1qH8Wf4BtE8vtg1vW9XMJDKQs3t6l67LhLjLu4sbk+0pKhZI8QLT+O+qSe?=
 =?iso-8859-1?Q?uncu/9fNAN0aLnRr5wH6MWFqrJAJbCO9Ynk+nminTTBfu1cZ+v/r9rk2qq?=
 =?iso-8859-1?Q?x/AU/xBr6z231dCULzCUQ0WsR81eif/KwWY7HcCcWQxf/7uUeZ5oLqT5s9?=
 =?iso-8859-1?Q?5Q6RB3MKfdtnWPG5Ny6wWOF44Vx++COUkJxBLhwTJzaeVO8lra8O2UAJd1?=
 =?iso-8859-1?Q?TrqI4OZIWWsRAJ8sTmHRUySSkjommt0m+17OIUm/pKgaXsEtf+uzQpsQbJ?=
 =?iso-8859-1?Q?VZHfxSUXKSQPFsGA5IauWPBJen8G0I7xlQajoz02ic6lVuaUic5le7Xby5?=
 =?iso-8859-1?Q?B7Itsh2UYJNiW29jdxpAzXpEzc2TQVNPdHyDW45mc/YFnstvUeKgyPJ1Bu?=
 =?iso-8859-1?Q?1gv3hcBi+gLE1aSwqYfGkbA748zTUqGM64y6gxdcQvbNibvmXBr9wFhbdW?=
 =?iso-8859-1?Q?hOLmu8WoJ3/Ew93tx716u8BDjrENvKMQ1Cmj60ZkNPOI7aX807JhoFIA4h?=
 =?iso-8859-1?Q?UXa7WJpix8QEVmpCptuuQgIii9eiVTRwl2xxtapCOFQmHRyzgDs3jfAwcE?=
 =?iso-8859-1?Q?SyX1TjHOzdQi0FVAucyXmVg32wUeZu/g36rwA7QgvBjulBVAfKxz1G6xnH?=
 =?iso-8859-1?Q?91eEsshWLjXTv+uH55V86EaEmH3dkuZscwNz46EmfslyncUGlVtmlXKMNf?=
 =?iso-8859-1?Q?GToBySEh4WwR4FMAxYlOpOPXp3I/hiW50EISxWl9hhg4RNCC2ZaHX0G/oF?=
 =?iso-8859-1?Q?dvhXvgEG/Neac/Ynkuc70va2HCXiJVeWyYiPbK2SWbpef+uBZI+XMWY6Fr?=
 =?iso-8859-1?Q?caPGmqDzj3LriWGzUIg8j8C82cCgWajf+JCFAA4Ps1imB4EPhvhTaM2g?=
 =?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: 65aff63c-6166-4252-f492-08da69f60bb3
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:48.1656
 (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: 1siv1yF9v4I2U/tXD3EnnTl7MLjscnio/Nr1fWLy4JjfRjXc3zEaUvaCxgAcneOJORQpxdMwWiOAuBdjFUBCqg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6243
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-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: HDpwpXU-6mt7hCzlyK-9r2VZcgNeEtj3
X-Proofpoint-ORIG-GUID: HDpwpXU-6mt7hCzlyK-9r2VZcgNeEtj3
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>

The maple tree was already tracking VMAs in this function by an earlier
commit, but the rbtree iterator was being used to iterate the list.
Change the iterator to use a maple tree native iterator and switch to the
maple tree advanced API to avoid multiple walks of the tree during insert
operations.  Unexport the now-unused vma_store() function.

For performance reasons we bulk allocate the maple tree nodes.  The node
calculations are done internally to the tree and use the VMA count and
assume the worst-case node requirements.  The VM_DONT_COPY flag does not
allow for the most efficient copy method of the tree and so a bulk loading
algorithm is used.

Link: https://lkml.kernel.org/r/20220504010716.661115-16-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-15-Liam.Howlett@orac=
le.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
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>
---
 include/linux/mm.h |  2 --
 kernel/fork.c      | 10 ++++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index dee609fe5c1f..60045508a518 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2613,8 +2613,6 @@ extern bool arch_has_descending_max_zone_pfns(void);
 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
 extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t);
-/* mmap.c */
-void vma_mas_store(struct vm_area_struct *vma, struct ma_state *mas);
=20
 /* interval_tree.c */
 void vma_interval_tree_insert(struct vm_area_struct *node,
diff --git a/kernel/fork.c b/kernel/fork.c
index 1840da0732f6..f575a3bead0e 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -583,8 +583,9 @@ static __latent_entropy int dup_mmap(struct mm_struct *=
mm,
 	struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
 	struct rb_node **rb_link, *rb_parent;
 	int retval;
-	unsigned long charge;
+	unsigned long charge =3D 0;
 	LIST_HEAD(uf);
+	MA_STATE(old_mas, &oldmm->mm_mt, 0, 0);
 	MA_STATE(mas, &mm->mm_mt, 0, 0);
=20
 	uprobe_start_dup_mmap();
@@ -620,7 +621,12 @@ static __latent_entropy int dup_mmap(struct mm_struct =
*mm,
 		goto out;
=20
 	prev =3D NULL;
-	for (mpnt =3D oldmm->mmap; mpnt; mpnt =3D mpnt->vm_next) {
+
+	retval =3D mas_expected_entries(&mas, oldmm->map_count);
+	if (retval)
+		goto out;
+
+	mas_for_each(&old_mas, mpnt, ULONG_MAX) {
 		struct file *file;
=20
 		if (mpnt->vm_flags & VM_DONTCOPY) {
--=20
2.35.1