From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30C02C433F5 for ; Tue, 10 May 2022 10:37:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 95A326B0072; Tue, 10 May 2022 06:37:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E2AC6B0073; Tue, 10 May 2022 06:37:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 785046B0074; Tue, 10 May 2022 06:37:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 631CD6B0072 for ; Tue, 10 May 2022 06:37:54 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3626717D1 for ; Tue, 10 May 2022 10:37:54 +0000 (UTC) X-FDA: 79449482868.06.E4C6B13 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf18.hostedemail.com (Postfix) with ESMTP id 716E51C0089 for ; Tue, 10 May 2022 10:37:43 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C6A46B81CB6; Tue, 10 May 2022 10:37:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECD9DC385A6; Tue, 10 May 2022 10:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652179070; bh=gEUdySVb9quKEsnAJIwkLpqXP8oiSnANbxwM2hILG4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GEBEEkNCmOrR73vQ5zxfIGz8bK0GKyIAMRVX3VqpYmF/bqlKyJkH1NAXc2tHQJtqv ZjcU8nuUgpN7sauTQ9GJtN2vWlQtGvW/Pr0RiSjn3F107H+aWGgljdlsAyCuzl12U7 sjkNcD8qzklauXhca4u3qGQXVycvd5fGRBzRzf4lH2AA8lsZ6138w+R9X5okfsR0Do mJtdCAnvjDi9QrRfAFZSxU4GliIOR1QimftN8ZKBLYLmVNY2kIRT8hO+/8KaZdPqWn lzLizagW6lzZ3cTNnB1dAIeUHNkfz7gVrWT8VSMzAjZOvrsDo6YsP4cEszhpxKxqUa waENBEy7uH7Gg== From: SeongJae Park To: Liam Howlett Cc: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: Re: [PATCH v9 08/69] mm: start tracking VMAs with maple tree Date: Tue, 10 May 2022 10:37:47 +0000 Message-Id: <20220510103747.151886-1-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504010716.661115-10-Liam.Howlett@oracle.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 716E51C0089 X-Stat-Signature: n1u1qcskjjb1uejirkxxpmzrhardkgxi Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GEBEEkNC; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1652179063-363846 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Liam, On Wed, 4 May 2022 01:07:52 +0000 Liam Howlett wrote: > From: "Liam R. Howlett" > > Start tracking the VMAs with the new maple tree structure in parallel with > the rb_tree. Add debug and trace events for maple tree operations and > duplicate the rb_tree that is created on forks into the maple tree. > > The maple tree is added to the mm_struct including the mm_init struct, > added support in required mm/mmap functions, added tracking in kernel/fork > for process forking, and used to find the unmapped_area and checked > against what the rbtree finds. > > This also moves the mmap_lock() in exit_mmap() since the oom reaper call > does walk the VMAs. Otherwise lockdep will be unhappy if oom happens. > > Signed-off-by: Liam R. Howlett > Signed-off-by: Matthew Wilcox (Oracle) > --- > arch/x86/kernel/tboot.c | 1 + > drivers/firmware/efi/efi.c | 1 + > include/linux/mm.h | 2 + > include/linux/mm_types.h | 3 + > include/trace/events/mmap.h | 73 ++++++++ > kernel/fork.c | 20 ++- > mm/init-mm.c | 2 + > mm/mmap.c | 323 +++++++++++++++++++++++++++++++++--- > 8 files changed, 396 insertions(+), 29 deletions(-) > [...] > diff --git a/mm/mmap.c b/mm/mmap.c > index d7e120ad5825..e777da0132f6 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c [...] > @@ -680,6 +744,56 @@ static void __vma_link_file(struct vm_area_struct *vma) > } > } > > +/* > + * vma_mas_store() - Store a VMA in the maple tree. > + * @vma: The vm_area_struct > + * @mas: The maple state > + * > + * Efficient way to store a VMA in the maple tree when the @mas has already > + * walked to the correct location. > + * > + * Note: the end address is inclusive in the maple tree. > + */ > +inline void vma_mas_store(struct vm_area_struct *vma, struct ma_state *mas) > +{ > + trace_vma_store(mas->tree, vma); > + mas_set_range(mas, vma->vm_start, vma->vm_end - 1); > + mas_store_prealloc(mas, vma); > +} > + > +/* > + * vma_mas_remove() - Remove a VMA from the maple tree. > + * @vma: The vm_area_struct > + * @mas: The maple state > + * > + * Efficient way to remove a VMA from the maple tree when the @mas has already > + * been established and points to the correct location. > + * Note: the end address is inclusive in the maple tree. > + */ > +static inline void vma_mas_remove(struct vm_area_struct *vma, struct ma_state *mas) > +{ > + trace_vma_mas_szero(mas->tree, vma->vm_start, vma->vm_end - 1); > + mas->index = vma->vm_start; > + mas->last = vma->vm_end - 1; > + mas_store_prealloc(mas, NULL); > +} Above two functions were defined in internal.h in v8[1], but moved to mmap.c in this version. As mmap.c is compiled when CONFIG_MMU, build fails when the config is not set as below: .../mm/nommu.c: In function 'add_vma_to_mm': .../mm/nommu.c:575:2: error: implicit declaration of function 'vma_mas_store'; did you mean 'mas_store'? [-Werror=implicit-function-declaration] 575 | vma_mas_store(vma, &mas); | ^~~~~~~~~~~~~ | mas_store .../mm/nommu.c: In function 'delete_vma_from_mm': .../mm/nommu.c:599:2: error: implicit declaration of function 'vma_mas_remove' [-Werror=implicit-function-declaration] 599 | vma_mas_remove(vma, &mas); | ^~~~~~~~~~~~~~ Was there a reason to move these definitions? I confirmed moving the definition back to internal.h fixes this issue, but I'm unsure if that's the right solution. [1] https://lore.kernel.org/linux-mm/20220426150616.3937571-10-Liam.Howlett@oracle.com/ Thanks, SJ [...]