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 3BE85C43334 for ; Tue, 21 Jun 2022 21:13:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C14D8E0053; Tue, 21 Jun 2022 17:13:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 949C88E004B; Tue, 21 Jun 2022 17:13:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C3C48E0053; Tue, 21 Jun 2022 17:13:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 684B88E004B for ; Tue, 21 Jun 2022 17:13:36 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 445313511F for ; Tue, 21 Jun 2022 21:13:36 +0000 (UTC) X-FDA: 79603494432.12.13D268E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id D69C7C000D for ; Tue, 21 Jun 2022 21:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655846015; 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=p2ZyEjz/X1rrSRyY38O7XcVSbvfO1EBTiv9ehORRiiM=; b=amlFTC61cxaMpJAJOk7D9m9lnlqVWMxEAopTgTXzBpiliSYNg3e53VVgIaN8Pr2Io3QMzU CoJ2dAPtBXM36VqI/3/NblxCQnfnJumBNMx1tvsJvWYuwq0J7fXuZAgaKlGQpnIJtUcvtc ExI1L3NnvSoBHRS0gJIFtpjpd/X6RNA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-318-zrp46WW6MxS0iZjTs1vnWQ-1; Tue, 21 Jun 2022 17:13:34 -0400 X-MC-Unique: zrp46WW6MxS0iZjTs1vnWQ-1 Received: by mail-wm1-f72.google.com with SMTP id o2-20020a05600c510200b0039747b0216fso8999749wms.0 for ; Tue, 21 Jun 2022 14:13:34 -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=p2ZyEjz/X1rrSRyY38O7XcVSbvfO1EBTiv9ehORRiiM=; b=z59kjWg+Qei7QNyPe6mMcHfUDZG8tQYg2UR46RvCiJEu05c1zbEulNfjbKP3LAE3it NxRTJkpmmMwik1ljUGmMqgesdcoLYVjUJMiFYeMMK0030Tu1nHc/SysbxRCS0q1IStSS giqk0eBGnZV/R3cOhu2tiRn0jYln3L397tJzBQEUge3eem4lMskiF5RAcMT0HRXN2idQ PjUNSNRBFx4JLsb0BZbwSdF4a+JQHp7+HoyD4IlDd8TWSc8HNQMMxxC//GFwQxx++ILp gDoY8ZKSee07Gh5+A6ri5pm8qYRaEGuGHnQyXFSj8jE03NRob1InsrOEvI/z0LV/wpNR hnDQ== X-Gm-Message-State: AOAM532cWlRb4JU79sz+2Ed6vvRQHIAbiM3MPD/47JlwRneLLrySJyTP WpZKd6PiOgUR0HS0m4WBQMf/qNTfPGS1QjmRYXHu0Nxg/a4GjPyYoQQ16m9y7Z2kmcdh+byKggZ 24kJFlnnabVM= X-Received: by 2002:a05:600c:583:b0:39c:3637:b9f with SMTP id o3-20020a05600c058300b0039c36370b9fmr41890253wmd.79.1655846013140; Tue, 21 Jun 2022 14:13:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOeKyTVNcHGO8XIrslQyDEH0amifKDQHgWoO8MHT556YVEyS90MtqIiT8yBXXL779Lr60M4g== X-Received: by 2002:a05:600c:583:b0:39c:3637:b9f with SMTP id o3-20020a05600c058300b0039c36370b9fmr41890234wmd.79.1655846012925; Tue, 21 Jun 2022 14:13:32 -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 64-20020a1c1943000000b0039c6390730bsm22251249wmz.29.2022.06.21.14.13.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Jun 2022 14:13:32 -0700 (PDT) Message-ID: <5d3bf51b-3bba-3bd4-db1f-1c0a3930a1e4@redhat.com> Date: Tue, 21 Jun 2022 23:13:31 +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 10/69] mmap: use the VMA iterator in count_vma_pages_range() 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-11-Liam.Howlett@oracle.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220621204632.3370049-11-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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655846015; 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=p2ZyEjz/X1rrSRyY38O7XcVSbvfO1EBTiv9ehORRiiM=; b=SeKnBDNdA8CtvX94I/JLbYbSMFGlg9UJ63Te++jvQuHsYye+OVrDGB1jOT9U4vWHjFms5s tokF4cPctsW6LAtgmyzfZ5j6AwZSL9oqxuoMfrrTw9aYSPdHrQ3FytFlZ/IOluKGyiAHtV Wgcv/xVtVxrmYGIMHAWQT10zfC7YDUM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655846015; a=rsa-sha256; cv=none; b=7tjOJuxXbD0RsPL3yPB5jzS9KoqbUm2GnHkUhurYenzkFCxYlr070kJjcLKnfGrPg9zJv4 02kAMtZmysieJCnp3gW5r2/GiA0v0tm7pJgZqw1iQlVxcmTm5nvLNoz3UpD1Jzylf9BuTu 5mIOXwl6uAlNt061sgsd/aXBMAbWBzU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=amlFTC61; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf10.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=amlFTC61; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf10.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com X-Rspamd-Server: rspam12 X-Rspam-User: X-Stat-Signature: akad46truwko9pce5ez8cjorryj3inow X-Rspamd-Queue-Id: D69C7C000D X-HE-Tag: 1655846015-961751 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: "Matthew Wilcox (Oracle)" > > This simplifies the implementation and is faster than using the linked > list. > > Link: https://lkml.kernel.org/r/20220504010716.661115-12-Liam.Howlett@oracle.com > Signed-off-by: Matthew Wilcox (Oracle) > Signed-off-by: Liam R. Howlett > 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 | 24 +++++++----------------- > 1 file changed, 7 insertions(+), 17 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index 6be7833c781b..d7e6baa2f40f 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -675,29 +675,19 @@ munmap_vma_range(struct mm_struct *mm, unsigned long start, unsigned long len, > > return 0; > } > + > static unsigned long count_vma_pages_range(struct mm_struct *mm, > unsigned long addr, unsigned long end) > { > - unsigned long nr_pages = 0; > + VMA_ITERATOR(vmi, mm, addr); > struct vm_area_struct *vma; > + unsigned long nr_pages = 0; > > - /* Find first overlapping mapping */ > - vma = find_vma_intersection(mm, addr, end); > - if (!vma) > - return 0; > - > - nr_pages = (min(end, vma->vm_end) - > - max(addr, vma->vm_start)) >> PAGE_SHIFT; > - > - /* Iterate over the rest of the overlaps */ > - for (vma = vma->vm_next; vma; vma = vma->vm_next) { > - unsigned long overlap_len; > - > - if (vma->vm_start > end) > - break; > + for_each_vma_range(vmi, vma, end) { > + unsigned long vm_start = max(addr, vma->vm_start); > + unsigned long vm_end = min(end, vma->vm_end); I thought using max_t and min_t was the latest advisory. I might be wrong and simply kept doing it that way ;) > > - overlap_len = min(end, vma->vm_end) - vma->vm_start; > - nr_pages += overlap_len >> PAGE_SHIFT; > + nr_pages += (vm_end - vm_start) / PAGE_SIZE; PHYS_PFN(vm_end - vm_start) > } > > return nr_pages; Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb