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 787DDCD3420 for ; Sun, 1 Sep 2024 16:33:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2F128D004D; Sun, 1 Sep 2024 12:33:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DDE228D002D; Sun, 1 Sep 2024 12:33:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCD298D004D; Sun, 1 Sep 2024 12:33:02 -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 B05D88D002D for ; Sun, 1 Sep 2024 12:33:02 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 298FC1215E2 for ; Sun, 1 Sep 2024 16:33:02 +0000 (UTC) X-FDA: 82516713804.06.872962E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id 48CD920011 for ; Sun, 1 Sep 2024 16:33:00 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=C2K7dAMo; spf=pass (imf13.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=1725208287; 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=N09kDcjYwOgUdsGD1xb20GDZOuAAsr0wk+9vcXBxvrg=; b=WS60SQE4qr7KjDp4uR/CTKDlXyCLRQTka7DfMMsVKxPtw0XuSGfFecS2stTNPoFoxCWUDC uvzgaUp60AotwE4GUEG6qndAxO6KE1AAJf80f82XAvyLTqvsBnZ51ta4ZIxSDtmXLEbFJI oagag6PE4Q4Y8OzPC6hU0i3MJflZPQo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725208287; a=rsa-sha256; cv=none; b=K1MF8uXU7ksuD7QmAWIWFYJyCccL31Z11l/fNoDagn+2m/U8LdW99SGh83oWQV56vIekwe 05+WWzQGVzmUFCPyTZlXUplpOQ40QoqsDhvepxF4QfTajwDkMB/ZHKVseIYG7tI3gR0pGo uDYnRo8zAyHgx8/0w/HVLyJn8Lg+CDI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=C2K7dAMo; spf=pass (imf13.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 0C2105C4698; Sun, 1 Sep 2024 16:32:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E9A5C4CEC3; Sun, 1 Sep 2024 16:32:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725208379; bh=UIALWQ3/FCQWvFNh2VqExjMGio+ih0PHhKLoO5IhNRw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C2K7dAMof9gKHeZ96HH3T/jNjriTjp+Up1X7jjwt1eRaLpDbNxE5gwJfkFtEELmOo Pc9i2TRaykVg2oVK+HUnPlzdV7mfcah1/6TldRIwxBMVkWDk4JYFmf+czFKeIAq6by Ig5Zn+YAUs4SDSMuKRoGEAWyzcIRgN10yRSfv4kU= 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.10 065/149] mm: Fix missing folio invalidation calls during truncation Date: Sun, 1 Sep 2024 18:16:16 +0200 Message-ID: <20240901160819.911773395@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160817.461957599@linuxfoundation.org> References: <20240901160817.461957599@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: 13ut7pqs8gifjq5fbm7jwmr5idhpwarm X-Rspamd-Queue-Id: 48CD920011 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1725208380-914993 X-HE-Meta: U2FsdGVkX19e6H41HWWI3dQkoJfP9jfy+ZKplOQfHVMwv5K0Un794qcKaOhsZAjM2wLUS3sfMZk6G37fWHhGBLiZZRRBV6C/iWTiKlZ0kFDq5e81GtXSs7Pm5DyO8BJktPPoZFeYF1eZgcxY2WkfmFbSBSqaszo8Mx2d18RyZeyqaAH19yW0ZoxD32/ehzJkGpjxnfZslUTdKAgQ/kffq/Lzw2yHgvwrbsImtXvJZYkhn2eluk/E9iEzAO7ltjOLCZ0j3e3lCvCSD5vFZmuu5+mAnpzVsv9vKTnVnCWNQ1DWfaSw7TPD/xfUJOqzWo1dGbfNbO+pr1GHV5lWLS2yzcskdXUIcjOsujY97tt8tCpx9xxHz7Pa2CBtpAmwF/rz4ERjQiTHb0IAGKdAaNreGGVOAhWi88oNV3pbi6YQ40mZGi8i2UzcNz4Rcdbxo7U5wdF0jo0rWsgKVd0/GIgGZyDFepHTpLOV00NM7MkrUNesjxBAJwR8+XFeKdhKD4oO64GhuHqsrrAKThNq64V74WkC1kLva7q+x8MAQ2siU4sn5y6nX/tiPWN2NMCmUlaCmyamj99IQQ9YVNUuebN10Yjy9PPQSVgDUPDbNNFqEr173P7LviFuu9fZr2vj2uUdlhQ54br3dnuk7Hwyw71ihfHBHG+D3XNXfD0FGOY/cvwqhXZvBfMKNsJ63sG5c2uNapnb2ATm8r74zFjehRLn8iRnXYUmlY0e582DpFW2ntS+sRMBHJAUXg0YCkEnGNV1UtknWHB7mkVJO3DY7DD5GYbZNkan9CQdCIzXi4FohzuiETNIcpo4qf4ulZFdmzHU9BD8W3yBvWzRs2zOqL4pgB9KoUEE3YLqdOo0RmMlKWO3ex+JrmAuh4uJuVbEwyCpwi+AGttPwFFC/Dr6zhjyOWY9/7mWV6QT2+0Eu/SOWg5pSIIQkclXNuH1vYxgb485ln5Bk6Kn6DDz8lmpX19 gAm1FY0G V6i7qlgigkyQUfMh2G8unXCqlfwsBmy78vbEUk1e01Aw+cnYANvyPZeEjN6KRbpRhaD1n8LZw/+AG22q+aAhCzmEqkJan2OVbJgIZq5sD0BRSqHKDgTdnSl4VDpVhB4vA2acsIg54T25pHuvUxC/fYJbWpu77xkiozDfv3bazVIHPYoiCpGC12knVRWH6US8L/6ZQsEptLEsJX8uT1t+7J4cM6mr3uCwZP1V8hkmfCYNSne3pOEqag604bUizRjHLVmJ1ttoAXSsYUbvVrORmAS+WVlZwnJCgvkFHP3lSrJUJkXZRhxA39HWJ8iQoJXM8kJbUviq2ocP7GLHmVcl0VcVZ0o/QEzpT6stwHw9oXpr4s6+ow08ha8dxKJpzXrHem4Xs9Xb1xI4MhVVMPA0VG1qGFfOGi/9bZeUNDcgiAhOAqQ8bsIk3nNu624euZdl+BRvqV+nuYoxET/d8CjrVyshqmct2Vd97oSz5lPwQ6rXGDCl88KeZ7E6Kv9lYmA8ILqF4EgVZldu8MAZuA7ODaO8qIc0NgT9xqX5f 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.10-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 e99085bf3d34d..a2af7f088407f 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