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 D3B82C433FE for ; Wed, 19 Jan 2022 17:48:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 251386B0072; Wed, 19 Jan 2022 12:48:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2009F6B0073; Wed, 19 Jan 2022 12:48:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C8DE6B0074; Wed, 19 Jan 2022 12:48:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay029.a.hostedemail.com [64.99.140.29]) by kanga.kvack.org (Postfix) with ESMTP id F19996B0072 for ; Wed, 19 Jan 2022 12:48:32 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4195C2103E for ; Wed, 19 Jan 2022 17:48:32 +0000 (UTC) X-FDA: 79047771264.03.D049EC7 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf31.hostedemail.com (Postfix) with ESMTP id 958162006E for ; Wed, 19 Jan 2022 17:48:31 +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-out2.suse.de (Postfix) with ESMTPS id 2DE451F3C0; Wed, 19 Jan 2022 17:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1642614510; 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=Rja0rd1IUylof69oFT2eERzDlpMcUeihM+dvReC85pw=; b=AR+ECaI9bU5lZlO/2/M6SbhaeDsdJdwFrikCyjbZSsU9QyCuP2enGfUaU9I9YXfoQAsOHl lXox5/Qful2IiLo8OvH0XKtKCfd2rSFDDcN0qewE9N/5+NenxF/L36qqU913eoCeMaqBjU 3un2Bz4aFPlEaeO49mwS3i6u/SMhDYE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1642614510; 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=Rja0rd1IUylof69oFT2eERzDlpMcUeihM+dvReC85pw=; b=zlHTiNkoibAlygfENeY3giyX8P5HUH78MyMn9COLEv7Py3wKtMDjRnjM/7SbmJsCoLkNlm NgpMRnPZcflCSbDg== 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 C501913E15; Wed, 19 Jan 2022 17:48:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EArILe1O6GGTSgAAMHmgww (envelope-from ); Wed, 19 Jan 2022 17:48:29 +0000 Message-ID: Date: Wed, 19 Jan 2022 18:48:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v4 51/66] mm/khugepaged: Use maple tree iterators instead of vma linked list 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-52-Liam.Howlett@oracle.com> From: Vlastimil Babka In-Reply-To: <20211201142918.921493-52-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 958162006E X-Stat-Signature: xfxmrng19zrnrfwgke3efg5bchjzn35t Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=AR+ECaI9; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=zlHTiNko; dmarc=none; spf=pass (imf31.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Rspamd-Server: rspam08 X-HE-Tag: 1642614511-667083 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" Ah, got tired of copy/pasting for a number of patches, I see :) > Signed-off-by: Matthew Wilcox (Oracle) > Signed-off-by: Liam R. Howlett > --- > mm/huge_memory.c | 4 ++-- > mm/khugepaged.c | 9 ++++++--- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index e5483347291c..f0f4ff5239ef 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -2270,11 +2270,11 @@ void vma_adjust_trans_huge(struct vm_area_struct *vma, > split_huge_pmd_if_needed(vma, end); > > /* > - * If we're also updating the vma->vm_next->vm_start, > + * If we're also updating the vma_next(vma)->vm_start, vma_next() takes an iterator, not vma, though. > * check if we need to split it. > */ > if (adjust_next > 0) { > - struct vm_area_struct *next = vma->vm_next; > + struct vm_area_struct *next = find_vma(vma->vm_mm, vma->vm_end); > unsigned long nstart = next->vm_start; > nstart += adjust_next; > split_huge_pmd_if_needed(next, nstart); > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 0ff7d72cdd1d..8f0633481791 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2083,6 +2083,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, > struct mm_struct *mm; > struct vm_area_struct *vma; > int progress = 0; > + unsigned long address; > > VM_BUG_ON(!pages); > lockdep_assert_held(&khugepaged_mm_lock); > @@ -2106,11 +2107,13 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, > vma = NULL; > if (unlikely(!mmap_read_trylock(mm))) > goto breakouterloop_mmap_lock; > - if (likely(!khugepaged_test_exit(mm))) > - vma = find_vma(mm, khugepaged_scan.address); > > progress++; > - for (; vma; vma = vma->vm_next) { > + if (unlikely(khugepaged_test_exit(mm))) > + goto breakouterloop; > + > + address = khugepaged_scan.address; > + mt_for_each(&mm->mm_mt, vma, address, ULONG_MAX) { Why not via mas_for_each()? > unsigned long hstart, hend; > > cond_resched();