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 4A960C52D7C for ; Mon, 19 Aug 2024 01:31:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 730126B007B; Sun, 18 Aug 2024 21:31:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DFE16B0082; Sun, 18 Aug 2024 21:31:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A7526B0083; Sun, 18 Aug 2024 21:31:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 359C26B007B for ; Sun, 18 Aug 2024 21:31:48 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C5306A8407 for ; Mon, 19 Aug 2024 01:31:47 +0000 (UTC) X-FDA: 82467268254.09.532683D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 816638000D for ; Mon, 19 Aug 2024 01:31:44 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dckD/Va9"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of xiubli@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=xiubli@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724031047; a=rsa-sha256; cv=none; b=AAGC1dGUg4n9xg1J+gxOQus0mC4A+RpvmyxU2RWOt7zd5Lf4Y26esBfoK6Dvq47ynvhL2P 9vf9Naorh2FP1w31ul34jnKxK0laeMh9GlyEqx6zP9YULNCzmjgnk4jPbm6R2xFhiIY9Dd ff88NWZzhJvlgDdx4UyRD0YjjgRx4OM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dckD/Va9"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of xiubli@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=xiubli@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724031047; 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=+CCs3r6hJH4DMfIS+VQJMNGzaRyfgBQFWrMHED7vXl8=; b=5Ax7+n6Fg/3ckqbMs1CRCJt6C64PUQ+x/EsKCdUHHGQSadFM0RkmRxPs32IbEgAyAoYTLM YeAkI1fu7+CuZHE9DJ9KiWOBtL/M7FNKY8FhMo80amspWPQnEgDQ/7KWv70kPZQYQ4qaFz J32Yu75lsPg1oRx2uBTj4LybVrUo3ZU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724031103; 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=+CCs3r6hJH4DMfIS+VQJMNGzaRyfgBQFWrMHED7vXl8=; b=dckD/Va9vV6fg1h/SXbPOI9PcwJpa9hSdAjHeECxtN/y5Ln9oZ6JuzyKDpAn8VniQ2xe7Q TDiWkiRyj+JajNPQj06iAzFlzaVpXOhDIukC7k6hyvhIqmleCI+p3xMbthn7SkGNgNQ/qn iavUW78rGh7FxWen7yFTy6chZHah/J0= Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-486-F9ZZ8i8bONGVQQmQapJXLw-1; Sun, 18 Aug 2024 21:31:42 -0400 X-MC-Unique: F9ZZ8i8bONGVQQmQapJXLw-1 Received: by mail-ot1-f70.google.com with SMTP id 46e09a7af769-70cb2cd0cf4so2021077a34.3 for ; Sun, 18 Aug 2024 18:31:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724031101; x=1724635901; 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=+CCs3r6hJH4DMfIS+VQJMNGzaRyfgBQFWrMHED7vXl8=; b=XMVqHxaLRHvSSPpn9le0fdbPVKTl9LggMsogi7/R/6ZaP3n+OOV8QSfg5LyWjvm4Dx vZpv4aEX8wz/eHkq3pqGnzRBP4aBgcoTCEdu4trFF1E6ciMHVaJCNZNxzRQfbzPs9jj9 XCd6ddmBiHMJ61iVHcAuK9w1R0k0efTpTjaIqS6Ox/joaQ44BnDPY/fbyw6Jgyyd/bwr lWsZiDruyx5TIIbWJmmGEs/KnhTFxIqDurmtRe7Ww+fKSKGFW/jmJZH55IdeU0ciw+3v 2zxBCHx2NSuisTBRPptEtHKb1HZokkgllhSCl2klgB1N/FG7WzwJWcuHqZHDGDLv3Lzy DwEA== X-Forwarded-Encrypted: i=1; AJvYcCUapM6FjsYvQpDpe86lq8/xH58rEpBWayP9oqk4Qi+T6WudWwEJ7oP6qaie7/3q/CdlDOUNsTw3M805zYqe/0hkpI8= X-Gm-Message-State: AOJu0YzLmMjjUwv6qZ+Rw8r+IBqlwq8pmZioaC0V78qnuEL8xDLWtMtU r4D2+wmFLpqVJDO5+ODGCXejdnfXEzLDOvX5GIRqFUOC5O/u3qMPVRGmmzLVAzemqLZ34YjS/jG ZDqRKmVm/r5/gzHGwbJIatEFIucjErEveFw9rS/MZtuf9csnb X-Received: by 2002:a05:6830:919:b0:709:47a6:627c with SMTP id 46e09a7af769-70cac84915emr9933900a34.4.1724031101681; Sun, 18 Aug 2024 18:31:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6X1a7pPkn+SUa6v7Wbgpm6Nj8OlxFtxYJDnVVkia7xEYC08b4X5v9+urMoiKWMtuL+brG/w== X-Received: by 2002:a05:6830:919:b0:709:47a6:627c with SMTP id 46e09a7af769-70cac84915emr9933887a34.4.1724031101377; Sun, 18 Aug 2024 18:31:41 -0700 (PDT) Received: from [10.72.116.30] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7c6b61dd9c9sm6712306a12.41.2024.08.18.18.31.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 18 Aug 2024 18:31:40 -0700 (PDT) Message-ID: Date: Mon, 19 Aug 2024 09:31:32 +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-Rspamd-Queue-Id: 816638000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: k3jihzytq11wk4d7kt15socuy53u1bui X-HE-Tag: 1724031104-526607 X-HE-Meta: U2FsdGVkX18fcNPUGECQNobaMbNz9HNO4TJDBNmo97xnIrlzJ0x4tXDQOCWJ1Pr3/0aQc2EW2crwBmZfqpElkpGcguyfLL6fM24sNF4YXPlmSpj3ZV1LtHrZISuGC9vG+TMYrdZPBW2HWI6cGyQwlm2zdjplMktP2EgsXty5oeCEM8zaTu8BBikokIe+cKDhZAQ5MI+5QD5rl74yf+E1RN3mWrmQiZWxCy+X0qF9Xv4Y7PdK/xVWrVFb4RQHe8KZriFky1PLbKTSY5HFmpN0EI/qhuM8u5PYM7LaoRYoiyK5Wx0euU1fDLyLjVE8d2emesdG/AYK3MQPIqJz95SJVZ13q7TqLEJp4cSeXUaasB9uFAJgkKEjDcfQx44+gyXVA6CvGekiVfwKRP6o1pRxigKXqC0MT2hUKM7zC7RgR9MxtMMKhDCTa55oBJrDtJL4EAE6vvpVLrOVnFZm5lftnae/E8kN7GkDs7bpB1u1mz22o0dxxGlUoNHF9JHME5ICGXtwbpZr+Va/TRtJV4McGzNvj9t72Qa8Ft+h1BGUpbMUQvs9aTHRUycORHCzS1gJVSDhCa75Kw+yG1ar/ERBLj1vJhS4pjO8XWxnIgaYd4PvPr6zNP3c/vDG12bf7m4YlnmyA6cDocWnDyMELQYdaVHwTgxe0I+xSEuB5NSP/8waWKn7s8OioZURxlWPzO5dvfYWGGqDwwPHLsyGveaEUPrVrXwFHWX0fenXDUXoG8riwnuecljYuDyBEQSNOXZ3ftxugErtvUa7QHQew229ZxX58dtXq52DQl5SDoFkqE63lysXaHkwymM8Z6x09620BvVmu5zS07bZuz9QkQVrwuuDoKGnY6+zdD3FdDiOU4HS5rK3Xn2Iz07RlkHhLekFe9OmHuGvpvVztnjZ6i/0UDzCHGkgvVthzKx1+ayXOyHhhRc/5qZdZw08uyhTRvOaRUd1m8JlMsfOQc64vRs DF8f/rCs sF+SAu3yudJfcv5Z38hzsWSGXuZ0ECPz/ywmuPPe2uHYBxZpfI/CSjuqzqNqqcBLsIYdieVNRXcpMQFKi7/sbx9madikJ4L6BdQ96EXffmhTAvNBuwI7t8OW+uWpqA2J7hu6D/BVdETEbkqPxb7pcwRUkNf+qfAT8+3wMWQmilAtPrtXEEn+ECQIvQaYq9YUkGXr/AYEeEhDDp0rmwBUthYTCBVg7CmnDDgqPWJ2/vYevm2HZyit75PM9lAAofEkx016KWjS1TrZyaipXGLfrhBhk59Zl2FFQ8zdtehWUOnjEg+5s4ON7gBlFYgSVQDG4uOJqkFqYGCTmUcfihfADYnx2O7uKQJ+KdaXgJXLRaWqpzNm1UR+hS+6M8HyT03V6VJOvCaY0Ri5rj0e8137dyXH8FMhaDdoSyk+doFF6CEn/AyAg57dvBYz2FShyFw8+X22FyyPGZjqpH7c7nNf09M4u/hQNtIJ2CJuFHPg+QAiYsxpYHjHWqCh4pI3IkcCaLdZ5iL14SWCnrObqFt97vLEA5dpSfQtIkiDrN1ZK88Ke3C0PSChDqlAVpBcs64NBBRtuGYO0Z4xu6I/RyQs2Nn3ev2CVcLelwyG52I8FFbHwD3fJ+waYrGJ4gCrRU1TQf/L3e0JGoU/tiL5DU6H3hPfxqIiupPnq0CA14/fwCDvjNFmKiKRR5RjzoLFA++9EfJqqIuOPXfVpRsvK6GFG118REIawALP1mLH5EWMonQFHExw= 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; > } Just back from PTOs. This LGTM and I will run the test today locally. Thanks David. - Xiubo