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 9BB96CD3420 for ; Sun, 1 Sep 2024 16:26:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ACE258D004B; Sun, 1 Sep 2024 12:26:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7EE78D002D; Sun, 1 Sep 2024 12:26:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9466F8D004B; Sun, 1 Sep 2024 12:26:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 767E58D002D for ; Sun, 1 Sep 2024 12:26:30 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E2EF81A15BB for ; Sun, 1 Sep 2024 16:26:29 +0000 (UTC) X-FDA: 82516697298.21.4BF9633 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id 1AF7F80018 for ; Sun, 1 Sep 2024 16:26:26 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=jQdY532a; spf=pass (imf30.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=1725207895; 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=SZOi1Xv+LDqF8KSfVrXHQJVC/ZS8DC2tncrz4FlONak=; b=riWfQz24owVjaCpGoYKu2T93aqilXjfrrZfnvS56ZJkM1HPP3sYUzZ4IFaiQowp+TQCK/9 ZHg+Err7p9/rhi2FMcYQtfrrYqucuH69Bkc6AgA8YtKt5a2QMUoZtssgAe/dQdsSvJ8/ui btqayT1yCXd+CySMU2KWHpOEOclemWk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725207895; a=rsa-sha256; cv=none; b=FrPIg+iotFHJt3HPbG0M0fOlQDXEFenxtdJU/7UmvnnY/InvncQSAc1f9Xhy8bhD7ijWnS Zua2XC2LmLoB9IhrF+U5iC7fOY+sGI/4a9LJjiD3cSacXUP48V/a4m7N/RHo0+5ksdWrGp cq8D+aqEtiD2dPMeeV+c5AxRFiUJvLc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=jQdY532a; spf=pass (imf30.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A4E495C41F7; Sun, 1 Sep 2024 16:26:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FA9EC4CEC3; Sun, 1 Sep 2024 16:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725207985; bh=wYt3P5BbUTBvecX1udspSjS/+owMsoREYiXBYb1BtRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jQdY532azJHo8P72rPWxfnRfpaV/kkUVuhPbdI86qa1TvFtl2CzooHxqviCZAjl3r N4oSheOStngo8oGH/MQvB7sQU3V+KIyseFPnoXouhtO1e23FZa/S/ZM2AkmNr5RA78 FV+wx0qQc5XxGAng+xKN+f/zfZmsynPbYtz4I+H4= 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.6 39/93] mm: Fix missing folio invalidation calls during truncation Date: Sun, 1 Sep 2024 18:16:26 +0200 Message-ID: <20240901160808.833325956@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160807.346406833@linuxfoundation.org> References: <20240901160807.346406833@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1AF7F80018 X-Stat-Signature: st719u9n78wswif69hxfp8p767czk3mp X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1725207986-163281 X-HE-Meta: U2FsdGVkX19ZOaBp77tsZsWT/0sHOLrE6JGx8Ulohq04NigfLyGAF7BlEU9oqHfemXsiCoj5hBkZBn92XLYqDYpw8HKVjQypsmQH03S7Adq3gkTh5nVxLsHgKF3NI+Kjxubtm64fdSvAUFMa2m0nov0A2r8Z5WZgi9j/CQL3gsN9DghRiUgilgXGpQjNL0lT0b2NdnO4Efy1PlNjbEKLmcmYHO9SCySRxOcB7KZeYU2AAMA1EL3JH1CSV+0BW9HeaBDMBPH03KDF5S6DGD43b2mKRX8IsaqM7b3p+QXuunxGC+pvV+BhVn5qBIrrIi6SRQ3wFwEXXcrfRCw62Hh7E9NqjasbNQmbQUutDAZZai7tUFXPBLLUajDA1uHSJMcWPyBE7olrbHUgYw3wzYXQJRYdrDFTw7ahb/0KptMqmwOoWmabddEkCNAOSCBC2GM6n76XhHEyiRNK6UJUGXIRLzK5231AhbtTbkQ0q++RSD+cMjxC/QH62rT/v70fKE3Np4Oqywyw/F5hyHQiSZgv1j3Iam2gmDPjoM7kjH3vr5qjKgU5diZKf9kxKF7EG5J4Q/cOK/JMoQRI/aA8BGXjX+LauDesX33D5w+8/+Espyd1D8QivUr893t7OvX+sYgleLDpTxnOvIEat3Vsx/eoetvy7nDr5rtZRNXbpbbXzSdYqDJQmWfeEZjbM2Onb6wZ2yDcpGZUVYOOw68dKggbN5uz/P9IKDmamV/znVeb/76otOF4hBTD8jjd9fuIkLxlfMDIC+sUm+VPoafOapOFX4HI0jKlFUwDtfMkS9klmfUr+ddP3ptIgTfuFfbtAAF+yGywoOuCNX1LWB4bzjnj5ba1gfxmL0Ug4jl4q+EPZwKwoReqEq2cPGV/kna8E3HpVgEcnxXGw3A/p4qG7SwZdrpU7PXJK8qEmTPXCU7HjAEi0dK2loIGILJzEIXmR86j2RRBftgCOHTXRl30HQ9 EENxdj8g fqwvq1cIC1J4FwJKvbfYEthvRf6ynwrwR5HDVo2BCyspmrzTeutC3uCp68U2fwSPBp3g/+E2/iO5Cmaz3vPbvWYWlcnqeVPh/fJaOMA9kj8XgHM6d0hii2uS536b3ABoYd0Ac2ncrvv8RiMd5UuO7WTwCcONks6TQ2fMOF7aO/7NOzrEgjc1OOKxQeAEBcX51p9MltIWd3w1xxjrp+d6T5Eqcw22lOYmT8pfVn+SAwzbOq5FSdp1fiz+aEQNTlYj2QSqzeTh4tJwfYKdYHedjTT/p/UQrdJKL1+zQq+h7E39Eig1vWVMNHaZZmmn+jXUZVfDE91AyAQbkWPTwx+HqZGKXBH/zlk0Ol33rfGGc7Z7XL5LfLDBCoAppJrcwleCCl6mc6VUJBm4MR+Y8OxdvF+h/DnW8Jc6iF1no5rwiSO1W5KEQeeZj0hwUR/4w9f+Gy6UzU3K+18/Pad5Gz9zHzpkbTWEje5fCi9ICQrB6Ysbwwnx+KmpfNh/HqnrSGwc95HFIr3Uy36bgfqHIYTN52NFgrYInGPWGr54S 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.6-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 8e3aa9e8618ed..70c09213bb920 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