From patchwork Mon Sep 2 09:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 13786971 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B7781D2F4B; Mon, 2 Sep 2024 09:52:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725270735; cv=none; b=UJa6lnphPmXpz7QxLjB4mtar2b4F6+5YGTrSIQHWv/qDLP4q/k43g5d08jynzZeqJlCC2lxR8rf4IiETvQxBxtKQ0sHePmOwXJkGT299ax94m/6YbgHKBU45eTeZtHDdRvk2+R/Jn166gLA8sq0bRiSGiTRAOsi0tJ73ido4v7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725270735; c=relaxed/simple; bh=2/NlnzjJ5EKGmnvogmfthodMRwUpHOr61nKUlheBjLg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mGnKEsQ3cOMYe20FG9j6EeUSXXf+LMwzt8k75Yy80rQp0A42olMEG8ckxo39m2i0BVfDaDDJWsJ5RcVF2aL6+1tsuPYSh9C+c81MLLEQmmuGcLwxmucfLmBc4RUcICHtiz1TItOkueUF920OQI5goujeGhAVZcOGCtxbo58j10M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a86e9db75b9so430093466b.1; Mon, 02 Sep 2024 02:52:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725270732; x=1725875532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q2I4dRIkqSFBHXNH+YTrYB86Z1Ux+h2Hy12GxNG22PY=; b=S74dgA2V/FfPx2X7bMf2LWH12JeKnwpsrZynZv4lIBKa+TqWoN9JOybZaf8rutz1kS bpFHAxXBRz6zvyNZNzDYeSTLDiOBVHuk8KQ1dnEPKYARPDkvl+4FOCDlZ99Fk7eTIKOr 6rLkVe+KjhSvV+L3W2ywGAZh/H+ZridbeG4NGXDkc2YCXJqobUPQ2Zui3R9VBSY/Si60 u5KbmnpLC/2b1PhQeIegfVqSc4/FexLOMbZ9STyy4MJJnCXWHMwOfoTUVvxRZ3wTBPU4 NgEXkRpP8R4Xfm83v9OT72tAOM1cULqJ77S3ilWFtBkQCwxnN2kcOZSDNjweyZFIIK/Z 3ywQ== X-Forwarded-Encrypted: i=1; AJvYcCU0iQAXxUtgu0iRDNZ9sqXDqdpwSmRZKf+We2zLgvr7tmTFnqpCqaa81H2OV7Ut3udGPmRtCLpYkCmDY8/GJQ==@vger.kernel.org, AJvYcCUCpBqs/zp+2RYPe5Q/9HtrDPNuI7I2dNgS766dbzVAqunqd8xPQTzlql1eWGwnjvfKpwz1kY69XzwyuPxqsA==@vger.kernel.org, AJvYcCWrFoYHHqW+nAeDsDoj86f13rPNMJnFB29v26stCUL12mTy5E9sQBEhECE8kSccUUnlhLWYXuhcrgOXxqIX@vger.kernel.org, AJvYcCWvc0rN2ZsT0CBnxkuZn8+XT4SjSqJ3xF/N51/7AGQgPi1kr8XjOVZzuBUJz9ghcVLMR0pkD4q7TPUs7iQZvZakCmxE4zwh@vger.kernel.org X-Gm-Message-State: AOJu0YxXSVHUfq+aYcWLPUVAFcUyv+Z3r3xS08ycO7D3nlgksspWYjsw 8eRiBB8UFSh8uKgSJxwRWZHXFrvWTs3ED3tAH1ZdDmqfiyQaoBsO X-Google-Smtp-Source: AGHT+IFO6/LBNTCXWadk75nDpQBX+A7ihOlHIj+QlY1/nOmbWN3uEm6pa/by2aQW+3QD97Ru6npvQg== X-Received: by 2002:a17:907:3ea6:b0:a86:78ef:d4ad with SMTP id a640c23a62f3a-a897f84d328mr1005496166b.20.1725270731011; Mon, 02 Sep 2024 02:52:11 -0700 (PDT) Received: from localhost.localdomain (109-81-82-19.rct.o2.cz. [109.81.82.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a898900f079sm535327166b.66.2024.09.02.02.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 02:52:10 -0700 (PDT) From: Michal Hocko To: Andrew Morton Cc: Christoph Hellwig , Yafang Shao , Kent Overstreet , jack@suse.cz, Vlastimil Babka , Dave Chinner , Christian Brauner , Alexander Viro , Paul Moore , James Morris , "Serge E. Hallyn" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-bcachefs@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Hocko Subject: [PATCH 1/2] bcachefs: do not use PF_MEMALLOC_NORECLAIM Date: Mon, 2 Sep 2024 11:51:49 +0200 Message-ID: <20240902095203.1559361-2-mhocko@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240902095203.1559361-1-mhocko@kernel.org> References: <20240902095203.1559361-1-mhocko@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Michal Hocko bch2_new_inode relies on PF_MEMALLOC_NORECLAIM to try to allocate a new inode to achieve GFP_NOWAIT semantic while holding locks. If this allocation fails it will drop locks and use GFP_NOFS allocation context. We would like to drop PF_MEMALLOC_NORECLAIM because it is really dangerous to use if the caller doesn't control the full call chain with this flag set. E.g. if any of the function down the chain needed GFP_NOFAIL request the PF_MEMALLOC_NORECLAIM would override this and cause unexpected failure. While this is not the case in this particular case using the scoped gfp semantic is not really needed bacause we can easily pus the allocation context down the chain without too much clutter. Reviewed-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Jan Kara # For vfs changes Signed-off-by: Michal Hocko --- fs/bcachefs/fs.c | 14 ++++++-------- fs/inode.c | 6 +++--- include/linux/fs.h | 7 ++++++- include/linux/lsm_hooks.h | 2 +- include/linux/security.h | 4 ++-- security/security.c | 8 ++++---- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c index 15fc41e63b6c..d151a2f28d12 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -231,9 +231,9 @@ static struct inode *bch2_alloc_inode(struct super_block *sb) BUG(); } -static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c) +static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c, gfp_t gfp) { - struct bch_inode_info *inode = kmem_cache_alloc(bch2_inode_cache, GFP_NOFS); + struct bch_inode_info *inode = kmem_cache_alloc(bch2_inode_cache, gfp); if (!inode) return NULL; @@ -245,7 +245,7 @@ static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c) mutex_init(&inode->ei_quota_lock); memset(&inode->ei_devs_need_flush, 0, sizeof(inode->ei_devs_need_flush)); - if (unlikely(inode_init_always(c->vfs_sb, &inode->v))) { + if (unlikely(inode_init_always_gfp(c->vfs_sb, &inode->v, gfp))) { kmem_cache_free(bch2_inode_cache, inode); return NULL; } @@ -258,12 +258,10 @@ static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c) */ static struct bch_inode_info *bch2_new_inode(struct btree_trans *trans) { - struct bch_inode_info *inode = - memalloc_flags_do(PF_MEMALLOC_NORECLAIM|PF_MEMALLOC_NOWARN, - __bch2_new_inode(trans->c)); + struct bch_inode_info *inode = __bch2_new_inode(trans->c, GFP_NOWAIT); if (unlikely(!inode)) { - int ret = drop_locks_do(trans, (inode = __bch2_new_inode(trans->c)) ? 0 : -ENOMEM); + int ret = drop_locks_do(trans, (inode = __bch2_new_inode(trans->c, GFP_NOFS)) ? 0 : -ENOMEM); if (ret && inode) { __destroy_inode(&inode->v); kmem_cache_free(bch2_inode_cache, inode); @@ -328,7 +326,7 @@ __bch2_create(struct mnt_idmap *idmap, if (ret) return ERR_PTR(ret); #endif - inode = __bch2_new_inode(c); + inode = __bch2_new_inode(c, GFP_NOFS); if (unlikely(!inode)) { inode = ERR_PTR(-ENOMEM); goto err; diff --git a/fs/inode.c b/fs/inode.c index 86670941884b..a2aabbcffbe4 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -153,7 +153,7 @@ static int no_open(struct inode *inode, struct file *file) * These are initializations that need to be done on every inode * allocation as the fields are not initialised by slab allocation. */ -int inode_init_always(struct super_block *sb, struct inode *inode) +int inode_init_always_gfp(struct super_block *sb, struct inode *inode, gfp_t gfp) { static const struct inode_operations empty_iops; static const struct file_operations no_open_fops = {.open = no_open}; @@ -230,14 +230,14 @@ int inode_init_always(struct super_block *sb, struct inode *inode) #endif inode->i_flctx = NULL; - if (unlikely(security_inode_alloc(inode))) + if (unlikely(security_inode_alloc(inode, gfp))) return -ENOMEM; this_cpu_inc(nr_inodes); return 0; } -EXPORT_SYMBOL(inode_init_always); +EXPORT_SYMBOL(inode_init_always_gfp); void free_inode_nonrcu(struct inode *inode) { diff --git a/include/linux/fs.h b/include/linux/fs.h index fd34b5755c0b..d46ca71a7855 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3027,7 +3027,12 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int whence); extern loff_t vfs_llseek(struct file *file, loff_t offset, int whence); -extern int inode_init_always(struct super_block *, struct inode *); +extern int inode_init_always_gfp(struct super_block *, struct inode *, gfp_t); +static inline int inode_init_always(struct super_block *sb, struct inode *inode) +{ + return inode_init_always_gfp(sb, inode, GFP_NOFS); +} + extern void inode_init_once(struct inode *); extern void address_space_init_once(struct address_space *mapping); extern struct inode * igrab(struct inode *); diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index a2ade0ffe9e7..b08472d64765 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -150,6 +150,6 @@ extern struct lsm_info __start_early_lsm_info[], __end_early_lsm_info[]; __used __section(".early_lsm_info.init") \ __aligned(sizeof(unsigned long)) -extern int lsm_inode_alloc(struct inode *inode); +extern int lsm_inode_alloc(struct inode *inode, gfp_t gfp); #endif /* ! __LINUX_LSM_HOOKS_H */ diff --git a/include/linux/security.h b/include/linux/security.h index 1390f1efb4f0..7c6b9b038a0d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -336,7 +336,7 @@ int security_dentry_create_files_as(struct dentry *dentry, int mode, struct cred *new); int security_path_notify(const struct path *path, u64 mask, unsigned int obj_type); -int security_inode_alloc(struct inode *inode); +int security_inode_alloc(struct inode *inode, gfp_t gfp); void security_inode_free(struct inode *inode); int security_inode_init_security(struct inode *inode, struct inode *dir, const struct qstr *qstr, @@ -769,7 +769,7 @@ static inline int security_path_notify(const struct path *path, u64 mask, return 0; } -static inline int security_inode_alloc(struct inode *inode) +static inline int security_inode_alloc(struct inode *inode, gfp_t gfp) { return 0; } diff --git a/security/security.c b/security/security.c index 8cee5b6c6e6d..3581262da5ee 100644 --- a/security/security.c +++ b/security/security.c @@ -660,14 +660,14 @@ static int lsm_file_alloc(struct file *file) * * Returns 0, or -ENOMEM if memory can't be allocated. */ -int lsm_inode_alloc(struct inode *inode) +int lsm_inode_alloc(struct inode *inode, gfp_t gfp) { if (!lsm_inode_cache) { inode->i_security = NULL; return 0; } - inode->i_security = kmem_cache_zalloc(lsm_inode_cache, GFP_NOFS); + inode->i_security = kmem_cache_zalloc(lsm_inode_cache, gfp); if (inode->i_security == NULL) return -ENOMEM; return 0; @@ -1582,9 +1582,9 @@ int security_path_notify(const struct path *path, u64 mask, * * Return: Return 0 if operation was successful. */ -int security_inode_alloc(struct inode *inode) +int security_inode_alloc(struct inode *inode, gfp_t gfp) { - int rc = lsm_inode_alloc(inode); + int rc = lsm_inode_alloc(inode, gfp); if (unlikely(rc)) return rc; From patchwork Mon Sep 2 09:51:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 13786972 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 462061D4142; Mon, 2 Sep 2024 09:52:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725270737; cv=none; b=DM2pcC7wkeKmGA/U4swMDcoTerQizLgTl3G5GBE7VYMvT1LccsdqUDv6tPFDlt4Pc8l/k6PBsQyI+umJXkrtXMtkoPwGPuvGEsJa/nYbV5uIAKOSivdZhz6caJBIfW8Jsiuhu1BirgDJSsFhD8/5KuaemxsxbLbSiFLqGo7iydc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725270737; c=relaxed/simple; bh=UnnOxysnYIVE0lfzosvVxtlnZhIMcEr1N3hjgvRmdr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e2wF9A4ANOplX0dmrNNB/JXprloe1apqfhrU6uQ9L4tYJ5zOlywrDrrUBTdMbVs9cdZKdMkRpZ8RGTrrP1HRMiX11b2Zu3pruQaBYcFLuI/ZT5B5hnGPb57rHFC4zrtfcnQvgBn4VjvbUNj3cMvIYJFInUyWDSbIQBG0fDsZNrs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a86859e2fc0so453037166b.3; Mon, 02 Sep 2024 02:52:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725270733; x=1725875533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6o9ygZ5FbRqLnsF4xwAbutRPIFsChsjRgZv2/olxe98=; b=wMPC7nXYuYbFMYB0sRUO1ER43b/VdritipfEQscOCkzs6+CaFniE2BawYcT/Ko+yPo QoyqRP2KczI2B5vEECZpg9dPuw4Oez+HkhkWarjmAkv4QCy18HSmP3K7+puctSQJiOxE iaoH+YmlWnsDEo4t39Ko5AHDIFYLvSypvW4ZTtSzEe1e05jKY3ZFbpmMQ/fN/QVN+hPs kU8KthdqCyRGVjohRmkbsMpKpwlLRQ93d881QTBrFxDN8Elnm7JAKF4YybPayaiQrzpi Zol2HNNEDyS+U/wH/2crQmisiAoWXPuxS45H+PuSqfvcUcktMVvj9Vux1M9z2rvoydm4 6mAQ== X-Forwarded-Encrypted: i=1; AJvYcCUH+huCxb2rBZOV0NrgEwMLkBPW7hhGGOvUnJJKBfkxPZGn9TKboby9M0F/jz+uTcn4avC/ZRO+yIXDqSDO9w==@vger.kernel.org, AJvYcCWgO/zRlOMsCHvOJaMkySEinDA2ns5TKNJZsHsScDI7rbJbkE8ZZ4elTN2k0af+wfezhcqNzZZ//EJriTmo@vger.kernel.org, AJvYcCX+2QUhqjZqmtZxmTQdaHpDin8+8ubNo3xGizBLnAjkYDsvNCjKpw41Bz6HegbSsz4OBIOLqEnSEeyIv0zNel5/AzCQoxAY@vger.kernel.org, AJvYcCXMPYp8bc67cT655jr4eAJZ6Qfg4QgG9gWP4EzJZTWA2Flik1W9b7LpQkWFZ32sGl1qRA8uIVh1fuiYE77ewg==@vger.kernel.org X-Gm-Message-State: AOJu0Yx/e6psCkQUz0bzGxj7hXbYp3wYU0gDJ89G3Q3TCeWxY1zfXzLQ OIDL2tUPlZXc2BH8HCwcj0/Q2YtD2ymGQOMuIJUaV3Yh+PhDjg+E X-Google-Smtp-Source: AGHT+IHugKwJ39IPMvFnRChZY0EvVCQYJUWKLCu3bRnc6OhGcrV7kB+jwS2h0M529y96bsLiRTRvnA== X-Received: by 2002:a17:907:31c4:b0:a86:92fa:cd1d with SMTP id a640c23a62f3a-a897fa75723mr976108766b.49.1725270732803; Mon, 02 Sep 2024 02:52:12 -0700 (PDT) Received: from localhost.localdomain (109-81-82-19.rct.o2.cz. [109.81.82.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a898900f079sm535327166b.66.2024.09.02.02.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 02:52:12 -0700 (PDT) From: Michal Hocko To: Andrew Morton Cc: Christoph Hellwig , Yafang Shao , Kent Overstreet , jack@suse.cz, Vlastimil Babka , Dave Chinner , Christian Brauner , Alexander Viro , Paul Moore , James Morris , "Serge E. Hallyn" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-bcachefs@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Hocko , "Matthew Wilcox (Oracle)" Subject: [PATCH 2/2] Revert "mm: introduce PF_MEMALLOC_NORECLAIM, PF_MEMALLOC_NOWARN" Date: Mon, 2 Sep 2024 11:51:50 +0200 Message-ID: <20240902095203.1559361-3-mhocko@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240902095203.1559361-1-mhocko@kernel.org> References: <20240902095203.1559361-1-mhocko@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Michal Hocko This reverts commit eab0af905bfc3e9c05da2ca163d76a1513159aa4. There is no existing user of those flags. PF_MEMALLOC_NOWARN is dangerous because a nested allocation context can use GFP_NOFAIL which could cause unexpected failure. Such a code would be hard to maintain because it could be deeper in the call chain. PF_MEMALLOC_NORECLAIM has been added even when it was pointed out [1] that such a allocation contex is inherently unsafe if the context doesn't fully control all allocations called from this context. While PF_MEMALLOC_NOWARN is not dangerous the way PF_MEMALLOC_NORECLAIM is it doesn't have any user and as Matthew has pointed out we are running out of those flags so better reclaim it without any real users. [1] https://lore.kernel.org/all/ZcM0xtlKbAOFjv5n@tiehlicka/ Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Vlastimil Babka Signed-off-by: Michal Hocko --- include/linux/sched.h | 4 ++-- include/linux/sched/mm.h | 17 ++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index f8d150343d42..731ff1078c9e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1657,8 +1657,8 @@ extern struct pid *cad_pid; * I am cleaning dirty pages from some other bdi. */ #define PF_KTHREAD 0x00200000 /* I am a kernel thread */ #define PF_RANDOMIZE 0x00400000 /* Randomize virtual address space */ -#define PF_MEMALLOC_NORECLAIM 0x00800000 /* All allocation requests will clear __GFP_DIRECT_RECLAIM */ -#define PF_MEMALLOC_NOWARN 0x01000000 /* All allocation requests will inherit __GFP_NOWARN */ +#define PF__HOLE__00800000 0x00800000 +#define PF__HOLE__01000000 0x01000000 #define PF__HOLE__02000000 0x02000000 #define PF_NO_SETAFFINITY 0x04000000 /* Userland is not allowed to meddle with cpus_mask */ #define PF_MCE_EARLY 0x08000000 /* Early kill for mce process policy */ diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index 91546493c43d..07c4fde32827 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -258,25 +258,16 @@ static inline gfp_t current_gfp_context(gfp_t flags) { unsigned int pflags = READ_ONCE(current->flags); - if (unlikely(pflags & (PF_MEMALLOC_NOIO | - PF_MEMALLOC_NOFS | - PF_MEMALLOC_NORECLAIM | - PF_MEMALLOC_NOWARN | - PF_MEMALLOC_PIN))) { + if (unlikely(pflags & (PF_MEMALLOC_NOIO | PF_MEMALLOC_NOFS | PF_MEMALLOC_PIN))) { /* - * Stronger flags before weaker flags: - * NORECLAIM implies NOIO, which in turn implies NOFS + * NOIO implies both NOIO and NOFS and it is a weaker context + * so always make sure it makes precedence */ - if (pflags & PF_MEMALLOC_NORECLAIM) - flags &= ~__GFP_DIRECT_RECLAIM; - else if (pflags & PF_MEMALLOC_NOIO) + if (pflags & PF_MEMALLOC_NOIO) flags &= ~(__GFP_IO | __GFP_FS); else if (pflags & PF_MEMALLOC_NOFS) flags &= ~__GFP_FS; - if (pflags & PF_MEMALLOC_NOWARN) - flags |= __GFP_NOWARN; - if (pflags & PF_MEMALLOC_PIN) flags &= ~__GFP_MOVABLE; }