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 EA7F2C54FC6 for ; Sun, 1 Sep 2024 16:46:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A8808D0051; Sun, 1 Sep 2024 12:46:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 756498D002D; Sun, 1 Sep 2024 12:46:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61D6D8D0051; Sun, 1 Sep 2024 12:46:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 43E8F8D002D for ; Sun, 1 Sep 2024 12:46:49 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DAD16C15A1 for ; Sun, 1 Sep 2024 16:46:48 +0000 (UTC) X-FDA: 82516748496.25.FB8C25F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 0E7C312000C for ; Sun, 1 Sep 2024 16:46:46 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=Imy2Wl0n; spf=pass (imf29.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725209160; a=rsa-sha256; cv=none; b=EKJnPdl3wtVLodeIyUVmK/5n5qjHTeuPzolv+jIYUM0/z/qBVxsRdOHzLQVWj67HpUPd+H ejJ5qqr2UQYtR+gAy9ls+1oGKrFMyZFXQZkidPK6rcdSqnH/RJ+Z8Z1WQNYV97hyZvVz2R xfthiKedeXZPM6QABAjRQ6vNbyj7zgI= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=Imy2Wl0n; spf=pass (imf29.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725209160; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nali3fafCvpyhqHqvFqMN5cF3m5k/Rcqc1PsJQAd3hA=; b=lrhYjLQw6mC8lLPtUxgqFXjD3r8pn1gM5ElvkERMxLJxiGkJuP8SVV6wxHfo3GWMkJuL2f ZZUGzni8i8/U1G0IxwvbDfrnVbS91PQSpvSyP/LbSfe4VWJMAbHSId5hBIYtQM21ildcM4 AmrFqvKwcPpSANsfz2YfLfQZcHbuDDI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A6EA65C10C2; Sun, 1 Sep 2024 16:46:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E4ADC4CEC3; Sun, 1 Sep 2024 16:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725209205; bh=AIWuaP0FrBoeDCiIM5y4X1hGyiKLwvSYT7PGUP6W5LY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Imy2Wl0nLS+aV7rfxa/mSNv8i98KwDbV5dx5BMC02KXgPs4E3x68OvwwOSWPsMPNm 4tkJIN8HvOnrykoBCHHVJGyTmfPDyhvyc1VJaVYkb/R4XHARd82h5zkRYkRYJC3Pn4 56U6W/+QhjblfzHGy9YLowZX3IaUTNsV9tzW1IF8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , "Matthew Wilcox (Oracle)" , Pankaj Raghav , Jeff Layton , Marc Dionne , linux-afs@lists.infradead.org, netfs@lists.linux.dev, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christian Brauner , Sasha Levin Subject: [PATCH 6.1 34/71] mm: Fix missing folio invalidation calls during truncation Date: Sun, 1 Sep 2024 18:17:39 +0200 Message-ID: <20240901160803.179512721@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160801.879647959@linuxfoundation.org> References: <20240901160801.879647959@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: mejumcko5ggygztichu1jwjbxry8z73b X-Rspamd-Queue-Id: 0E7C312000C X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1725209206-707521 X-HE-Meta: U2FsdGVkX19Ak+mHDBJgciViGRHw8cLzTYrzFSH2wZPlxPo4/rp2ofHBaSJq8cgNySedapCTOmhhl++/6dOzrdtpiPe2dltBjCoqt4cxnFb61YGL082oYOKByAIh4eZX17TPZZiD0fAX4DToSlbiGuKKzFVAmoDTSfN14EhU4MTbPZ7DT3Ru4B5XYdlfB2aPQnpS0eA5izqsj5M56cpHxe3KZ0Wr+qZ0ABfRQ4OJy7TBcxSVrGtd977Qk/LxvSqeJ5fn86ePZ3zWs2CrsSSeXLSEfRE+qpPToCkrB8HOTepsDcrNrpXXx5WbSN14+o3RKdL//0/URZBr2qUjKBEB53Qya0xSJPOnbnQiYAobm5SPb4GyPwd5d8WaO0eXiQRND3D7fIlQ7xmfq7OIVPeWWVGjAT50uG4Ij7JY8hXO9pr8S0eKDBADjDd8sW3F/AFQy4t2BwETWjcY6kQU/3x0Aiakoq/PsODw0lADVV1STn8+kA3RoeHK9f5V0O0ywKSzxzPpH0WFEcSK8hWt2cjwVTSlrZpfujNJydOSz8qaZYAsq5IqymiT4ZeTjct26MnnAdvKWLsqx9KREm3bDDPzdYNN4010ZMKPrkHU0c7AwiXR7ukaPycmgNhIifGbAWFoV9bTYUpqAFOkQHgGypjPTJ3i1GPFZWk20fwhvbHoD7fBD4DGHQrFMU/5AMj+01g2gdSjteldGGtFxzmtva69zUTmCYBYMSDfvHtNFXG7PzjJM5Kg+oX1nOlgG/ZErLsSZSWGm5WYIud+0ZnZjb88+QgBRK/aFJW2ZasSVbmfj+WiNXY67zHhb2+vUEaUmNV048VVZzFdFDiiZuKg/CaYc+QKD0bguQOSzIIe9uhYvxKeCVVvh5QqK5p1nqrY5syy+3e/cgsOsbFd5bvfY5X2/m6JnpQgnD8+AbuWCL28nHjBJQixb1ATWmcx7kmSWRENHNNxRNZDBzUi0EmDjdo lpF2s4Zt 44S63Q1AcBNYGOA5mjx59ohD+VJJnTOIEYQpc2xz/R6zCCr3zjkvrFux6L4DBMvpVsQ+Ro5LhuT7m91SahfkHHyyxFYqQYo/9axFvVN8Nte+CuZaiCnOqTEfppkt6JjN0zYvsZJbPBg+M9o24/CPWEhEGW/FyuOeXqBGEhPvjZ9jbqyDs4Sdf0XYx98UFYgypc113CHOwDCyAsYQCA/VM1gB85nWQy55Yw0cK4+chxUU4nEKF7GREv8ihhjNpS5nMJs6tQwVXHOli375AuNdUinCKe4sKiMzAvLEXXP9o3LfQPvfn41KTdZL9mflxULb0qBPxvGNPPDXsH1Ckp8TOFgeMeeSiw3TUJ3xJIRspJcEQSIVd7+QqG7WVI17krL3k2wcKxg7SmjRJxITLDLVyyS732osio9SpxihfQQGgVxyPBUJ2i1dFirsU143TIAw1SJlwSlDO5uqgQNExEb3akwWpIEnpSh+UZLChbi7s+j3RSkWgXeE9+j0ih+ArHrbDOMBWo4JA0MNU4yuAunKFx6ic2/7fFTR7P+DW 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: 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 0aa2e1b2fb7a75aa4b5b4347055ccfea6f091769 ] When AS_RELEASE_ALWAYS is set on a mapping, the ->release_folio() and ->invalidate_folio() calls should be invoked even if PG_private and PG_private_2 aren't set. This is used by netfslib to keep track of the point above which reads can be skipped in favour of just zeroing pagecache locally. There are a couple of places in truncation in which invalidation is only called when folio_has_private() is true. Fix these to check folio_needs_release() instead. Without this, the generic/075 and generic/112 xfstests (both fsx-based tests) fail with minimum folio size patches applied[1]. Fixes: b4fa966f03b7 ("mm, netfs, fscache: stop read optimisation when folio removed from pagecache") Signed-off-by: David Howells Link: https://lore.kernel.org/r/20240815090849.972355-1-kernel@pankajraghav.com/ [1] Link: https://lore.kernel.org/r/20240823200819.532106-2-dhowells@redhat.com Reviewed-by: Matthew Wilcox (Oracle) cc: Matthew Wilcox (Oracle) cc: Pankaj Raghav cc: Jeff Layton cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: netfs@lists.linux.dev cc: linux-mm@kvack.org cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- mm/truncate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index 0d4dd233f5187..96e9812667db2 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -174,7 +174,7 @@ static void truncate_cleanup_folio(struct folio *folio) if (folio_mapped(folio)) unmap_mapping_folio(folio); - if (folio_has_private(folio)) + if (folio_needs_release(folio)) folio_invalidate(folio, 0, folio_size(folio)); /* @@ -235,7 +235,7 @@ bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end) */ folio_zero_range(folio, offset, length); - if (folio_has_private(folio)) + if (folio_needs_release(folio)) folio_invalidate(folio, offset, length); if (!folio_test_large(folio)) return true; -- 2.43.0