> -----Original Message----- > From: owner-linux-mm@xxxxxxxxx [mailto:owner-linux-mm@xxxxxxxxx] On > Behalf Of Matthew Wilcox > Sent: Sunday, May 06, 2018 9:48 PM > To: Huaisheng HS1 Ye <yehs1@xxxxxxxxxx> > Cc: Michal Hocko <mhocko@xxxxxxxxxx>; akpm@xxxxxxxxxxxxxxxxxxxx; > linux-mm@xxxxxxxxx; vbabka@xxxxxxx; mgorman@xxxxxxxxxxxxxxxxxxx; > pasha.tatashin@xxxxxxxxxx; alexander.levin@xxxxxxxxxxx; > hannes@xxxxxxxxxxx; penguin-kernel@xxxxxxxxxxxxxxxxxxx; colyli@xxxxxxx; > NingTing Cheng <chengnt@xxxxxxxxxx>; linux-kernel@xxxxxxxxxxxxxxx > Subject: Re: [External] Re: [PATCH 2/3] include/linux/gfp.h: use unsigned int in > gfp_zone > > On Sun, May 06, 2018 at 09:32:15AM +0000, Huaisheng HS1 Ye wrote: > > This idea is great, we can replace GFP_ZONE_TABLE and GFP_ZONE_BAD with > it. > > I have realized it preliminarily based on your code and tested it on a 2 sockets > platform. Fortunately, we got a positive test result. > > Great! > > > I made some adjustments for __GFP_HIGHMEM, this flag is special than > others, because the return result of gfp_zone has two possibilities, which > depend on ___GFP_MOVABLE has been enabled or disabled. > > When ___GFP_MOVABLE has been enabled, ZONE_MOVABLE shall be > returned. When disabled, OPT_ZONE_HIGHMEM shall be used. > > > > #define __GFP_DMA ((__force gfp_t)OPT_ZONE_DMA ^ ZONE_NORMAL) > > #define __GFP_HIGHMEM ((__force gfp_t)ZONE_MOVABLE ^ > ZONE_NORMAL) > > I'm not sure this is right ... Let me think about this a little. Upload my current patch and testing platform info for reference. This patch has been tested on a two sockets platform. Here is dmesg log about zones, 397 [ 0.000000] Zone ranges: 398 [ 0.000000] DMA [mem 0x0000000000001000-0x0000000000ffffff] 399 [ 0.000000] DMA32 [mem 0x0000000001000000-0x00000000ffffffff] 400 [ 0.000000] Normal [mem 0x0000000100000000-0x000000277fffffff] 401 [ 0.000000] Device empty 402 [ 0.000000] Movable zone start for each node 403 [ 0.000000] Early memory node ranges 404 [ 0.000000] node 0: [mem 0x0000000000001000-0x000000000009ffff] 405 [ 0.000000] node 0: [mem 0x0000000000100000-0x00000000a69c2fff] 406 [ 0.000000] node 0: [mem 0x00000000a7654000-0x00000000a85eefff] 407 [ 0.000000] node 0: [mem 0x00000000ab399000-0x00000000af3f6fff] 408 [ 0.000000] node 0: [mem 0x00000000af429000-0x00000000af7fffff] 409 [ 0.000000] node 0: [mem 0x0000000100000000-0x000000043fffffff] 410 [ 0.000000] node 1: [mem 0x0000002380000000-0x000000277fffffff] 416 [ 0.000000] Initmem setup node 0 [mem 0x0000000000001000-0x000000043fffffff] 417 [ 0.000000] On node 0 totalpages: 4111666 418 [ 0.000000] DMA zone: 64 pages used for memmap 419 [ 0.000000] DMA zone: 23 pages reserved 420 [ 0.000000] DMA zone: 3999 pages, LIFO batch:0 421 [ 0.000000] mminit::memmap_init Initialising map node 0 zone 0 pfns 1 -> 4096 422 [ 0.000000] DMA32 zone: 10935 pages used for memmap 423 [ 0.000000] DMA32 zone: 699795 pages, LIFO batch:31 424 [ 0.000000] mminit::memmap_init Initialising map node 0 zone 1 pfns 4096 -> 1048576 425 [ 0.000000] Normal zone: 53248 pages used for memmap 426 [ 0.000000] Normal zone: 3407872 pages, LIFO batch:31 427 [ 0.000000] mminit::memmap_init Initialising map node 0 zone 2 pfns 1048576 -> 4456448 428 [ 0.000000] Initmem setup node 1 [mem 0x0000002380000000-0x000000277fffffff] 429 [ 0.000000] On node 1 totalpages: 4194304 430 [ 0.000000] Normal zone: 65536 pages used for memmap 431 [ 0.000000] Normal zone: 4194304 pages, LIFO batch:31 432 [ 0.000000] mminit::memmap_init Initialising map node 1 zone 2 pfns 37224448 -> 41418752 986 [ 0.000000] mminit::zonelist general 0:DMA = 0:DMA 987 [ 0.000000] mminit::zonelist general 0:DMA32 = 0:DMA32 0:DMA 988 [ 0.000000] mminit::zonelist general 0:Normal = 0:Normal 0:DMA32 0:DMA 1:Normal 989 [ 0.000000] mminit::zonelist thisnode 0:DMA = 0:DMA 990 [ 0.000000] mminit::zonelist thisnode 0:DMA32 = 0:DMA32 0:DMA 991 [ 0.000000] mminit::zonelist thisnode 0:Normal = 0:Normal 0:DMA32 0:DMA 992 [ 0.000000] mminit::zonelist general 1:Normal = 1:Normal 0:Normal 0:DMA32 0:DMA 993 [ 0.000000] mminit::zonelist thisnode 1:Normal = 1:Normal 994 [ 0.000000] Built 2 zonelists, mobility grouping on. Total pages: 8176164 Here is some information of ZONE_NORMAL which comes from /proc/zoneinfo 1131 Node 0, zone Normal 1132 pages free 3171428 1133 min 9249 1134 low 12584 1135 high 15919 1136 spanned 3407872 1137 present 3407872 1138 managed 3335769 1139 protection: (0, 0, 0, 0, 0) 1140 nr_free_pages 3171428 1141 nr_zone_inactive_anon 12 1142 nr_zone_active_anon 13585 1143 nr_zone_inactive_file 37028 1144 nr_zone_active_file 12104 1145 nr_zone_unevictable 0 1146 nr_zone_write_pending 7 1147 nr_mlock 0 1148 nr_page_table_pages 1026 1149 nr_kernel_stack 10920 1150 nr_bounce 0 1151 nr_zspages 0 1152 nr_free_cma 0 1153 numa_hit 792300 1154 numa_miss 0 1155 numa_foreign 0 1156 numa_interleave 26268 1157 numa_local 768300 1158 numa_other 24000 1718 Node 1, zone Normal 1747 pages free 3856001 1748 min 11405 1749 low 15518 1750 high 19631 1751 spanned 4194304 1752 present 4194304 1753 managed 4114482 1754 protection: (0, 0, 0, 0, 0) 1755 nr_free_pages 3856001 1756 nr_zone_inactive_anon 424 1757 nr_zone_active_anon 10679 1758 nr_zone_inactive_file 35274 1759 nr_zone_active_file 22189 1760 nr_zone_unevictable 0 1761 nr_zone_write_pending 0 1762 nr_mlock 0 1763 nr_page_table_pages 800 1764 nr_kernel_stack 9848 1765 nr_bounce 0 1766 nr_zspages 0 1767 nr_free_cma 0 1768 numa_hit 757099 1769 numa_miss 0 1770 numa_foreign 0 1771 numa_interleave 26314 1772 numa_local 712341 1773 numa_other 44758 Subject: [RFC PATCH v0.1] include/linux/gfp.h: Replace GFP_ZONE_TABLE with bit encoding It works, but some drivers or subsystem shall be modified to fit these new type __GFP flags. They use these flags directly to realize bit manipulations like this below. eg. swiotlb-xen.c (drivers\xen): flags &= ~(__GFP_DMA | __GFP_HIGHMEM); extent_io.c (fs\btrfs): mask &= ~(__GFP_DMA32|__GFP_HIGHMEM); Because of these flags have been encoded within this patch, the above operations can cause problem. Signed-off-by: Huaisheng Ye <yehs1@xxxxxxxxxx> --- include/linux/gfp.h | 49 ++++++++++--------------------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 1a4582b..1647385 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -16,9 +16,7 @@ */ /* Plain integer GFP bitmasks. Do not use this directly. */ -#define ___GFP_DMA 0x01u -#define ___GFP_HIGHMEM 0x02u -#define ___GFP_DMA32 0x04u +#define ___GFP_ZONE_MASK 0x07u #define ___GFP_MOVABLE 0x08u #define ___GFP_RECLAIMABLE 0x10u #define ___GFP_HIGH 0x20u @@ -53,11 +51,11 @@ * without the underscores and use them consistently. The definitions here may * be used in bit comparisons. */ -#define __GFP_DMA ((__force gfp_t)___GFP_DMA) -#define __GFP_HIGHMEM ((__force gfp_t)___GFP_HIGHMEM) -#define __GFP_DMA32 ((__force gfp_t)___GFP_DMA32) +#define __GFP_DMA ((__force gfp_t)OPT_ZONE_DMA ^ ZONE_NORMAL) +#define __GFP_HIGHMEM ((__force gfp_t)ZONE_MOVABLE ^ ZONE_NORMAL) +#define __GFP_DMA32 ((__force gfp_t)OPT_ZONE_DMA32 ^ ZONE_NORMAL) #define __GFP_MOVABLE ((__force gfp_t)___GFP_MOVABLE) /* ZONE_MOVABLE allowed */ -#define GFP_ZONEMASK (__GFP_DMA|__GFP_HIGHMEM|__GFP_DMA32|__GFP_MOVABLE) +#define GFP_ZONEMASK ((__force gfp_t)___GFP_ZONE_MASK | ___GFP_MOVABLE) /* * Page mobility and placement hints @@ -370,42 +368,15 @@ static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags) #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer #endif -#define GFP_ZONE_TABLE ( \ - (ZONE_NORMAL << 0 * GFP_ZONES_SHIFT) \ - | (OPT_ZONE_DMA << ___GFP_DMA * GFP_ZONES_SHIFT) \ - | (OPT_ZONE_HIGHMEM << ___GFP_HIGHMEM * GFP_ZONES_SHIFT) \ - | (OPT_ZONE_DMA32 << ___GFP_DMA32 * GFP_ZONES_SHIFT) \ - | (ZONE_NORMAL << ___GFP_MOVABLE * GFP_ZONES_SHIFT) \ - | (OPT_ZONE_DMA << (___GFP_MOVABLE | ___GFP_DMA) * GFP_ZONES_SHIFT) \ - | (ZONE_MOVABLE << (___GFP_MOVABLE | ___GFP_HIGHMEM) * GFP_ZONES_SHIFT)\ - | (OPT_ZONE_DMA32 << (___GFP_MOVABLE | ___GFP_DMA32) * GFP_ZONES_SHIFT)\ -) - -/* - * GFP_ZONE_BAD is a bitmap for all combinations of __GFP_DMA, __GFP_DMA32 - * __GFP_HIGHMEM and __GFP_MOVABLE that are not permitted. One flag per - * entry starting with bit 0. Bit is set if the combination is not - * allowed. - */ -#define GFP_ZONE_BAD ( \ - 1 << (___GFP_DMA | ___GFP_HIGHMEM) \ - | 1 << (___GFP_DMA | ___GFP_DMA32) \ - | 1 << (___GFP_DMA32 | ___GFP_HIGHMEM) \ - | 1 << (___GFP_DMA | ___GFP_DMA32 | ___GFP_HIGHMEM) \ - | 1 << (___GFP_MOVABLE | ___GFP_HIGHMEM | ___GFP_DMA) \ - | 1 << (___GFP_MOVABLE | ___GFP_DMA32 | ___GFP_DMA) \ - | 1 << (___GFP_MOVABLE | ___GFP_DMA32 | ___GFP_HIGHMEM) \ - | 1 << (___GFP_MOVABLE | ___GFP_DMA32 | ___GFP_DMA | ___GFP_HIGHMEM) \ -) - static inline enum zone_type gfp_zone(gfp_t flags) { enum zone_type z; - int bit = (__force int) (flags & GFP_ZONEMASK); + z = ((__force unsigned int)flags & ___GFP_ZONE_MASK) ^ ZONE_NORMAL; - z = (GFP_ZONE_TABLE >> (bit * GFP_ZONES_SHIFT)) & - ((1 << GFP_ZONES_SHIFT) - 1); - VM_BUG_ON((GFP_ZONE_BAD >> bit) & 1); + if (z > OPT_ZONE_HIGHMEM) { + z = OPT_ZONE_HIGHMEM + + !!((__force unsigned int)flags & ___GFP_MOVABLE); + } return z; } -- 1.8.3.1
