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 6C5DBC3DA4A for ; Tue, 20 Aug 2024 06:33:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F29F46B0085; Tue, 20 Aug 2024 02:33:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED93E6B0088; Tue, 20 Aug 2024 02:33:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA1B26B0089; Tue, 20 Aug 2024 02:33:50 -0400 (EDT) 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 BEE0A6B0085 for ; Tue, 20 Aug 2024 02:33:50 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7025F417BF for ; Tue, 20 Aug 2024 06:33:50 +0000 (UTC) X-FDA: 82471658220.01.D291861 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 2745D10000F for ; Tue, 20 Aug 2024 06:33:47 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Ecli/CT9"; spf=pass (imf05.hostedemail.com: domain of xiubli@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=xiubli@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724135549; 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:in-reply-to:references:references:dkim-signature; bh=lxu/JaDhP8Y+hBmSZIP+97DXMICgK3G2N7aESVf67vs=; b=OoRag+nwWEn9RpgYm7YGp1sIFBiEtIpwNf5doiPrGnoSpBGlTztIH++wgh++YVY+u+Ecz9 4w//A/Xs0OPzUC0gzHuCNmJSfYjfkMCUSdWcsYryxvjTigL0lzIw1H8o+QryyrU192ImUD kM3jkU0UkX/5AY5z2A124s/gXL4TM0g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724135549; a=rsa-sha256; cv=none; b=38g681ExS8ptOIW48ERN9Zqt3i6g5ZbVDfIiMyc2y0od6v1X22IAhb3kZvcZtBaqa2holc vRMti8d0uUyVOg6BjL7BB33SxBeNoEyx9rf5LWLsYdreH9ZjPc4/RLzaJXcJQFG5KG99Ip 8TYCnaKcFHZfyXSiWdgkD6O36i9PrjU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Ecli/CT9"; spf=pass (imf05.hostedemail.com: domain of xiubli@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=xiubli@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724135627; h=from:from: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:in-reply-to:references:references; bh=lxu/JaDhP8Y+hBmSZIP+97DXMICgK3G2N7aESVf67vs=; b=Ecli/CT9Eue15Yy7IQxrQVQaDbkZ0w1oIQ4qlliT/HL/cE8oGXmN1LFvpPN739haM7OLpO 4Lq+Ru00MPSoM8dcSI7JCA9xc1J6c2rvwFX15IzZMOpXVNeDcMxrQSiY5d1N6rIwDPc8Dd fQdYP51HR5LnRyF1IzVDYMQThcDGaH0= Received: from mail-oa1-f70.google.com (mail-oa1-f70.google.com [209.85.160.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-18s0eLF2PLGgcgbio9TjPQ-1; Tue, 20 Aug 2024 02:33:45 -0400 X-MC-Unique: 18s0eLF2PLGgcgbio9TjPQ-1 Received: by mail-oa1-f70.google.com with SMTP id 586e51a60fabf-270170dcfb3so4248150fac.1 for ; Mon, 19 Aug 2024 23:33:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724135624; x=1724740424; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lxu/JaDhP8Y+hBmSZIP+97DXMICgK3G2N7aESVf67vs=; b=vPArhXmG5uAbHUsNqq9U9wUsYEIhrG8UQwAu34jPrpXBD1btSNQERVpVt8SOwZ0md9 m8M/iWSsOZKoqEAaICxSOfXTzYcgG0PjcqeFiHpE2p75X3m6eCnyR2AQeEzSaTXZdzlA tkRx33KpqVFxAgNeXgKHg0jE8MpKmknh9+VHh0RzBEyLH34a+dSH9Vx1Vd/28YtkXNjd YC40XD08qHP9XraC/6ZHFaEz3+3IYpxQOuH0mFP8P7UErP56eF/+iV7E1mSMIuzSPQMM di3y11RJboI+s5BiQfZaYhqI9jiTTKEpPh17NonroFY7VvaiUwRG1JLOCk9OLM8a9+ov kLXg== X-Forwarded-Encrypted: i=1; AJvYcCXvHUWq1rJCWk3E7xHzjk4+veL8CATluusjDS2Cbn6D8opHmx4oqH1Sbw3riZjBZYD9ecYwqsCOBw==@kvack.org X-Gm-Message-State: AOJu0YxBml97fJ8c1QvzQP3kI2jiGYcJzfJWxL5CQpThEAQg3I9g5Rnf 712uDDmABUDWYrytQGk7M+1LZvSQA/Nbr9CW198S+xt7RGd8AimuiAsugqS00i4p9ttM1I6X2X+ mC6s/GzSrT/CH6U4xk5cXso1Bi6kYbcbpgq1wNHcAqID5M9s4 X-Received: by 2002:a05:6870:c18e:b0:261:1600:b1eb with SMTP id 586e51a60fabf-2701c5a0f1amr15718608fac.31.1724135624508; Mon, 19 Aug 2024 23:33:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8KkMFHadnq0O47HFRRH7mfcRoBRFl5n5bs0K+MpLyDgPkvJUq6Qf7YTL/Zl0oYygtgXFAZQ== X-Received: by 2002:a05:6870:c18e:b0:261:1600:b1eb with SMTP id 586e51a60fabf-2701c5a0f1amr15718588fac.31.1724135624177; Mon, 19 Aug 2024 23:33:44 -0700 (PDT) Received: from [10.72.116.30] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7c6b61c691csm8591114a12.21.2024.08.19.23.33.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Aug 2024 23:33:43 -0700 (PDT) Message-ID: Date: Tue, 20 Aug 2024 14:33:30 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty" To: David Howells , Christian Brauner Cc: Max Kellermann , Ilya Dryomov , Jeff Layton , Matthew Wilcox , ceph-devel@vger.kernel.org, netfs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <2181767.1723665003@warthog.procyon.org.uk> From: Xiubo Li In-Reply-To: <2181767.1723665003@warthog.procyon.org.uk> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: 9ea71cxqtdnnfhn8hs6x1nfcpcdcf51o X-Rspamd-Queue-Id: 2745D10000F X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1724135627-135199 X-HE-Meta: U2FsdGVkX1+38q6r2iADZyFZ9iOvQ0YIgE3LMmgfojnvwlSrmOrbaBp6MyLwlTkqfj/kpDl0Yv3hk3RxqUdt44SSttFi7DmX9tkI8YoZGyhCy1ZJVEE8ORjShOGUTcDacVoZ7qn6B4XwSYFYSWX0PoSYohfB5enPPE3qnLCgTuBVD0ouSHlNXuZJKBwMDHI9uzlr5PeBkWabKIiI0LqKbE+wMytce6AEyzexNb2ZRMSztQDpcNvzeUJVefXwDsFnq/DoKjs76O2n9YIgHqX4VnHl3sqoXHJBvyI22drhlFfarh5J2/mbADKbQcNTKW0zuxCyainRMrptVnHlh9wvX8xQ6c+LcobLCU8L6NH2eZonmvUVuJxZuEnBNO7zDVnGc3lQhmyCNnEL5Pjnd5zssukSdBRXpIL6J9E5wRZhWDq3+A+mkD6viM2n0YLdq2pWBvJ0JDVau6F5xZ/0PnBSUf1sCiLg4IqrPxiWDmRykQPzFyPfRuUB2aAMewWpN3qCJgfrdfjiT8uO4jYyIvtjsyhjfvkALtfZeIHGFoq2wj0ieyBQsgJdzlt0UMQ9YlRifNDKLLBlo8dEcBuIN+Crz/EUnQyVNpWdCpMfetaPqqRZPbi3UNnoiFD2OBepT6oS+JXW9lybZRjBuzG2krdmLuI8kpOT446VyqG9+IBYasSY4hEARsR4j0sS+GRsUqSz/DkZz2IqF+7grlp+ss3+7hws1zkgypwMxC9j5pXGl0IazmeLngd7/3KSqULysSpJJ++TSO63/YPxWjedwfomN++oZBtJ2GSJkr5wHcv8WbBPARkbE6+XehqgRLe6/kaHuFKNThCP+Ui9glaF8KBDznCCcNHKNEHcHSJBmzWgVRrq019GrWoXpz0cast4WfTIugp2oWIwbWK6h+FVZHsY53FIaqL8//sze7SdF+W+kK+5TCbpkOciqbNxVhBlzCIxTlIi/Af30YGbMFAvlCH 4I/x+Fiw R7fLlj/R4N9OB8LuTvabwukYmcHXrwEO5n6NSlb4gUzRGps/4JmnA2JLA/GWpYwQPt0xDo/9XZTy6yYqbthbKnOJILr3VkF1so01rQ6dAV4VuvRDLC8ozZaS1pWBMvcdky+Z4Y/bKHPGeTX6hJGlZfzRCenF8o592H701WGi6hApffKFV2hMoTQx8B0C4ll1jJCp4/QqLp7tszW5Ul0nmI+0buBoS+fRpoXL+6glaNEQvC4lmboNgi/UXpqfJaxXS+q+ek1jQukWfS5yzhdgXIVb7S1m/RTrr3vo/CK6mvGGpiiRN83ViWt3filLU5nKMCFmmss/MNU3CkfKeEKNkEBBjYfsMiGxc2Zn+avYYZupC0NkmjF90GQwgEpKwcGaDyF9ExMrcoj24hYg4UQe8yfeSaJ5bvar7neKHvbwrhWHwBix6jmsg5inCRZWrIz0+yEIqGLo4fXd/TXHnjUGHzSPn3DM3VA+YVK1/AU95Ee1ocrv6gP5HZufTiowiWvDLwPD/FikpsMcpoLLJL4U+t4ocxp0b9r8PB/6sYY6/LoIXOrPk3bzrzfN5jt5QPCPF2A0N05XscISRqylle3lGWYWiGX+/i8WsXEzxzdzib2jBFLrkyN5h9R7No/Be7En1m/01MYcFU+VuK1+XKmajBHuQ+P+SZ4p1X08asfexq3mW/RmhPbwgDfdGtpQQJ9hnt/NXKFaNK8Gjqj0zn2JQOKp+Z4y3xZgy0x0kdtKIorstzcc= 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 8/15/24 03:50, David Howells wrote: > > 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 > 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 > 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] > --- > fs/ceph/inode.c | 1 + > fs/netfs/misc.c | 7 +++++++ > 2 files changed, 8 insertions(+) > > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > index 71cd70514efa..4a8eec46254b 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -695,6 +695,7 @@ void ceph_evict_inode(struct inode *inode) > > 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); > diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c > index 83e644bd518f..554a1a4615ad 100644 > --- a/fs/netfs/misc.c > +++ b/fs/netfs/misc.c > @@ -101,6 +101,8 @@ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length) > > _enter("{%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 *folio, gfp_t gfp) > > 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; > } > Tested it and worked fine. Reviewed-by: Xiubo Li Tested-by: Xiubo Li Thanks