Pull XArray conversion from Matthew Wilcox: "The XArray provides an improved interface to the radix tree data structure, providing locking as part of the API, specifying GFP flags at allocation time, eliminating preloading, less re-walking the tree, more efficient iterations and not exposing RCU-protected pointers to its users. This patch set 1. Introduces the XArray implementation 2. Converts the pagecache to use it 3. Converts memremap to use it The page cache is the most complex and important user of the radix tree, so converting it was most important. Converting the memremap code removes the only other user of the multiorder code, which allows us to remove the radix tree code that supported it. I have 40+ followup patches to convert many other users of the radix tree over to the XArray, but I'd like to get this part in first. The other conversions haven't been in linux-next and aren't suitable for applying yet, but you can see them in the xarray-conv branch if you're interested" * 'xarray' of git://git.infradead.org/users/willy/linux-dax: (90 commits) radix tree: Remove multiorder support radix tree test: Convert multiorder tests to XArray radix tree tests: Convert item_delete_rcu to XArray radix tree tests: Convert item_kill_tree to XArray radix tree tests: Move item_insert_order radix tree test suite: Remove multiorder benchmarking radix tree test suite: Remove __item_insert memremap: Convert to XArray xarray: Add range store functionality xarray: Move multiorder_check to in-kernel tests xarray: Move multiorder_shrink to kernel tests xarray: Move multiorder account test in-kernel radix tree test suite: Convert iteration test to XArray radix tree test suite: Convert tag_tagged_items to XArray radix tree: Remove radix_tree_clear_tags radix tree: Remove radix_tree_maybe_preload_order radix tree: Remove split/join code radix tree: Remove radix_tree_update_node_t page cache: Finish XArray conversion dax: Convert page fault handlers to XArray ...
Showing the changes to tools/include/linux (3 of 93 files). Show all
Unified · Split
| @@ -15,6 +15,7 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, · 14 unmodified lines | ||
| 15 | 15 | const unsigned long *bitmap2, int bits); |
| 16 | 16 | int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, |
| 17 | 17 | const unsigned long *bitmap2, unsigned int bits); |
| 18 | +void bitmap_clear(unsigned long *map, unsigned int start, int len); | |
| 18 | 19 | |
| 19 | 20 | #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1))) |
| 20 | 21 | |
| @@ -70,6 +70,7 @@ · 69 unmodified lines | ||
| 70 | 70 | #define BUG_ON(cond) assert(!(cond)) |
| 71 | 71 | #endif |
| 72 | 72 | #endif |
| 73 | +#define BUG() BUG_ON(1) | |
| 73 | 74 | |
| 74 | 75 | #if __BYTE_ORDER == __BIG_ENDIAN |
| 75 | 76 | #define cpu_to_le16 bswap_16 |
| @@ -8,8 +8,14 @@ · 7 unmodified lines | ||
| 8 | 8 | #define spinlock_t pthread_mutex_t |
| 9 | 9 | #define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER |
| 10 | 10 | #define __SPIN_LOCK_UNLOCKED(x) (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER |
| 11 | −#define spin_lock_init(x) pthread_mutex_init(x, NULL) | |
| 12 | − | |
| 11 | +#define spin_lock_init(x) pthread_mutex_init(x, NULL) | |
| 12 | + | |
| 13 | +#define spin_lock(x) pthread_mutex_lock(x) | |
| 14 | +#define spin_unlock(x) pthread_mutex_unlock(x) | |
| 15 | +#define spin_lock_bh(x) pthread_mutex_lock(x) | |
| 16 | +#define spin_unlock_bh(x) pthread_mutex_unlock(x) | |
| 17 | +#define spin_lock_irq(x) pthread_mutex_lock(x) | |
| 18 | +#define spin_unlock_irq(x) pthread_mutex_unlock(x) | |
| 13 | 19 | #define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x) |
| 14 | 20 | #define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x) |
| 15 | 21 | |
| @@ -31,4 +37,6 @@ static inline bool arch_spin_is_locked(arch_spinlock_t *mutex) · 15 unmodified lines | ||
| 31 | 37 | return true; |
| 32 | 38 | } |
| 33 | 39 | |
| 40 | +#include <linux/lockdep.h> | |
| 41 | + | |
| 34 | 42 | #endif |