OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

radix-tree-rt-aware.patch 

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-07-17 21:33:18 +02:00 committed by Alibek Omarov
parent dbdaea42bb
commit c1b1dbf736
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/radix-tree.h
View File

@ -227,8 +227,13 @@ radix_tree_gang_lookup(struct radix_tree_root *root, void **results,
unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root, unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
void ***results, unsigned long *indices, void ***results, unsigned long *indices,
unsigned long first_index, unsigned int max_items); unsigned long first_index, unsigned int max_items);
#ifndef CONFIG_PREEMPT_RT_FULL
int radix_tree_preload(gfp_t gfp_mask); int radix_tree_preload(gfp_t gfp_mask);
int radix_tree_maybe_preload(gfp_t gfp_mask); int radix_tree_maybe_preload(gfp_t gfp_mask);
#else
static inline int radix_tree_preload(gfp_t gm) { return 0; }
static inline int radix_tree_maybe_preload(gfp_t gfp_mask) { return 0; }
#endif
void radix_tree_init(void); void radix_tree_init(void);
void *radix_tree_tag_set(struct radix_tree_root *root, void *radix_tree_tag_set(struct radix_tree_root *root,
unsigned long index, unsigned int tag); unsigned long index, unsigned int tag);
@ -253,7 +258,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item);
static inline void radix_tree_preload_end(void) static inline void radix_tree_preload_end(void)
{ {
preempt_enable(); preempt_enable_nort();
} }
/** /**

5
lib/radix-tree.c
View File

@ -221,12 +221,13 @@ radix_tree_node_alloc(struct radix_tree_root *root)
* succeed in getting a node here (and never reach * succeed in getting a node here (and never reach
* kmem_cache_alloc) * kmem_cache_alloc)
*/ */
rtp = &__get_cpu_var(radix_tree_preloads); rtp = &get_cpu_var(radix_tree_preloads);
if (rtp->nr) { if (rtp->nr) {
ret = rtp->nodes[rtp->nr - 1]; ret = rtp->nodes[rtp->nr - 1];
rtp->nodes[rtp->nr - 1] = NULL; rtp->nodes[rtp->nr - 1] = NULL;
rtp->nr--; rtp->nr--;
} }
put_cpu_var(radix_tree_preloads);
} }
if (ret == NULL) if (ret == NULL)
ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
@ -261,6 +262,7 @@ radix_tree_node_free(struct radix_tree_node *node)
call_rcu(&node->rcu_head, radix_tree_node_rcu_free); call_rcu(&node->rcu_head, radix_tree_node_rcu_free);
} }
#ifndef CONFIG_PREEMPT_RT_FULL
/* /*
* Load up this CPU's radix_tree_node buffer with sufficient objects to * Load up this CPU's radix_tree_node buffer with sufficient objects to
* ensure that the addition of a single element in the tree cannot fail. On * ensure that the addition of a single element in the tree cannot fail. On
@ -326,6 +328,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask)
return 0; return 0;
} }
EXPORT_SYMBOL(radix_tree_maybe_preload); EXPORT_SYMBOL(radix_tree_maybe_preload);
#endif
/* /*
* Return the maximum key which can be store into a * Return the maximum key which can be store into a