From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 156BCC021B3 for ; Mon, 24 Feb 2025 04:14:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15C106B007B; Sun, 23 Feb 2025 23:14:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 10BEC6B0083; Sun, 23 Feb 2025 23:14:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 020CB6B0085; Sun, 23 Feb 2025 23:14:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D7E6A6B007B for ; Sun, 23 Feb 2025 23:14:15 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5457F1208F8 for ; Mon, 24 Feb 2025 04:14:15 +0000 (UTC) X-FDA: 83153520870.07.81E65BB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 3759880005 for ; Mon, 24 Feb 2025 04:14:12 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=pVRthAn+; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740370453; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=JoCq6Jz0t//yAHagLSB8UGfdvTzUw8oFXQk1EBIFNr4=; b=GgRlac2wIKwwcN7PGRKjwFZPrfwNG+eyvdO9iJaSBLZGtvTX4YiMLO2YHnY21zU9rtO37j KmAPUAJzOCcNZkxYNxnKEXx49aX+KDQBZXxcAbVxjS5KMqhL3Mp3Ua+d0o8iHu+1JhHERX fxj30H4U/nFVLIjSaQ2zgx/TjQBGcv4= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=pVRthAn+; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740370453; a=rsa-sha256; cv=none; b=PxqAcYny9KjhYimH+YR/R4EH6hJu4OBF7CGLDuDXGS1LKFCMigXkFuF0UqzXgWQVOeXpb3 UGOCpF/FzUjuHAQPKBYGL82Z+6HE3wDfXmT8gQBr71WEmCKU7dDImVB7lG1nL4cOhl6WBO BlxTnRh/0rusEW6vGRj0Lo9sjDuRAzM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=JoCq6Jz0t//yAHagLSB8UGfdvTzUw8oFXQk1EBIFNr4=; b=pVRthAn+XtisXAj11CGbPJxxZZ DN0KL99xN6g/0s+OJJ70cuDGYu8lzWYZ2On/bWtXlRJQBQEajWRh994WtYsGVUXbne6hWZDaqy3oW JJKVqPskYuBZ+QvxwvhnC0Ok9EBsZt8DM3ECakjlc35qB8gIZcxaVY7KriVEKraU2V12TAyItoX3V 9eiS+YicI+T9uLmiF5rv4qOE3LUfC8bvQiF0b2WM3KprjaSufIPE/n2u4M2WvIXWbK9JMjqlFfKIk uwYpeRS/cLfg7nEIdUggwWutRtySsC4eWYU/BPvfsNDou043NwBVipPXUxhX4Turo6lqZfY21qlHr Z6gLMiMQ==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tmPr8-00000005mAP-0DQO; Mon, 24 Feb 2025 04:14:10 +0000 Date: Mon, 24 Feb 2025 04:14:09 +0000 From: Matthew Wilcox To: "Raphael S. Carvalho" Cc: linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, djwong@kernel.org, Dave Chinner , hch@lst.de Subject: Re: [PATCH] mm: Fix error handling in __filemap_get_folio() with FGP_NOWAIT Message-ID: References: <20250223235719.66576-1-raphaelsc@scylladb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250223235719.66576-1-raphaelsc@scylladb.com> X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3759880005 X-Stat-Signature: 9f5hoctoib6d5t7gg976en4sqxmghwj5 X-Rspam-User: X-HE-Tag: 1740370452-958310 X-HE-Meta: U2FsdGVkX1+RH+nFdDtXi9EhMC/n/fobWPht/Iub+75Oy7BHg30DDDIaTrw0ZAlXmKBctXEbZIzEq+ymDwvm77ssseXUu6Qz/rPDrWL1nDuQOfu5WGA7nHGSoFJ/Snqtq4pJ0C+n7W1tQb/zVjbrrGFgqW8xi82XaczDJySIC4sn4CxqAYsie3Bd0u+EvY2ogRHxitxf8xPXuAXvTLBzjXklGU6iL0+bEQskeGXUwLCMEd8fr8vhNv7+iNyVfROVi6c4TadMWRHXa6InI0L8SX7tYEgzSrZiSCeCtYtYwDXY1OKEI8dPA7MvckFg/0AAeILZTX2AWBprF7b1Rav3Wx16AetprGrq7jT/MqCB2ePdTrGLMCWLbNmnKuHcNQwDWxv7k8vFZDkRXTddhCB7+p+pJjmpRGf958jHm/sdMOatWkOaZLZznksTfBZq+66H6KRfa3BSyqPFN/UPvC6z7MbGdTtnBwI4CtfB0Lhey3AcV0n7KmaLpyQulT3kl6S/fXk8lR3qLVzyVN/8XgWMli0BCHMGWtazKsJ3HwYnypYpu3Kyn+Hoj602EI4tnEw62pOf7q27WkipcKpNKwYkIrI4qYn81S7TGuI8AzczNVWM3nZaLSIhAT1UXxlU2DNQ3wNkFTlyynVFj2bWYKodnUhWJcGoycmczlH3jpTJ+o2+MsTLen0Nce61XhNBnUlOo11JzqWCP5Y9ipzlyouumZGvzSYJrsko5ltgA4x3USNJyUTvxeFNJvkHD2YFlqydYIH6PAUAGk7D7NVskKbz3rf+57PFHp9Y7TWhXh0SeoAMqNB1unOXg1d8BLRdxQMf1V8dvbrT2iTRQv6xzZ5+KXYA1ZUriZppg+OL2Uq7s8ktEUDed/1n6nVFc3wZffGa/rIzGk287wLHGfl2pNnlO3phsm3oUJca7H3M5s1ejRNTdAzSgk9gn1ZDbuSQBn+K9EEhUdVFigZKsVsIMNX Yl5BMpaF AjVhHAqHf1gYhmuJ0wU2loFV+E1tH6Y0CjuwTheInbIBedNshnkaJIKwrCh1cTWsotcDq0BF0/dlURYApmtcCQHzaOXduPAj5Kam8+05Aj8nwUrfJChHVmhD9UVm1iWunmgVDW6S9Px7XZrW4cyltW0F/Ww7ji4ibt6aFy56XBGHVUaFSugQa+tdYEsH/Hk+VkMga7YKRUdXlnKR3KpiUws7VeYPqyzQpYxLOQisLOFAMALZc4NQKyKcZE8Au1GsyI6C8U21hFBfKaVHp8udRCzy+Q3LMLc8Asv4+J11JXuBIKYGTO8IG2oOL7zMTYhwd/F0fIe1zIHb0UT0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Sun, Feb 23, 2025 at 08:57:19PM -0300, Raphael S. Carvalho wrote: > 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); > } We don't usually put this in the changelog ... > 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 Instead, we add: Fixes: 66dabbb65d67 (mm: return an ERR_PTR from __filemap_get_folio) > --- > 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) > + */ I don't like the comment. Better to do that in code: if ((fgp_flags & FGP_NOWAIT) && (err == -ENOMEM)) > + 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. > -- > 2.48.1 >