2022-09-02 20:12:31

by Matthew Wilcox (Oracle)

Subject: [PATCH] tools: Fix compilation after gfp_types.h split

When gfp_types.h was split from gfp.h, it broke the radix test suite.
Fix the test suite by using gfp_types.h in the tools gfp.h header.

Reported-by: Liam R. Howlett <[email protected]>
Fixes: cb5a065b4ea9 (headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>)
Cc: Ingo Molnar <[email protected]>
Cc: Yury Norov <[email protected]>
Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>
---
tools/include/linux/gfp.h | 21 +--------------------
tools/include/linux/gfp_types.h | 1 +
2 files changed, 2 insertions(+), 20 deletions(-)
create mode 100644 tools/include/linux/gfp_types.h

diff --git a/tools/include/linux/gfp.h b/tools/include/linux/gfp.h
index b238dbc9eb85..6a10ff5f5be9 100644
--- a/tools/include/linux/gfp.h
+++ b/tools/include/linux/gfp.h
@@ -3,26 +3,7 @@
#define _TOOLS_INCLUDE_LINUX_GFP_H

#include <linux/types.h>
-
-#define __GFP_BITS_SHIFT 26
-#define __GFP_BITS_MASK ((gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
-
-#define __GFP_HIGH 0x20u
-#define __GFP_IO 0x40u
-#define __GFP_FS 0x80u
-#define __GFP_NOWARN 0x200u
-#define __GFP_ZERO 0x8000u
-#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_ZONEMASK 0x0fu
-#define GFP_ATOMIC (__GFP_HIGH | __GFP_ATOMIC | __GFP_KSWAPD_RECLAIM)
-#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
-#define GFP_NOWAIT (__GFP_KSWAPD_RECLAIM)
+#include <linux/gfp_types.h>

static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags)
{
diff --git a/tools/include/linux/gfp_types.h b/tools/include/linux/gfp_types.h
new file mode 100644
index 000000000000..5f9f1ed190a0
--- /dev/null
+++ b/tools/include/linux/gfp_types.h
@@ -0,0 +1 @@
+#include "../../../include/linux/gfp_types.h"
--
2.35.1

2022-09-02 22:36:41

by Yury Norov

Subject: Re: [PATCH] tools: Fix compilation after gfp_types.h split

On Fri, Sep 02, 2022 at 08:19:23PM +0100, Matthew Wilcox (Oracle) wrote:
> When gfp_types.h was split from gfp.h, it broke the radix test suite.
> Fix the test suite by using gfp_types.h in the tools gfp.h header.
>
> Reported-by: Liam R. Howlett <[email protected]>
> Fixes: cb5a065b4ea9 (headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>)
> Cc: Ingo Molnar <[email protected]>
> Cc: Yury Norov <[email protected]>
> Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>

Reviewed-by: Yury Norov <[email protected]>

> ---
> tools/include/linux/gfp.h | 21 +--------------------
> tools/include/linux/gfp_types.h | 1 +
> 2 files changed, 2 insertions(+), 20 deletions(-)
> create mode 100644 tools/include/linux/gfp_types.h
>
> diff --git a/tools/include/linux/gfp.h b/tools/include/linux/gfp.h
> index b238dbc9eb85..6a10ff5f5be9 100644
> --- a/tools/include/linux/gfp.h
> +++ b/tools/include/linux/gfp.h
> @@ -3,26 +3,7 @@
> #define _TOOLS_INCLUDE_LINUX_GFP_H
>
> #include <linux/types.h>
> -
> -#define __GFP_BITS_SHIFT 26
> -#define __GFP_BITS_MASK ((gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
> -
> -#define __GFP_HIGH 0x20u
> -#define __GFP_IO 0x40u
> -#define __GFP_FS 0x80u
> -#define __GFP_NOWARN 0x200u
> -#define __GFP_ZERO 0x8000u
> -#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_ZONEMASK 0x0fu
> -#define GFP_ATOMIC (__GFP_HIGH | __GFP_ATOMIC | __GFP_KSWAPD_RECLAIM)
> -#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
> -#define GFP_NOWAIT (__GFP_KSWAPD_RECLAIM)
> +#include <linux/gfp_types.h>
>
> static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags)
> {
> diff --git a/tools/include/linux/gfp_types.h b/tools/include/linux/gfp_types.h
> new file mode 100644
> index 000000000000..5f9f1ed190a0
> --- /dev/null
> +++ b/tools/include/linux/gfp_types.h
> @@ -0,0 +1 @@
> +#include "../../../include/linux/gfp_types.h"
> --
> 2.35.1