From patchwork Wed Jun 13 01:10:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 9243 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id EBC1D23E49 for ; Wed, 13 Jun 2012 01:11:19 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id A5A97A1818F for ; Wed, 13 Jun 2012 01:11:19 +0000 (UTC) Received: by yhpp61 with SMTP id p61so147762yhp.11 for ; Tue, 12 Jun 2012 18:11:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=JHSUDgmqarec+tekDK94z3tKVLQj/wSWTTRPnmKBOsA=; b=L6VTyfy8LW480wdnKmj65QP3xFGUnGBLnCKYohYaUfzEudcyukIe/sJuAqIFuUjqPn txV7j+lA2wOFDAt5A6uTLgK3t2u/upe+DEf6A5bVWLfLtJxxZ1SvkFE6/og6KxMR9HZg MP7FA5FzmthPAQcqirYXfGm+AMrHwan+wsvUn9Y+5UiARjud3uz4OaLrDWkBOUVWkpXX vEf2WgvXCDK/bC3sOxeoQs1yQ/PoGzZ3qJmwlS8+YvVTxaLs3+ReacJ8GMGxTKaBVG5D GQ8R2M7WItH0D6vgv7KYdOZHtCaTkyMvtTnUJEtPHdbubDEtoCn8JQRlmPfGUKyh5wSi /yrQ== Received: by 10.50.46.232 with SMTP id y8mr9547715igm.57.1339549878816; Tue, 12 Jun 2012 18:11:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp198989ibb; Tue, 12 Jun 2012 18:11:18 -0700 (PDT) Received: by 10.68.225.135 with SMTP id rk7mr44373058pbc.38.1339549877405; Tue, 12 Jun 2012 18:11:17 -0700 (PDT) Received: from e33.co.us.ibm.com (e33.co.us.ibm.com. [32.97.110.151]) by mx.google.com with ESMTPS id vm6si1825625pbc.356.2012.06.12.18.11.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 18:11:17 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.151 as permitted sender) client-ip=32.97.110.151; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.151 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jun 2012 19:11:16 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Jun 2012 19:11:13 -0600 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 2F2213E40051; Wed, 13 Jun 2012 01:11:12 +0000 (WET) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5D1B9Rv217924; Tue, 12 Jun 2012 19:11:10 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5D1B7Od024832; Tue, 12 Jun 2012 19:11:09 -0600 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5D1B7WI024761; Tue, 12 Jun 2012 19:11:07 -0600 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 51988C061F; Tue, 12 Jun 2012 18:11:06 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , Andrew Morton , Android Kernel Team , Robert Love , Mel Gorman , Hugh Dickins , Dave Hansen , Rik van Riel , Dmitry Adamushko , Dave Chinner , Neil Brown , Andrea Righi , "Aneesh Kumar K.V" , Taras Glek , Mike Hommey , Jan Kara , KOSAKI Motohiro Subject: [PATCH 1/6] [RFC] Interval tree implementation Date: Tue, 12 Jun 2012 18:10:56 -0700 Message-Id: <1339549862-653-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1339549862-653-1-git-send-email-john.stultz@linaro.org> References: <1339549862-653-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061301-2398-0000-0000-00000772CD62 X-Gm-Message-State: ALoCoQl6U8y78mf5zye6KqS3VjnB/tNAMUFUahvAV8PIKRjwuRcNCUlt8x2YYFZruSkkQXJYQxou After Andrew suggested something like his mumbletree idea to better store a list of intervals, I worked on a few different approaches, and this is what I've finally managed to get working. The idea of storing intervals in a tree is nice, but has a number of complications. When adding an interval, its possible that a large interval will consume and merge a number of smaller intervals. When removing a interval, its possible you may end up splitting an existing interval, causing one interval to become two. This makes it very difficult to provide generic list_head like behavior, as the parent structures would need to be duplicated and removed, and that has lots of memory ownership issues. So, this is a much simplified and more list_head like implementation. You can add a node to a tree, or remove a node to a tree, but the generic implementation doesn't do the merging or splitting for you. But it does provide helpers to find overlapping and adjacent intervals. Andrew also really wanted this interval-tree implementation to be resuable so we don't duplicate the file locking logic. I'm not totally convinced that the requirements between the volatile intervals and file locking are really equivelent, but this reduced impelementation may make it possible. Changelog: v2: * Reworked code to use an rbtree instead of splaying v3: * Added range_tree_next_in_range() to avoid having to start lookups from the root every time. * Fixed some comments and return NULL instead of 0, as suggested by Aneesh Kumar K.V v6: * Fixed range_tree_in_range() so that it finds the earliest range, rather then the first. This allows the next_in_range() function to properly cover all the ranges in the tree. * Minor clenaups to simplify some of the functions v7: * Changed terminology from rangetree to intervaltree as suggested by Jan Kara CC: Andrew Morton CC: Android Kernel Team CC: Robert Love CC: Mel Gorman CC: Hugh Dickins CC: Dave Hansen CC: Rik van Riel CC: Dmitry Adamushko CC: Dave Chinner CC: Neil Brown CC: Andrea Righi CC: Aneesh Kumar K.V CC: Taras Glek CC: Mike Hommey CC: Jan Kara CC: KOSAKI Motohiro Signed-off-by: John Stultz --- include/linux/intervaltree.h | 55 +++++++++++++++++++ lib/Makefile | 2 +- lib/intervaltree.c | 119 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 175 insertions(+), 1 deletions(-) create mode 100644 include/linux/intervaltree.h create mode 100644 lib/intervaltree.c diff --git a/include/linux/intervaltree.h b/include/linux/intervaltree.h new file mode 100644 index 0000000..cfaa174 --- /dev/null +++ b/include/linux/intervaltree.h @@ -0,0 +1,55 @@ +#ifndef _LINUX_INTERVALTREE_H +#define _LINUX_INTERVALTREE_H + +#include +#include + +struct interval_tree_node { + struct rb_node rb; + u64 start; + u64 end; +}; + +struct interval_tree_root { + struct rb_root head; +}; + +static inline void interval_tree_init(struct interval_tree_root *root) +{ + root->head = RB_ROOT; +} + +static inline void interval_tree_node_init(struct interval_tree_node *node) +{ + rb_init_node(&node->rb); + node->start = 0; + node->end = 0; +} + +static inline int interval_tree_empty(struct interval_tree_root *root) +{ + return RB_EMPTY_ROOT(&root->head); +} + +static inline +struct interval_tree_node *interval_tree_root_node( + struct interval_tree_root *root) +{ + struct interval_tree_node *ret; + ret = container_of(root->head.rb_node, struct interval_tree_node, rb); + return ret; +} + +extern struct interval_tree_node *interval_tree_in_interval( + struct interval_tree_root *root, + u64 start, u64 end); +extern struct interval_tree_node *interval_tree_next_in_interval( + struct interval_tree_node *node, + u64 start, u64 end); +extern void interval_tree_add(struct interval_tree_root *root, + struct interval_tree_node *node); +extern void interval_tree_remove(struct interval_tree_root *root, + struct interval_tree_node *node); +#endif + + diff --git a/lib/Makefile b/lib/Makefile index 8c31a0c..2bbad25 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -12,7 +12,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ idr.o int_sqrt.o extable.o prio_tree.o \ sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \ proportions.o prio_heap.o ratelimit.o show_mem.o \ - is_single_threaded.o plist.o decompress.o + is_single_threaded.o plist.o decompress.o intervaltree.o lib-$(CONFIG_MMU) += ioremap.o lib-$(CONFIG_SMP) += cpumask.o diff --git a/lib/intervaltree.c b/lib/intervaltree.c new file mode 100644 index 0000000..47c52e0 --- /dev/null +++ b/lib/intervaltree.c @@ -0,0 +1,119 @@ +#include +#include +#include + +/* This code implements a naive interval tree, which stores a series of + * non-intersecting intervals. + * More complex interval trees can be read about here: + * http://en.wikipedia.org/wiki/Interval_tree + */ + + +/** + * interval_tree_in_interval - Returns the first node that intersects with the + * given interval + * @root: interval_tree root + * @start: interval start + * @end: interval end + * + */ +struct interval_tree_node *interval_tree_in_interval( + struct interval_tree_root *root, + u64 start, u64 end) +{ + struct rb_node *p = root->head.rb_node; + struct interval_tree_node *candidate, *match = NULL; + + while (p) { + candidate = rb_entry(p, struct interval_tree_node, rb); + if (end < candidate->start) + p = p->rb_left; + else if (start > candidate->end) + p = p->rb_right; + else { + /* We found one, but try to find an earlier match */ + match = candidate; + p = p->rb_left; + } + } + + return match; +} + + +/** + * interval_tree_next_in_interval - Return the next interval in a intervaltree + * thatintersects with a specified interval. + * @root: interval_tree root + * @start: interval start + * @end: interval end + * + */ +struct interval_tree_node *interval_tree_next_in_interval( + struct interval_tree_node *node, + u64 start, u64 end) +{ + struct rb_node *next; + struct interval_tree_node *candidate; + if (!node) + return NULL; + next = rb_next(&node->rb); + if (!next) + return NULL; + + candidate = container_of(next, struct interval_tree_node, rb); + + if ((candidate->start > end) || (candidate->end < start)) + return NULL; + + return candidate; +} + +/** + * interval_tree_add - Add a node to a interval tree + * @root: interval tree to be added to + * @node: interval_tree_node to be added + * + * Adds a node to the interval tree. Added interval should not intersect with + * existing intervals in the tree. + */ +void interval_tree_add(struct interval_tree_root *root, + struct interval_tree_node *node) +{ + struct rb_node **p = &root->head.rb_node; + struct rb_node *parent = NULL; + struct interval_tree_node *ptr; + + WARN_ON_ONCE(!RB_EMPTY_NODE(&node->rb)); + + /* XXX might want to conditionalize this on debugging checks */ + WARN_ON_ONCE(!!interval_tree_in_interval(root, node->start, node->end)); + + while (*p) { + parent = *p; + ptr = rb_entry(parent, struct interval_tree_node, rb); + if (node->start < ptr->start) + p = &(*p)->rb_left; + else + p = &(*p)->rb_right; + } + rb_link_node(&node->rb, parent, p); + rb_insert_color(&node->rb, &root->head); +} + + +/** + * interval_tree_remove: Removes a given node from the tree + * @root: root of tree + * @node: Node to be removed + * + * Removes a node and splays the tree + */ +void interval_tree_remove(struct interval_tree_root *root, + struct interval_tree_node *node) +{ + WARN_ON_ONCE(RB_EMPTY_NODE(&node->rb)); + + rb_erase(&node->rb, &root->head); + RB_CLEAR_NODE(&node->rb); +}