From: Matthew Wilcox <mawilcox@linuxonhyperv.com> To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Konstantin Khlebnikov <koct9i@gmail.com>, Ross Zwisler <ross.zwisler@linux.intel.com> Cc: linux-fsdevel@vger.kernel.org, Matthew Wilcox <willy@linux.intel.com>, linux-mm@kvack.org, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH 02/29] radix tree test suite: Allow GFP_ATOMIC allocations to fail Date: Wed, 16 Nov 2016 16:16:27 -0800 [thread overview] Message-ID: <1479341856-30320-3-git-send-email-mawilcox@linuxonhyperv.com> (raw) In-Reply-To: <1479341856-30320-1-git-send-email-mawilcox@linuxonhyperv.com> From: Matthew Wilcox <willy@linux.intel.com> In order to test the preload code, it is necessary to fail GFP_ATOMIC allocations, which requires defining GFP_KERNEL and GFP_ATOMIC properly. Remove the obsolete __GFP_WAIT and copy the definitions of the __GFP flags which are used from the kernel include files. We also need the real definition of gfpflags_allow_blocking() to persuade the radix tree to actually use its preallocated nodes. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> --- tools/testing/radix-tree/linux.c | 7 ++++++- tools/testing/radix-tree/linux/gfp.h | 22 +++++++++++++++++++--- tools/testing/radix-tree/linux/slab.h | 5 ----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c index 1548237..3cfb04e 100644 --- a/tools/testing/radix-tree/linux.c +++ b/tools/testing/radix-tree/linux.c @@ -33,7 +33,12 @@ mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn, void *kmem_cache_alloc(struct kmem_cache *cachep, int flags) { - void *ret = malloc(cachep->size); + void *ret; + + if (flags & __GFP_NOWARN) + return NULL; + + ret = malloc(cachep->size); if (cachep->ctor) cachep->ctor(ret); uatomic_inc(&nr_allocated); diff --git a/tools/testing/radix-tree/linux/gfp.h b/tools/testing/radix-tree/linux/gfp.h index 5201b91..5b09b2c 100644 --- a/tools/testing/radix-tree/linux/gfp.h +++ b/tools/testing/radix-tree/linux/gfp.h @@ -3,8 +3,24 @@ #define __GFP_BITS_SHIFT 26 #define __GFP_BITS_MASK ((gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) -#define __GFP_WAIT 1 -#define __GFP_ACCOUNT 0 -#define __GFP_NOWARN 0 + +#define __GFP_HIGH 0x20u +#define __GFP_IO 0x40u +#define __GFP_FS 0x80u +#define __GFP_NOWARN 0x200u +#define __GFP_ATOMIC 0x80000u +#define __GFP_ACCOUNT 0x100000u +#define __GFP_DIRECT_RECLAIM 0x400000u +#define __GFP_KSWAPD_RECLAIM 0x2000000u + +#define __GFP_RECLAIM (__GFP_DIRECT_RECLAIM|__GFP_KSWAPD_RECLAIM) + +#define GFP_ATOMIC (__GFP_HIGH|__GFP_ATOMIC|__GFP_KSWAPD_RECLAIM) +#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS) + +static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags) +{ + return !!(gfp_flags & __GFP_DIRECT_RECLAIM); +} #endif diff --git a/tools/testing/radix-tree/linux/slab.h b/tools/testing/radix-tree/linux/slab.h index 6d5a347..452e2bf 100644 --- a/tools/testing/radix-tree/linux/slab.h +++ b/tools/testing/radix-tree/linux/slab.h @@ -7,11 +7,6 @@ #define SLAB_PANIC 2 #define SLAB_RECLAIM_ACCOUNT 0x00020000UL /* Objects are reclaimable */ -static inline int gfpflags_allow_blocking(gfp_t mask) -{ - return 1; -} - struct kmem_cache { int size; void (*ctor)(void *); -- 2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Wilcox <mawilcox@linuxonhyperv.com> To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Konstantin Khlebnikov <koct9i@gmail.com>, Ross Zwisler <ross.zwisler@linux.intel.com> Cc: linux-fsdevel@vger.kernel.org, Matthew Wilcox <willy@linux.intel.com>, linux-mm@kvack.org, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH 02/29] radix tree test suite: Allow GFP_ATOMIC allocations to fail Date: Wed, 16 Nov 2016 16:16:27 -0800 [thread overview] Message-ID: <1479341856-30320-3-git-send-email-mawilcox@linuxonhyperv.com> (raw) In-Reply-To: <1479341856-30320-1-git-send-email-mawilcox@linuxonhyperv.com> From: Matthew Wilcox <willy@linux.intel.com> In order to test the preload code, it is necessary to fail GFP_ATOMIC allocations, which requires defining GFP_KERNEL and GFP_ATOMIC properly. Remove the obsolete __GFP_WAIT and copy the definitions of the __GFP flags which are used from the kernel include files. We also need the real definition of gfpflags_allow_blocking() to persuade the radix tree to actually use its preallocated nodes. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> --- tools/testing/radix-tree/linux.c | 7 ++++++- tools/testing/radix-tree/linux/gfp.h | 22 +++++++++++++++++++--- tools/testing/radix-tree/linux/slab.h | 5 ----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c index 1548237..3cfb04e 100644 --- a/tools/testing/radix-tree/linux.c +++ b/tools/testing/radix-tree/linux.c @@ -33,7 +33,12 @@ mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn, void *kmem_cache_alloc(struct kmem_cache *cachep, int flags) { - void *ret = malloc(cachep->size); + void *ret; + + if (flags & __GFP_NOWARN) + return NULL; + + ret = malloc(cachep->size); if (cachep->ctor) cachep->ctor(ret); uatomic_inc(&nr_allocated); diff --git a/tools/testing/radix-tree/linux/gfp.h b/tools/testing/radix-tree/linux/gfp.h index 5201b91..5b09b2c 100644 --- a/tools/testing/radix-tree/linux/gfp.h +++ b/tools/testing/radix-tree/linux/gfp.h @@ -3,8 +3,24 @@ #define __GFP_BITS_SHIFT 26 #define __GFP_BITS_MASK ((gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) -#define __GFP_WAIT 1 -#define __GFP_ACCOUNT 0 -#define __GFP_NOWARN 0 + +#define __GFP_HIGH 0x20u +#define __GFP_IO 0x40u +#define __GFP_FS 0x80u +#define __GFP_NOWARN 0x200u +#define __GFP_ATOMIC 0x80000u +#define __GFP_ACCOUNT 0x100000u +#define __GFP_DIRECT_RECLAIM 0x400000u +#define __GFP_KSWAPD_RECLAIM 0x2000000u + +#define __GFP_RECLAIM (__GFP_DIRECT_RECLAIM|__GFP_KSWAPD_RECLAIM) + +#define GFP_ATOMIC (__GFP_HIGH|__GFP_ATOMIC|__GFP_KSWAPD_RECLAIM) +#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS) + +static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags) +{ + return !!(gfp_flags & __GFP_DIRECT_RECLAIM); +} #endif diff --git a/tools/testing/radix-tree/linux/slab.h b/tools/testing/radix-tree/linux/slab.h index 6d5a347..452e2bf 100644 --- a/tools/testing/radix-tree/linux/slab.h +++ b/tools/testing/radix-tree/linux/slab.h @@ -7,11 +7,6 @@ #define SLAB_PANIC 2 #define SLAB_RECLAIM_ACCOUNT 0x00020000UL /* Objects are reclaimable */ -static inline int gfpflags_allow_blocking(gfp_t mask) -{ - return 1; -} - struct kmem_cache { int size; void (*ctor)(void *); -- 2.10.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-11-16 22:32 UTC|newest] Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-17 0:16 [PATCH 00/29] Improve radix tree for 4.10 Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 01/29] tools: Add WARN_ON_ONCE Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox [this message] 2016-11-17 0:16 ` [PATCH 02/29] radix tree test suite: Allow GFP_ATOMIC allocations to fail Matthew Wilcox 2016-11-17 0:16 ` [PATCH 03/29] radix tree test suite: Track preempt_count Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 04/29] radix tree test suite: Free preallocated nodes Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 05/29] radix tree test suite: Make runs more reproducible Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 06/28] Add benchmark Matthew Wilcox 2016-11-17 0:16 ` [PATCH 06/29] radix tree test suite: benchmark for iterator Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 07/29] radix tree test suite: Use rcu_barrier Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 07/28] test suite: Switch to rcu_barrier from sleep Matthew Wilcox 2016-11-17 0:16 ` [PATCH 08/29] tools: Add more bitmap functions Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 09/29] radix tree test suite: Use common find-bit code Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 10/29] radix-tree: Add radix_tree_join Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 11/29] radix-tree: Add radix_tree_split Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 12/29] radix-tree: Add radix_tree_split_preload() Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 13/29] radix-tree: Fix typo Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 14/29] radix-tree: Move rcu_head into a union with private_list Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 15/29] radix-tree: Create node_tag_set() Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 16/29] radix-tree: Make radix_tree_find_next_bit more useful Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 17/29] radix-tree: Improve dump output Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 18/29] btrfs: Fix race in btrfs_free_dummy_fs_info() Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 19/29] radix tree test suite: iteration test misuses RCU Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 20/29] radix tree: Improve multiorder iterators Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 21/29] radix-tree: Delete radix_tree_locate_item() Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 22/29] radix-tree: Delete radix_tree_range_tag_if_tagged() Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 23/29] idr: Add ida_is_empty Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-18 11:56 ` Konstantin Khlebnikov 2016-11-18 11:56 ` Konstantin Khlebnikov 2016-11-17 0:16 ` [PATCH 24/29] tpm: Use idr_find(), not idr_find_slowpath() Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 25/28] idr: Reduce the number of bits per level from 8 to 6 Matthew Wilcox 2016-11-17 0:16 ` [PATCH 25/29] rxrpc: Abstract away knowledge of IDR internals Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 26/29] idr: Reduce the number of bits per level from 8 to 6 Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 26/28] radix tree test suite: Add some more functionality Matthew Wilcox 2016-11-17 0:16 ` [PATCH 27/28] radix-tree: Create all_tag_set Matthew Wilcox 2016-11-17 0:16 ` [PATCH 27/29] radix tree test suite: Add some more functionality Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:16 ` [PATCH 28/28] Reimplement IDR and IDA using the radix tree Matthew Wilcox 2016-11-17 0:16 ` [PATCH 28/29] radix-tree: Create all_tag_set Matthew Wilcox 2016-11-17 0:16 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 29/29] Reimplement IDR and IDA using the radix tree Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 00/29] Improve radix tree for 4.10 Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 19:38 ` Matthew Wilcox 2016-11-17 19:38 ` Matthew Wilcox 2016-11-17 22:17 ` Ross Zwisler 2016-11-17 22:17 ` Ross Zwisler 2016-11-18 4:24 ` Matthew Wilcox 2016-11-18 4:24 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 01/29] tools: Add WARN_ON_ONCE Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 02/29] radix tree test suite: Allow GFP_ATOMIC allocations to fail Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 03/29] radix tree test suite: Track preempt_count Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 04/29] radix tree test suite: Free preallocated nodes Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 05/29] radix tree test suite: Make runs more reproducible Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 06/28] Add benchmark Matthew Wilcox 2016-11-17 0:17 ` [PATCH 06/29] radix tree test suite: benchmark for iterator Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 07/29] radix tree test suite: Use rcu_barrier Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 07/28] test suite: Switch to rcu_barrier from sleep Matthew Wilcox 2016-11-17 0:17 ` [PATCH 08/29] tools: Add more bitmap functions Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 09/29] radix tree test suite: Use common find-bit code Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 10/29] radix-tree: Add radix_tree_join Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 11/29] radix-tree: Add radix_tree_split Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 12/29] radix-tree: Add radix_tree_split_preload() Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 13/29] radix-tree: Fix typo Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 14/29] radix-tree: Move rcu_head into a union with private_list Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 15/29] radix-tree: Create node_tag_set() Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 16/29] radix-tree: Make radix_tree_find_next_bit more useful Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 17/29] radix-tree: Improve dump output Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 18/29] btrfs: Fix race in btrfs_free_dummy_fs_info() Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 19/29] radix tree test suite: iteration test misuses RCU Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 20/29] radix tree: Improve multiorder iterators Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-18 11:47 ` Konstantin Khlebnikov 2016-11-18 11:47 ` Konstantin Khlebnikov 2016-11-18 16:31 ` Matthew Wilcox 2016-11-18 16:31 ` Matthew Wilcox 2016-11-18 17:56 ` Konstantin Khlebnikov 2016-11-18 17:56 ` Konstantin Khlebnikov 2016-11-18 20:23 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 21/29] radix-tree: Delete radix_tree_locate_item() Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-18 11:50 ` Konstantin Khlebnikov 2016-11-18 11:50 ` Konstantin Khlebnikov 2016-11-18 16:34 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 22/29] radix-tree: Delete radix_tree_range_tag_if_tagged() Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 23/29] idr: Add ida_is_empty Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 24/29] tpm: Use idr_find(), not idr_find_slowpath() Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 25/28] idr: Reduce the number of bits per level from 8 to 6 Matthew Wilcox 2016-11-17 0:17 ` [PATCH 25/29] rxrpc: Abstract away knowledge of IDR internals Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 26/29] idr: Reduce the number of bits per level from 8 to 6 Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 26/28] radix tree test suite: Add some more functionality Matthew Wilcox 2016-11-17 0:17 ` [PATCH 27/28] radix-tree: Create all_tag_set Matthew Wilcox 2016-11-17 0:17 ` [PATCH 27/29] radix tree test suite: Add some more functionality Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 28/28] Reimplement IDR and IDA using the radix tree Matthew Wilcox 2016-11-18 11:52 ` Konstantin Khlebnikov 2016-11-18 13:43 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 28/29] radix-tree: Create all_tag_set Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox 2016-11-17 0:17 ` [PATCH 29/29] Reimplement IDR and IDA using the radix tree Matthew Wilcox 2016-11-17 0:17 ` Matthew Wilcox
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1479341856-30320-3-git-send-email-mawilcox@linuxonhyperv.com \ --to=mawilcox@linuxonhyperv.com \ --cc=akpm@linux-foundation.org \ --cc=kirill.shutemov@linux.intel.com \ --cc=koct9i@gmail.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=ross.zwisler@linux.intel.com \ --cc=willy@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.