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 2342BC433F5 for ; Thu, 20 Jan 2022 12:16:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 820936B009D; Thu, 20 Jan 2022 07:16:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D08B6B009E; Thu, 20 Jan 2022 07:16:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64A7B6B00A0; Thu, 20 Jan 2022 07:16:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay033.a.hostedemail.com [64.99.140.33]) by kanga.kvack.org (Postfix) with ESMTP id 52F4F6B009D for ; Thu, 20 Jan 2022 07:16:22 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0DE26788 for ; Thu, 20 Jan 2022 12:16:22 +0000 (UTC) X-FDA: 79050563004.03.8B293EB Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf05.hostedemail.com (Postfix) with ESMTP id 32CB810000C for ; Thu, 20 Jan 2022 12:16:21 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0FF182170E; Thu, 20 Jan 2022 12:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1642680980; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KxjCyPB/TvQhq50NprkltYrk8TlOycec4dlTnsG9qZA=; b=3bjfKDfvTfOlzkQJwrpwAEUvihELw0gZRTvUB6I23XJKhAXD4mvd2hiDua9ewpcYwTtWM9 o6rQhsWN0rywimL7gzTiM/GXxKsTXtol0nZbtRx1vNmqt3PcWG2DMUb2en7KPGaQzISEAo F4phEP5uKwWJDD7XmYcJGwCUEJGS2OA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1642680980; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KxjCyPB/TvQhq50NprkltYrk8TlOycec4dlTnsG9qZA=; b=j5evB57e9KE/c3hUml0HBRtDbIzfe9UP68bVpR78IE9oBWnAmEBSXbC+AML0tYWh9Dc5Jj p30R0xWifY46M+Bw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9909413B51; Thu, 20 Jan 2022 12:16:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id G9aoJJNS6WGlWQAAMHmgww (envelope-from ); Thu, 20 Jan 2022 12:16:19 +0000 Message-ID: <75a30665-9884-ac6d-c526-e7deb1e4e879@suse.cz> Date: Thu, 20 Jan 2022 13:16:19 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: Liam Howlett , "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Cc: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , Laurent Dufour , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Rik van Riel , Peter Zijlstra , Michel Lespinasse , Jerome Glisse , Minchan Kim , Joel Fernandes , Rom Lemarchand References: <20211201142918.921493-1-Liam.Howlett@oracle.com> <20211201142918.921493-57-Liam.Howlett@oracle.com> From: Vlastimil Babka Subject: Re: [PATCH v4 56/66] mm/mlock: Use maple tree iterators instead of vma linked list In-Reply-To: <20211201142918.921493-57-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: zf7bi6bbf6ueykogyb4jwd54hc1aw6q6 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=3bjfKDfv; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=j5evB57e; dmarc=none; spf=pass (imf05.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 32CB810000C X-HE-Tag: 1642680981-179125 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: On 12/1/21 15:30, Liam Howlett wrote: > From: "Liam R. Howlett" > > Signed-off-by: Liam R. Howlett > --- > mm/mlock.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/mm/mlock.c b/mm/mlock.c > index e263d62ae2d0..feb691eb4c64 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -563,6 +563,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, > unsigned long nstart, end, tmp; > struct vm_area_struct *vma, *prev; > int error; > + MA_STATE(mas, ¤t->mm->mm_mt, start, start); > > VM_BUG_ON(offset_in_page(start)); > VM_BUG_ON(len != PAGE_ALIGN(len)); > @@ -571,11 +572,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, > return -EINVAL; > if (end == start) > return 0; > - vma = find_vma(current->mm, start); > - if (!vma || vma->vm_start > start) > + vma = mas_walk(&mas); > + if (!vma) > return -ENOMEM; > > - prev = vma->vm_prev; > + prev = mas_prev(&mas, 0); Could be only done as an 'else' of the 'if' below? > if (start > vma->vm_start) > prev = vma; > > @@ -597,7 +598,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, > if (nstart >= end) > break; > > - vma = prev->vm_next; > + vma = find_vma(prev->vm_mm, prev->vm_end); > if (!vma || vma->vm_start != nstart) { > error = -ENOMEM; > break; > @@ -618,15 +619,12 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm, > { > struct vm_area_struct *vma; > unsigned long count = 0; > + MA_STATE(mas, &mm->mm_mt, start, start); > > if (mm == NULL) > mm = current->mm; > > - vma = find_vma(mm, start); > - if (vma == NULL) > - return 0; > - > - for (; vma ; vma = vma->vm_next) { > + mas_for_each(&mas, vma, start + len) { Could be for_each_vma_range()? > if (start >= vma->vm_end) > continue; Unnecessary? (even before this patch, I think?) > if (start + len <= vma->vm_start) Unnecessary after your patch? > @@ -741,6 +739,7 @@ static int apply_mlockall_flags(int flags) > { > struct vm_area_struct *vma, *prev = NULL; > vm_flags_t to_add = 0; > + unsigned long addr = 0; > > current->mm->def_flags &= VM_LOCKED_CLEAR_MASK; > if (flags & MCL_FUTURE) { > @@ -759,7 +758,7 @@ static int apply_mlockall_flags(int flags) > to_add |= VM_LOCKONFAULT; > } > > - for (vma = current->mm->mmap; vma ; vma = prev->vm_next) { > + mt_for_each(¤t->mm->mm_mt, vma, addr, ULONG_MAX) { > vm_flags_t newflags; > > newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK;