The patch titled
radix-tree: gang set if tagged operation
has been added to the -mm tree. Its filename is
radix-tree-gang-set-if-tagged-operation.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: radix-tree: gang set if tagged operation
From: Nick Piggin <npiggin@xxxxxxx>
Add a "radix_tree_gang_set_if_tagged" operation, which takes a range of
indexes, and sets a given tag, if any of the specified tags were found to
be set. Used by the next patch to set an "fsync" bit on any dirty and
writeback pages.
Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/radix-tree.h | 1
lib/radix-tree.c | 107 +++++++++++++++++++++++++++++++++++
2 files changed, 108 insertions(+)
diff -puN include/linux/radix-tree.h~radix-tree-gang-set-if-tagged-operation include/linux/radix-tree.h
--- a/include/linux/radix-tree.h~radix-tree-gang-set-if-tagged-operation
+++ a/include/linux/radix-tree.h
@@ -183,6 +183,7 @@ unsigned int
radix_tree_gang_lookup_tag_slot(struct radix_tree_root *root, void ***results,
unsigned long first_index, unsigned int max_items,
unsigned int tag);
+int radix_tree_gang_tag_set_if_tagged(struct radix_tree_root *root, unsigned long first_index, unsigned long last_index, unsigned long ifset, unsigned long thentag);
int radix_tree_tagged(struct radix_tree_root *root, unsigned int tag);
static inline void radix_tree_preload_end(void)
diff -puN lib/radix-tree.c~radix-tree-gang-set-if-tagged-operation lib/radix-tree.c
--- a/lib/radix-tree.c~radix-tree-gang-set-if-tagged-operation
+++ a/lib/radix-tree.c
@@ -629,6 +629,113 @@ int radix_tree_tag_get(struct radix_tree
EXPORT_SYMBOL(radix_tree_tag_get);
#endif
+int node_tag_set_if_tagged(struct radix_tree_node *node, unsigned int height, unsigned long first_index, unsigned long last_index, unsigned long ifset, unsigned long thentag)
+{
+ unsigned long first, last;
+ int offset_start, offset_end, i;
+ int ret = 0;
+ unsigned int shift = (height - 1) * RADIX_TREE_MAP_SHIFT;
+ unsigned int size = RADIX_TREE_MAP_SIZE << shift;
+
+ first = first_index;
+ last = min(last_index, ((first + size) & ~(size-1)) - 1);
+
+ offset_start = (first_index >> shift) & RADIX_TREE_MAP_MASK;
+ offset_end = (last_index >> shift) & RADIX_TREE_MAP_MASK;
+ for (i = offset_start; i <= offset_end; i++) {
+
+ if (height > 1) {
+ struct radix_tree_node *slot;
+
+ slot = node->slots[i];
+ if (!slot)
+ goto notset;
+
+ if (node_tag_set_if_tagged(slot, height - 1,
+ first, last,
+ ifset, thentag)) {
+ if (ifset == 0x1)
+ BUG_ON(!tag_get(node, 0, i));
+ if (ifset == 0x2)
+ BUG_ON(!tag_get(node, 1, i));
+ if (ifset == 0x2)
+ BUG_ON(!tag_get(node, 0, i) &&
+ !tag_get(node, 1, i));
+ if (thentag & 0x4) {
+ if (!tag_get(node, 2, i))
+ tag_set(node, 2, i);
+ }
+ ret = 1;
+ }
+notset:
+ first = last+1;
+ last = min(last_index, first + size - 1);
+
+ } else {
+ if (ifset & 0x1) {
+ if (tag_get(node, 0, i))
+ goto isset;
+ }
+ if (ifset & 0x2) {
+ if (tag_get(node, 1, i))
+ goto isset;
+ }
+ continue;
+isset:
+ if (thentag & 0x4) {
+ if (!tag_get(node, 2, i))
+ tag_set(node, 2, i);
+ }
+ ret = 1;
+ }
+ }
+
+ return ret;
+}
+
+int radix_tree_gang_tag_set_if_tagged(struct radix_tree_root *root, unsigned long first_index, unsigned long last_index, unsigned long ifset, unsigned long thentag)
+{
+ unsigned int height;
+ struct radix_tree_node *slot;
+
+ BUG_ON(ifset & ~0x3);
+ BUG_ON(thentag & ~0x4);
+
+ height = root->height;
+ if (height == 0) {
+ /* set the root's tag bit */
+ if (first_index != 0)
+ return 0;
+
+ if (ifset & 0x1)
+ if (root_tag_get(root, 0))
+ goto isset;
+ if (ifset & 0x2)
+ if (root_tag_get(root, 1))
+ goto isset;
+ return 0;
+isset:
+ if (thentag & 0x4) {
+ if (!root_tag_get(root, 2))
+ root_tag_set(root, 2);
+ }
+ return 1;
+ }
+
+ slot = radix_tree_indirect_to_ptr(root->rnode);
+ if (node_tag_set_if_tagged(slot, height, first_index, last_index, ifset, thentag)) {
+ /* set the root's tag bit */
+ if (thentag & 0x4) {
+ if (!root_tag_get(root, 2))
+ root_tag_set(root, 2);
+ }
+
+ return 1;
+ }
+
+ return 0;
+}
+
/**
* radix_tree_next_hole - find the next hole (not-present entry)
* @root: tree root
_
Patches currently in -mm which might be from npiggin@xxxxxxx are
linux-next.patch
mm-dont-mark_page_accessed-in-fault-path.patch
mm-dont-mark_page_accessed-in-shmem_fault.patch
mm-invoke-oom-killer-from-page-fault.patch
mm-invoke-oom-killer-from-page-fault-fix.patch
mm-invoke-oom-killer-from-page-fault-fix-fix-2.patch
mm-write_cache_pages-cyclic-fix.patch
mm-write_cache_pages-cyclic-fix-fix.patch
mm-write_cache_pages-early-loop-termination.patch
mm-write_cache_pages-writepage-error-fix.patch
mm-write_cache_pages-integrity-fix.patch
mm-write_cache_pages-cleanups.patch
mm-write_cache_pages-optimise-page-cleaning.patch
mm-write_cache_pages-terminate-quickly.patch
mm-write_cache_pages-more-terminate-quickly.patch
mm-do_sync_mapping_range-integrity-fix.patch
mm-get-rid-of-pagevec_release_nonlru.patch
mm-more-likely-reclaim-madv_sequential-mappings.patch
mm-vmalloc-tweak-failure-printk.patch
mm-vmalloc-improve-vmallocinfo.patch
mm-vmalloc-use-mutex-for-purge.patch
mm-vmalloc-make-lazy-unmapping-configurable.patch
fs-truncate-blocks-outside-i_size-after-o_direct-write-error.patch
fs-truncate-blocks-outside-i_size-after-o_direct-write-error-fix.patch
hugetlb-unsigned-ret-cannot-be-negative.patch
page_fault-retry-with-nopage_retry.patch
page_fault-retry-with-nopage_retry-fix.patch
page_fault-retry-with-nopage_retry-fix-fix.patch
mm-direct-io-starvation-improvement.patch
fs-remove-wb_sync_hold.patch
fs-sync_sb_inodes-fix.patch
fs-sys_sync-fix.patch
radix-tree-gang-set-if-tagged-operation.patch
mm-fsync-livelock-avoidance.patch
reiser4.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
