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 902C1C433EF for ; Tue, 21 Jun 2022 21:17:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 09AFA8E0054; Tue, 21 Jun 2022 17:17:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 04AB88E004B; Tue, 21 Jun 2022 17:17:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2E188E0054; Tue, 21 Jun 2022 17:17:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D0A748E004B for ; Tue, 21 Jun 2022 17:17:08 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9ABC833A6B for ; Tue, 21 Jun 2022 21:17:08 +0000 (UTC) X-FDA: 79603503336.14.25C1591 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 275DC1800A0 for ; Tue, 21 Jun 2022 21:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655846227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ncxGKHn2fXjYFFgqRt4Fpjb6P4qj7hYEpB/9I/rKxUI=; b=W1GxWaxnrRr0iXsZd1UUmm+ixv+nNEjLqwK0Vv3CxwcRcYGFb/+XcQJrsA7h2hCFIwMhnw HXXHqRA1BMOeEs9OkDu6bQqyMXPZK+8ayitksPv2pOlFRNrHx2/zkJn0UAAnqxm+JTmGMy WRJ2htEryDWOn/XSOcjzdXQd1xvWzQE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-TkB4HY8YO-CgCYAlWuZrOA-1; Tue, 21 Jun 2022 17:17:06 -0400 X-MC-Unique: TkB4HY8YO-CgCYAlWuZrOA-1 Received: by mail-wm1-f69.google.com with SMTP id k34-20020a05600c1ca200b0039c7db490c8so6761394wms.1 for ; Tue, 21 Jun 2022 14:17:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=ncxGKHn2fXjYFFgqRt4Fpjb6P4qj7hYEpB/9I/rKxUI=; b=vMh9k7m8X6SKQDuJsRqlCo+A7qQMIWCWrkuxpWuaNQYIUBhNWJZ18+rQN3FUgUobWS PKpnt34KzAj1xiexmkDahpOopU4YYPb7IRBkGLn6xxDzhgQQDzrHeu1Hj1m+kRZjmd1m xISTDgGo5JsWGtmyXkt8806EY4ppcyW+dqWSHAURzrb6UVXdIoPvkxbh+IrUocZU9s6R wRL58Us84gl/ODzoVZ3xF9IawqYI2EBs+4Bmj7hrbm5Hp1LF1ZcVOnmZjEpWCFQ/leA+ HjL/74SO4mB303puFP6C6EbLwPkuDMFrYkfit7n21S7EyZqHGquoQ/bGxlkuFoFpXnOw h3sg== X-Gm-Message-State: AJIora8H0m2m4q5YLnqp6h/UyCdFgc+HrFra5datxTRLIiTQU3MKj/Zr BU9Wwxku7XdmXRR1ABpqRGBMv/YqsEz92CTmPF9WKcgMxmTR/Yc1GYByjeFR1yzmPjEfSIH3neu 3fG8tDFQPz3Q= X-Received: by 2002:adf:fb0e:0:b0:21a:34a2:5ca9 with SMTP id c14-20020adffb0e000000b0021a34a25ca9mr28692559wrr.472.1655846225153; Tue, 21 Jun 2022 14:17:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s7mvnYEndH0NNtzPZ+cRT9yucSmwHDvgIekUsuB3uVzNJ+k0JDAj46iI0F/imm2A0LaiJAkg== X-Received: by 2002:adf:fb0e:0:b0:21a:34a2:5ca9 with SMTP id c14-20020adffb0e000000b0021a34a25ca9mr28692535wrr.472.1655846224902; Tue, 21 Jun 2022 14:17:04 -0700 (PDT) Received: from ?IPV6:2003:cb:c705:bc00:a63c:7e37:6061:1706? (p200300cbc705bc00a63c7e3760611706.dip0.t-ipconnect.de. [2003:cb:c705:bc00:a63c:7e37:6061:1706]) by smtp.gmail.com with ESMTPSA id j38-20020a05600c1c2600b0039c7f790f6asm22892637wms.30.2022.06.21.14.17.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Jun 2022 14:17:04 -0700 (PDT) Message-ID: <8e4d37dc-722c-6b9d-b1fd-84df4a0076bb@redhat.com> Date: Tue, 21 Jun 2022 23:17:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v10 12/69] mm/mmap: use the maple tree for find_vma_prev() instead of the rbtree To: Liam Howlett , "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , "damon @ lists . linux . dev" , SeongJae Park References: <20220621204632.3370049-1-Liam.Howlett@oracle.com> <20220621204632.3370049-13-Liam.Howlett@oracle.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220621204632.3370049-13-Liam.Howlett@oracle.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655846228; a=rsa-sha256; cv=none; b=sToKkBIAd9v/37197Q4VgUMOq+T2GjF+FJIjsx30w4KkN0I21YeTEpa82c0IQPWbEy0KXY AH4yviLWUt73J2FB0iQRZ8E3yICpYvZpReTEW3NMylWv6Rol2muG7xNeoYetUl6DKxEBoQ Gv3SAlA/eeqWN26szuuWJPCO011RKLI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W1GxWaxn; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf16.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655846228; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ncxGKHn2fXjYFFgqRt4Fpjb6P4qj7hYEpB/9I/rKxUI=; b=7q3gPHS/bzFqnbdAxrVY5UEY1f5aWd/Er1Vyq9pEPhQLKL5tvc5QxeOWrRFBRZRIpEHKtS 8E3FQobCudWf3D1txW99zZo8+1ykgNKPE3kKlEtG65Dt0uvmMYCuR46jPuwoH06ZdYb9Le YgCmg4lW4V/KGdbOWahUZeYt0CkRamE= X-Rspamd-Queue-Id: 275DC1800A0 X-Rspam-User: Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W1GxWaxn; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf16.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=david@redhat.com X-Rspamd-Server: rspam06 X-Stat-Signature: n6ij49t7aiwx7hy3yph73xn1a4hfkyni X-HE-Tag: 1655846227-774968 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 21.06.22 22:46, Liam Howlett wrote: > From: "Liam R. Howlett" > > Use the maple tree's advanced API and a maple state to walk the tree for > the entry at the address of the next vma, then use the maple state to walk > back one entry to find the previous entry. > > Add kernel documentation comments for this API. > > Link: https://lkml.kernel.org/r/20220504010716.661115-14-Liam.Howlett@oracle.com > Signed-off-by: Liam R. Howlett > Signed-off-by: Matthew Wilcox (Oracle) > Acked-by: Vlastimil Babka > Cc: Catalin Marinas > Cc: David Howells > Cc: SeongJae Park > Cc: Will Deacon > Cc: Davidlohr Bueso > Signed-off-by: Andrew Morton > --- > mm/mmap.c | 27 +++++++++++++++++---------- > 1 file changed, 17 insertions(+), 10 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index fdb61252448f..08845a0317bf 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -2512,23 +2512,30 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) > } > EXPORT_SYMBOL(find_vma); > > -/* > - * Same as find_vma, but also return a pointer to the previous VMA in *pprev. > +/** > + * find_vma_prev() - Find the VMA for a given address, or the next vma and > + * set %pprev to the previous VMA, if any. > + * @mm: The mm_struct to check > + * @addr: The address > + * @pprev: The pointer to set to the previous VMA > + * > + * Note that RCU lock is missing here since the external mmap_lock() is used > + * instead. Can we assert that, please? > + * > + * Returns: The VMA associated with @addr, or the next vma. > + * May return %NULL in the case of no vma at addr or above. Nit: Inconsistent use of VMA vs. vma. > */ > struct vm_area_struct * > find_vma_prev(struct mm_struct *mm, unsigned long addr, > struct vm_area_struct **pprev) > { > struct vm_area_struct *vma; > + MA_STATE(mas, &mm->mm_mt, addr, addr); > > - vma = find_vma(mm, addr); > - if (vma) { > - *pprev = vma->vm_prev; > - } else { > - struct rb_node *rb_node = rb_last(&mm->mm_rb); > - > - *pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL; > - } > + vma = mas_walk(&mas); > + *pprev = mas_prev(&mas, 0); > + if (!vma) > + vma = mas_next(&mas, ULONG_MAX); > return vma; > } > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb