From patchwork Sun Feb 23 23:57:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Raphael S. Carvalho" X-Patchwork-Id: 13987263 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 F157E13B58F for ; Sun, 23 Feb 2025 23:57:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740355075; cv=none; b=YQz3UIxf3rsdD/pI5irL8IU+khfbu9p3+eR7qiUWnLRNI8GpPcCulFXgj0XxBofV8SBeC9iPwuQVjsbWYx5SS6a0+eWIE+e0jXWD+aFY9i/uSMOj9b7WlvtkR7pgkvszL44eAGWlU58sd4VoYfms8oFY2bVkV+eQd/s/USdNQQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740355075; c=relaxed/simple; bh=7nLZmznjt4Y25tiSorvW7p+/KnVD0t69i2xjc2UpgZo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=kqCQO3LHK8FZe1iaCly6+WY7DOePoHSfSMljBmCdOs7alpGf5nDVv57+eee91Yy8gQ1gP9iZ2vJzTvtfwISl62+uc8NBsBToemB2XUfG2bzQfzjtcbOO5/2Fr6cORYU3FKzdfqgRENvZnt40cDZeC5jq8vlmCDZiczc+0z05kN4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=scylladb.com; spf=pass smtp.mailfrom=scylladb.com; dkim=pass (2048-bit key) header.d=scylladb.com header.i=@scylladb.com header.b=kFiCdBbx; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=scylladb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=scylladb.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=scylladb.com header.i=@scylladb.com header.b="kFiCdBbx" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-220e989edb6so103161265ad.1 for ; Sun, 23 Feb 2025 15:57:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=scylladb.com; s=google; t=1740355073; x=1740959873; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sE2GEpXJe9EB8mr89rPCKxGhWxzC9G93uMNlCaajPCo=; b=kFiCdBbxg5jTIKB24iP8bf2B1LHChl/xrzmeuaQK1abm05yKLqrPAZ7d2xerpbXG15 AfpkFg5QehNlGv4V2Ojn0uFJnKtloIC31Puz730XVj1tdQXdc595mD6ZAVFEcsgiggn4 DgxfDuXKLIXsWffnGfkxH1iWTcI0ZjUaP8R+nc47PKUcx3/EZ5zaNPnQDDtYgBUm1ehh S4qclwl2aUA7ghnyEdyaEuQEiL/RGSdQm/ijDLYIdgUs8RHLKLG4tQDE7ttjBCpJTBdn ek4DaoytnEtp1m84pvj+rbkVhNtnD6l49IcdiiMfR2BAeAhhkwVfazTxpXEb9Ei5Q5dV lp2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740355073; x=1740959873; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sE2GEpXJe9EB8mr89rPCKxGhWxzC9G93uMNlCaajPCo=; b=G65Rmwqvkhtg3vwvYjh9+VuTxHyxqyDF7YTQQVcpvHWuc7mo648+XlkOMEpKJrnkC/ iQeeMFrg35fYGPe6bVW8/95RlDiwX1GIsjTqtSrFr93m3ofJP/OxCIY84eSk8UN8ciT8 36UV20GZ7JBfTWjH8ATMAr0eaX0/gFipKYpzfEOkpuPdVqBSLZfNadc9zjaJTMkNn7P3 B9BA9OTo7Q3nRHH6L/GYUsPmQpMETyacWd/lps8nzJv/yDZZUVGksHiGejknk6ivL0Y/ GKCIESPmcKwQfivGM4KUlyxCLnHQ3nWYeiZFBcUeO8MEvY+bWXzZO11Me8hsnK2U2EmH 2YzQ== X-Forwarded-Encrypted: i=1; AJvYcCWT5FGbXXEWnzyVc1kCi11MrUkPwPVWKVchq89Rt8jlEiWyp0PG/sxZWBBiklWWvYhqEItn+tEUyzQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyRV2ISCwgIXsDUaOVh5ofOCAeZFU2SRbewHOTmAR6DaODMes+/ ris6T7T7A++iJxsbxts24qlKZd/7D/Iia5V8sepozKARXo7X7SVQrfzQIEHPkL/Idsrso2kMg/n YccaVQW0mCXwMvEW2HdXAwZrVJ5fcO+4DQ5i9AKY+xHpHqZXoXOUDOk9WwbNaHngRhBFDpfnQ+T MzNH5+SOx1hwfhsPHHW91oQb7SAOEzG17TJTMzDe39xqOmcgujqhfKzwSBECtDC1lQpRZlCyPCV kQRGVqyAQ/JVH0YT75aHjqALaG3esVw+np1jBlpYeQcEX67nOadErz2wuni3ZvyCLfMQP+Aaz5/ 7pZZSOOA8x0DK9vJfhqHVdyo6n4ihxRT3w== X-Gm-Gg: ASbGncsn24CdRLq9S0osslgqGrj4ddaTQ/qUIWgf0yvRySTrN1VFspTRWok0OYAOHRH WK7wzg1aY5yNQs3sgDmVbBIjVk4bRGH0OfS+RyLsfB8yvU4VBfR0zlPHeo5SrqqrnlfM9IW9ek8 ULOlcQLw390UZrXGRgeahlM7J8gITI4Mm9uqk6FG+0wB8iqge3/y+ASjMkr+6L7bHdDgvJa5GQ2 vgZR+pp3Dun6emCEwmw2zQgbaIFJcQLrbzj04o1O8MF7NaKJnyuOMPA7JvjvpX0Y2OE+vEZ2vUJ AkzFq0bZFnuhljV3fv1lO1Xqj3Jo8w== X-Google-Smtp-Source: AGHT+IHw7//riiQsuVb5lGlLqWGLYjjfKu88D1cSIxhylJZNIWrjx2825KOCcROlA96N4e6VRrJx6A== X-Received: by 2002:a05:6a21:6004:b0:1ee:c6bf:7c59 with SMTP id adf61e73a8af0-1eef3cdcb24mr19667494637.23.1740355072878; Sun, 23 Feb 2025 15:57:52 -0800 (PST) Received: from localhost.localdomain ([2a09:bac5:7a2:24be::3a9:14]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ae0950ecb95sm9641091a12.41.2025.02.23.15.57.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 15:57:52 -0800 (PST) From: "Raphael S. Carvalho" To: linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: djwong@kernel.org, Dave Chinner , hch@lst.de, willy@infradead.org, "Raphael S. Carvalho" Subject: [PATCH] mm: Fix error handling in __filemap_get_folio() with FGP_NOWAIT Date: Sun, 23 Feb 2025 20:57:19 -0300 Message-ID: <20250223235719.66576-1-raphaelsc@scylladb.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CLOUD-SEC-AV-Sent: true X-CLOUD-SEC-AV-Info: scylladb,google_mail,monitor X-Gm-Spam: 0 X-Gm-Phishy: 0 X-CLOUD-SEC-AV-Sent: true X-CLOUD-SEC-AV-Info: scylla,google_mail,monitor X-Gm-Spam: 0 X-Gm-Phishy: 0 original report: https://lore.kernel.org/all/CAKhLTr1UL3ePTpYjXOx2AJfNk8Ku2EdcEfu+CH1sf3Asr=B-Dw@mail.gmail.com/T/ When doing buffered writes with FGP_NOWAIT, under memory pressure, the system returned ENOMEM despite there was plenty of available memory. The user space used io_uring interface, which in turn submits I/O with FGP_NOWAIT (the fast path). retsnoop pointed to iomap_get_folio: 00:34:16.180612 -> 00:34:16.180651 TID/PID 253786/253721 (reactor-1/combined_tests): entry_SYSCALL_64_after_hwframe+0x76 do_syscall_64+0x82 __do_sys_io_uring_enter+0x265 io_submit_sqes+0x209 io_issue_sqe+0x5b io_write+0xdd xfs_file_buffered_write+0x84 iomap_file_buffered_write+0x1a6 32us [-ENOMEM] iomap_write_begin+0x408 iter=&{.inode=0xffff8c67aa031138,.len=4096,.flags=33,.iomap={.addr=0xffffffffffffffff,.length=4096,.type=1,.flags=3,.bdev=0x… pos=0 len=4096 foliop=0xffffb32c296b7b80 ! 4us [-ENOMEM] iomap_get_folio iter=&{.inode=0xffff8c67aa031138,.len=4096,.flags=33,.iomap={.addr=0xffffffffffffffff,.length=4096,.type=1,.flags=3,.bdev=0x… pos=0 len=4096 This is likely a regression caused by 66dabbb65d67 ("mm: return an ERR_PTR from __filemap_get_folio"), which performed the following changes: --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -468,19 +468,12 @@ EXPORT_SYMBOL_GPL(iomap_is_partially_uptodate); struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos) { unsigned fgp = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE | FGP_NOFS; - struct folio *folio; if (iter->flags & IOMAP_NOWAIT) fgp |= FGP_NOWAIT; - folio = __filemap_get_folio(iter->inode->i_mapping, pos >> PAGE_SHIFT, + return __filemap_get_folio(iter->inode->i_mapping, pos >> PAGE_SHIFT, fgp, mapping_gfp_mask(iter->inode->i_mapping)); - if (folio) - return folio; - - if (iter->flags & IOMAP_NOWAIT) - return ERR_PTR(-EAGAIN); - return ERR_PTR(-ENOMEM); } Essentially, that patch is moving error picking decision to __filemap_get_folio, but it missed proper FGP_NOWAIT handling, so ENOMEM is being escaped to user space. Had it correctly returned -EAGAIN with NOWAIT, either io_uring or user space itself would be able to retry the request. It's not enough to patch io_uring since the iomap interface is the one responsible for it, and pwritev2(RWF_NOWAIT) and AIO interfaces must return the proper error too. The patch was tested with scylladb test suite (its original reproducer), and the tests all pass now when memory is pressured. Signed-off-by: Raphael S. Carvalho --- mm/filemap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index 804d7365680c..b06bd6eedaf7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1986,8 +1986,15 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, if (err == -EEXIST) goto repeat; - if (err) + if (err) { + /* + * Presumably ENOMEM, either from when allocating or + * adding folio (this one for xarray node) + */ + if (fgp_flags & FGP_NOWAIT) + err = -EAGAIN; return ERR_PTR(err); + } /* * filemap_add_folio locks the page, and for mmap * we expect an unlocked page.