From patchwork Thu Oct 3 20:18:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 11173703 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE1D11599 for ; Fri, 4 Oct 2019 07:39:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6B5F2245D for ; Fri, 4 Oct 2019 07:39:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6B5F2245D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A15D26EAD8; Fri, 4 Oct 2019 07:38:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 758BD6EA7F for ; Thu, 3 Oct 2019 20:20:31 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id EF8BDB06B; Thu, 3 Oct 2019 20:20:29 +0000 (UTC) From: Davidlohr Bueso To: akpm@linux-foundation.org Subject: [PATCH 08/11] mm: convert vma_interval_tree to half closed intervals Date: Thu, 3 Oct 2019 13:18:55 -0700 Message-Id: <20191003201858.11666-9-dave@stgolabs.net> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191003201858.11666-1-dave@stgolabs.net> References: <20191003201858.11666-1-dave@stgolabs.net> X-Mailman-Approved-At: Fri, 04 Oct 2019 07:38:50 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dave@stgolabs.net, Davidlohr Bueso , peterz@infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, walken@google.com, linux-rdma@vger.kernel.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The vma and anon vma interval tree really wants [a, b) intervals, not fully closed. As such convert it to use the new interval_tree_gen.h. Because of vma_last_pgoff(), the conversion is quite straightforward. Signed-off-by: Davidlohr Bueso --- include/linux/mm.h | 4 ++-- mm/interval_tree.c | 4 ++-- mm/memory.c | 2 +- mm/nommu.c | 2 +- mm/rmap.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 53f9784d917d..3bc06e1de40c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2249,7 +2249,7 @@ struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node, vma; vma = vma_interval_tree_iter_next(vma, start, last)) #define vma_interval_tree_foreach_stab(vma, root, start) \ - vma_interval_tree_foreach(vma, root, start, start) + vma_interval_tree_foreach(vma, root, start, start + 1) void anon_vma_interval_tree_insert(struct anon_vma_chain *node, struct rb_root_cached *root); @@ -2269,7 +2269,7 @@ void anon_vma_interval_tree_verify(struct anon_vma_chain *node); avc; avc = anon_vma_interval_tree_iter_next(avc, start, last)) #define anon_vma_interval_tree_foreach_stab(vma, root, start) \ - anon_vma_interval_tree_foreach(vma, root, start, start) + anon_vma_interval_tree_foreach(vma, root, start, start + 1) /* mmap.c */ extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin); diff --git a/mm/interval_tree.c b/mm/interval_tree.c index 11c75fb07584..1f8a7c122dd7 100644 --- a/mm/interval_tree.c +++ b/mm/interval_tree.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include static inline unsigned long vma_start_pgoff(struct vm_area_struct *v) { @@ -17,7 +17,7 @@ static inline unsigned long vma_start_pgoff(struct vm_area_struct *v) static inline unsigned long vma_last_pgoff(struct vm_area_struct *v) { - return v->vm_pgoff + vma_pages(v) - 1; + return v->vm_pgoff + vma_pages(v); } INTERVAL_TREE_DEFINE(struct vm_area_struct, shared.rb, diff --git a/mm/memory.c b/mm/memory.c index b1ca51a079f2..8f6978abf64a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2679,7 +2679,7 @@ void unmap_mapping_pages(struct address_space *mapping, pgoff_t start, details.check_mapping = even_cows ? NULL : mapping; details.first_index = start; - details.last_index = start + nr - 1; + details.last_index = start + nr; if (details.last_index < details.first_index) details.last_index = ULONG_MAX; diff --git a/mm/nommu.c b/mm/nommu.c index 99b7ec318824..284c2a948d79 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1793,7 +1793,7 @@ int nommu_shrink_inode_mappings(struct inode *inode, size_t size, size_t r_size, r_top; low = newsize >> PAGE_SHIFT; - high = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; + high = (size + PAGE_SIZE) >> PAGE_SHIFT; down_write(&nommu_region_sem); i_mmap_lock_read(inode->i_mapping); diff --git a/mm/rmap.c b/mm/rmap.c index d9a23bb773bf..48ca7d1a06b5 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1826,7 +1826,7 @@ static void rmap_walk_anon(struct page *page, struct rmap_walk_control *rwc, return; pgoff_start = page_to_pgoff(page); - pgoff_end = pgoff_start + hpage_nr_pages(page) - 1; + pgoff_end = pgoff_start + hpage_nr_pages(page); anon_vma_interval_tree_foreach(avc, &anon_vma->rb_root, pgoff_start, pgoff_end) { struct vm_area_struct *vma = avc->vma; @@ -1879,11 +1879,11 @@ static void rmap_walk_file(struct page *page, struct rmap_walk_control *rwc, return; pgoff_start = page_to_pgoff(page); - pgoff_end = pgoff_start + hpage_nr_pages(page) - 1; + pgoff_end = pgoff_start + hpage_nr_pages(page); if (!locked) i_mmap_lock_read(mapping); vma_interval_tree_foreach(vma, &mapping->i_mmap, - pgoff_start, pgoff_end) { + pgoff_start, pgoff_end) { unsigned long address = vma_address(page, vma); cond_resched();