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 D90E1CA0EC5 for ; Fri, 30 Aug 2024 10:16:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F54A6B00E1; Fri, 30 Aug 2024 06:16:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 579E66B0100; Fri, 30 Aug 2024 06:16:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41A786B0101; Fri, 30 Aug 2024 06:16:51 -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 241106B00E1 for ; Fri, 30 Aug 2024 06:16:51 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BB4ECC1662 for ; Fri, 30 Aug 2024 10:16:50 +0000 (UTC) X-FDA: 82508508180.09.BC4D851 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf14.hostedemail.com (Postfix) with ESMTP id 1B93310000D for ; Fri, 30 Aug 2024 10:16:48 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=zL2zFTmF; spf=pass (imf14.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 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=1725012938; 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:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=N/OAqBjVsGOXgIp1C05pM8BjsXIioU1Unj+CJXu/Syg=; b=lrQjvOvY7BreYhRkN/MoJGgMRzUORto8nBSzZgbFos77AP6q+adopGMZ9rlVQ3PgkfR4Iz 4G8ewF+tB9rdotG67Ve0Goxz6afxRgX6EjK7SSLBdwRpDu38O5f9ho4Vlh8pucqnFYWiFE 57sUgaaz12TLXRidnOdx6sknrKuhCcQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=zL2zFTmF; spf=pass (imf14.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 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=1725012938; a=rsa-sha256; cv=none; b=LMWcbKpBsZuGKbqPfz+7MIcVpM1/L6O+XHv7oHmyKOWHtryMgmp2gM7HdRDjc8w9Lit9lX zqmR1sPsiPzVF3trTxaoPD6hQxxqB7JZ78Ajm9nMo3fE+KfqA2Baurau1hkiTJ8lAPXbAc ZUtV7GrGWcsSuPRVtIcjmxlcWNJ14mw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 51C6BA44580; Fri, 30 Aug 2024 10:16:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80F6BC4CEC6; Fri, 30 Aug 2024 10:16:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725013008; bh=s60eTLrXL5WjQZzadGCrNRG64xw3ll5H3SgMy1fb9Y4=; h=Subject:To:Cc:From:Date:From; b=zL2zFTmFAI0if4Anv3PVuUEpj0hqUh0Rj0br7GWjtvK6iutHt7BopSLoO7OUV9njw wPis8+s0jDBzKoBQy3uyVo3LdfdyZoHGwOQSzwbnCSkv462/WpqM6dZZKAD1Xdbdwe enbnbWfM06NSyH/MXjxWWCOnuY3PtJUQlwdpIhQk= Subject: Patch "netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty"" has been added to the 6.10-stable tree To: brauner@kernel.org,dhowells@redhat.com,gregkh@linuxfoundation.org,idryomov@gmail.com,jlayton@kernel.org,linux-mm@kvack.org,max.kellermann@ionos.com,netfs@lists.linux.dev,willy@infradead.org,xiubli@redhat.com Cc: From: Date: Fri, 30 Aug 2024 12:16:44 +0200 Message-ID: <2024083044-preview-cornstalk-80e9@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Stat-Signature: 1hbn9pctjm8ysc3dwg91bfp6kwqe167t X-Rspam-User: X-Rspamd-Queue-Id: 1B93310000D X-Rspamd-Server: rspam02 X-HE-Tag: 1725013008-89598 X-HE-Meta: U2FsdGVkX19rB8/yv8rHL7Iu+o7EjwwYHbHMaMpcjlNgD6qOe5Iwdv7+NhROX99ankWemQBhFlz/df+eoOc7+jo/zdrQoK/LVH9Y3/domug3AoYXIEnpLlHW64gm02F+SJEsKXNEuI6TElPlcTpOdO9R4Hb8n6BSsaGPbWH1VOt7F9ltOjAsC7mIVGcVqHGO5UFJRUExIyZwO+priJv0k06OA/ZlYuvJmX7jh/qrEu2XqCH0sK/fuPqgp3++d5qaJt3hfC3x5zlLu62RALlsZF5mRY06HLRrwDf4FdGC0ZBMh6ouQl0HR7wzyfRObBSwakzGJdqJB2OeXd+1t+OxBFD8Nv/2DLBQLcUwSFGIhIl20CNfOmIqVL+Srhkc90o+5D9yklQR3FbiBfr+V8X5UNygkFCp4NDhpYJ9V1iQN7HIRG6fmfkpBXom2+NyrNYbAyF65f+o1ErCHQEktz9LA0jzR6vsGD1j5x4rDfzXM3LWxWYuAFIEVSzSwQFuYb57zlBAfLGMDSkzxo77b/gGN5Rh3rnFqyY0yXdTLvkTMn9rdwpb1BJuBeGJmwtk4+Ky6lXSiI/tyGCwyN1MZMVwY2pL7QwEd2YkT129+DQybd+BcJO2WPl+KL1/M3vySrwN/yWOSy7sK/VuEljvtxZjMF34nCi+AwJjiSSgYit1QyVsuO+hsT0fxUZOu5InI5g+W4VU+GfGJcORNQdzng9yKZo29aCe38wiODsEN/iwznGp+B9tKFIUnFuDZjSHdMTFaden5O0GJ+5FB22ZDHCnWRRh9KJWNea4i7YsnitkHUQJ65ivUlgaSlICVBSIKTZL1q0co3JwiLnhkpSGGxX0m9NHXjL59l9EPCxt4VdyqM58alkn8Qu3VG2ldotPFLJTyeZuAbcDLkz8dl9Ve2D6TeXnBn7hLgwEMCfaWoNsHBhNYQ+a38+cBANngsPT+tD+/IsXHGJlCrg50TewCoH zTe8XNI1 B5S9m3OuG98Kn9b0il0M1OAG9Ejfmk8HjkLSxD9aTtnD2slDfe9jFPrJmW4gtXq/Tq/PQm37cRcvPoIP+vzfsPLCe7h3R0618bcCuMFnfslCBGy8CSdISQFaaOUfk0dZyTuo7LmW4sUOaUR8O8EJlY8QmZMyLMAkqwa9EnSja7mqU4NVOR/5Z8Fi9jdP+LJYQV12gqXaFlqPGj0uyAzYSsmd4Oa3yTcHIj7ReOSjwQ3TNCMgtmN4qB7y1GnuVKMbXx+EbyERRTINb8ECoUu3OLLOl6cfmPBNzca5UDlx0HZki1d8HIH2kdP9YolMn+QdybgsDS838zoCyw6KsLL7wcWAE6qDiK6vSOsp7LFcU/Ph38HUMpF21qnz4Frtq7p7yNfzuJMDhepARu7YhN6QikxPdFwZHgfdRlOCTd38fuxjp17RJpWw9fftkTpx9kLG4nfmWXx09vmz1IcLZe5LixIgZI3A9BecjFTPQGmI/fLfZNBqQi11/0o+m9vf0eSXvs4pPhOnKk9WECzWLzQJbjvY3kODAj/InotbpPG9WWK6PRUnJ+aQTqr0EaBTZN3f7ENlk2Y8pOUcsZjv5x9zSCTKHb8Frpev1hetyzY9tTpLYsVfnBtt5p8YZwBbnAoiXrCwVlLt/qliMidHCqydSS/eaNIXR+uyK+XI/EXDOb06kzNGi9WimtRhjBWRDjO88UIrthRMG9d8a/BiKc4l7gAHfWnZlJ3QDj/Ji 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: This is a note to let you know that I've just added the patch titled netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty" to the 6.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: netfs-ceph-partially-revert-netfs-replace-pg_fscache-by-setting-folio-private-and-marking-dirty.patch and it can be found in the queue-6.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 92764e8822d4e7f8efb5ad959fac195a7f8ea0c6 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 14 Aug 2024 21:38:21 +0100 Subject: netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty" From: David Howells commit 92764e8822d4e7f8efb5ad959fac195a7f8ea0c6 upstream. This partially reverts commit 2ff1e97587f4d398686f52c07afde3faf3da4e5c. In addition to reverting the removal of PG_private_2 wrangling from the buffered read code[1][2], the removal of the waits for PG_private_2 from netfs_release_folio() and netfs_invalidate_folio() need reverting too. It also adds a wait into ceph_evict_inode() to wait for netfs read and copy-to-cache ops to complete. Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty") Signed-off-by: David Howells Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk [1] Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8e5ced7804cb9184c4a23f8054551240562a8eda [2] Link: https://lore.kernel.org/r/20240814203850.2240469-2-dhowells@redhat.com cc: Max Kellermann cc: Ilya Dryomov cc: Xiubo Li cc: Jeff Layton cc: Matthew Wilcox cc: ceph-devel@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org Signed-off-by: Christian Brauner Signed-off-by: Greg Kroah-Hartman --- fs/ceph/inode.c | 1 + fs/netfs/misc.c | 7 +++++++ 2 files changed, 8 insertions(+) --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -697,6 +697,7 @@ void ceph_evict_inode(struct inode *inod percpu_counter_dec(&mdsc->metric.total_inodes); + netfs_wait_for_outstanding_io(inode); truncate_inode_pages_final(&inode->i_data); if (inode->i_state & I_PINNING_NETFS_WB) ceph_fscache_unuse_cookie(inode, true); --- a/fs/netfs/misc.c +++ b/fs/netfs/misc.c @@ -101,6 +101,8 @@ void netfs_invalidate_folio(struct folio kenter("{%lx},%zx,%zx", folio->index, offset, length); + folio_wait_private_2(folio); /* [DEPRECATED] */ + if (!folio_test_private(folio)) return; @@ -165,6 +167,11 @@ bool netfs_release_folio(struct folio *f if (folio_test_private(folio)) return false; + if (unlikely(folio_test_private_2(folio))) { /* [DEPRECATED] */ + if (current_is_kswapd() || !(gfp & __GFP_FS)) + return false; + folio_wait_private_2(folio); + } fscache_note_page_release(netfs_i_cookie(ctx)); return true; } Patches currently in stable-queue which might be from dhowells@redhat.com are queue-6.10/smb-client-avoid-dereferencing-rdata-null-in-smb2_new_read_req.patch queue-6.10/netfs-ceph-partially-revert-netfs-replace-pg_fscache-by-setting-folio-private-and-marking-dirty.patch