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 0A32F2FFDC1; Tue, 12 Aug 2025 18:55:09 +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=1755024910; cv=none; b=iHc9VTwlmxAkVy5MMNQxqH8bXEMnG4Gowc18TNe7EhI3EFLD9CMGoscGsMFL9vkbReo/wDJGdBAqiMiJfOnd46zjiBo37VtZ/82YZnyS6OXFMMkjNKjLL1/53qiVEDKhOMgU3e8vujkUWzaq7a17LSiMX2PvqXMo3W6URyOLnkM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755024910; c=relaxed/simple; bh=kB4lEqcvFxFvePT+dJlShjFq3bXai9y4Va2rSrdh/jk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NYbsFnuIvvoaOB6ZL7Qdmy+bY0z9mtOI3bIK1DbeCnXaY+IY86Rj+KvENyF5rVkC6PFsRroXG7Mb+/1X6Sa8k1mRcXhTB5fKRJZY7onbij93qiwZ1Yp7HYKspy0m4sJcC/tu16Cnh4Ov7r0EDSTx71WeXdbXCzemG/iQXOsytoo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=o9Wj21GZ; 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="o9Wj21GZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1ADC3C4CEF1; Tue, 12 Aug 2025 18:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755024909; bh=kB4lEqcvFxFvePT+dJlShjFq3bXai9y4Va2rSrdh/jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o9Wj21GZkyimmNUOgg1WgEhGXCOP/KDViSVerfyvyt3xvHzj0oBW0NgQf3oM1cY17 r5MH3rszVI0wPmRNuYiRZBApU05cI0zF8IU/fLSezKAijSqnfDVzZrnsMpJ3+rvHns o/XJJqYhoSgcxQ5aJ7YK6IWseh9M+OGNZdkPjR+k= 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 6.16 512/627] NFS: Fixup allocation flags for nfsiods __GFP_NORETRY Date: Tue, 12 Aug 2025 19:33:27 +0200 Message-ID: <20250812173449.410462948@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173419.303046420@linuxfoundation.org> References: <20250812173419.303046420@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 6.16-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 69c2c10ee658..d8f768254f16 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -671,9 +671,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; } /* -- 2.39.5