From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D36C934DCCE; Tue, 26 Aug 2025 13:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216042; cv=none; b=jhjqucz0G15Z7t9d06M5ySnegOLQ4cx8bY6coj/uLXDlUrcyZqoLmLGVXmrGFsK6Yv1QdtDg4odtoNvxjXfQm/dNcCwp2RhjLvf5bFYGOxmlt/20MCMFYj7lvmVWFPgAhaoLwddnIryB0G4cQKMaX3dqWFjVL3ixkDsbUZqIlQY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216042; c=relaxed/simple; bh=gIV9d0RrE+d1EIP4gaJdk3QdserPs4cDWR0GTqsfg4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ROoKE80sRx6u3AfN9Op6UZp+/mDqU0W5T/myJfb3FN9O4inbL0gv8VjIL4XlRHKcPjz9oa+/oFoUlnOVeilY3HUqIeeNGi+zKwCU4wYZBxex6ydXMW+aOYA8K/sQEwshfXqKkHr6fk4vqvSMKhRO3YngwWLu2g6YxIaLXw+9u3M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0w1yjYMA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0w1yjYMA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63D1BC4CEF1; Tue, 26 Aug 2025 13:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756216042; bh=gIV9d0RrE+d1EIP4gaJdk3QdserPs4cDWR0GTqsfg4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0w1yjYMAHQgNRH0czt+5dl8odjYXancXCunKRy+w/rBMQ7UCjGjTiwBlH06DJrxFA qLr6l2EyfoLju311LrXQNWEujJn0RVuaxw3QbnqdcR6zKezmW+XFcJVcK1Wp8yTqhj iWU3LOd9eBj+FulngqWphdbgZ97DRblQLDe2OB90= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Trond Myklebust , Benjamin Coddington , Laurence Oberman , Jeff Layton , Trond Myklebust , Sasha Levin Subject: [PATCH 5.15 230/644] NFS: Fixup allocation flags for nfsiods __GFP_NORETRY Date: Tue, 26 Aug 2025 13:05:21 +0200 Message-ID: <20250826110952.114070806@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110946.507083938@linuxfoundation.org> References: <20250826110946.507083938@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Benjamin Coddington [ Upstream commit 99765233ab42bf7a4950377ad7894dce8a5c0e60 ] If the NFS client is doing writeback from a workqueue context, avoid using __GFP_NORETRY for allocations if the task has set PF_MEMALLOC_NOIO or PF_MEMALLOC_NOFS. The combination of these flags makes memory allocation failures much more likely. We've seen those allocation failures show up when the loopback driver is doing writeback from a workqueue to a file on NFS, where memory allocation failure results in errors or corruption within the loopback device's filesystem. Suggested-by: Trond Myklebust Fixes: 0bae835b63c5 ("NFS: Avoid writeback threads getting stuck in mempool_alloc()") Signed-off-by: Benjamin Coddington Reviewed-by: Laurence Oberman Tested-by: Laurence Oberman Reviewed-by: Jeff Layton Link: https://lore.kernel.org/r/f83ac1155a4bc670f2663959a7a068571e06afd9.1752111622.git.bcodding@redhat.com Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/internal.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index a6d0b64dda36..76605eb93609 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -581,9 +581,12 @@ nfs_write_match_verf(const struct nfs_writeverf *verf, static inline gfp_t nfs_io_gfp_mask(void) { - if (current->flags & PF_WQ_WORKER) - return GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN; - return GFP_KERNEL; + gfp_t ret = current_gfp_context(GFP_KERNEL); + + /* For workers __GFP_NORETRY only with __GFP_IO or __GFP_FS */ + if ((current->flags & PF_WQ_WORKER) && ret == GFP_KERNEL) + ret |= __GFP_NORETRY | __GFP_NOWARN; + return ret; } /* unlink.c */ -- 2.39.5