Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc"

Browse Source 
Revert commit f1549cb5ab2b ("mm/z3fold.c: allow __GFP_HIGHMEM in
z3fold_alloc").

z3fold can't support GFP_HIGHMEM page now.  page_address is used directly
at all places.  Moreover, z3fold_header is on per cpu unbuddied list which
could be accessed anytime.  So we should remove the support of GFP_HIGHMEM
allocation for z3fold.

Link: https://lkml.kernel.org/r/20220429064051.61552-6-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Miaohe Lin 2022-04-29 14:40:43 +08:00 committed by akpm
parent 2c0f351434
commit f4bad643c1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/z3fold.c
View File

@ -212,10 +212,8 @@ static int size_to_chunks(size_t size)
static inline struct z3fold_buddy_slots *alloc_slots(struct z3fold_pool *pool, static inline struct z3fold_buddy_slots *alloc_slots(struct z3fold_pool *pool,
gfp_t gfp) gfp_t gfp)
{ {
struct z3fold_buddy_slots *slots; struct z3fold_buddy_slots *slots = kmem_cache_zalloc(pool->c_handle,
gfp);
slots = kmem_cache_zalloc(pool->c_handle,
(gfp & ~(__GFP_HIGHMEM | __GFP_MOVABLE)));
if (slots) { if (slots) {
/* It will be freed separately in free_handle(). */ /* It will be freed separately in free_handle(). */
@ -1075,7 +1073,7 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp,
enum buddy bud; enum buddy bud;
bool can_sleep = gfpflags_allow_blocking(gfp); bool can_sleep = gfpflags_allow_blocking(gfp);
if (!size) if (!size || (gfp & __GFP_HIGHMEM))
return -EINVAL; return -EINVAL;
if (size > PAGE_SIZE) if (size > PAGE_SIZE)