From patchwork Thu Dec 21 13:23:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13501936 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 EC5E9C35274 for ; Thu, 21 Dec 2023 13:25:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 932448D0020; Thu, 21 Dec 2023 08:25:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DECD6B0098; Thu, 21 Dec 2023 08:25:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 731888D0020; Thu, 21 Dec 2023 08:25:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5F9FC6B0096 for ; Thu, 21 Dec 2023 08:25:39 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 348781C0AB2 for ; Thu, 21 Dec 2023 13:25:39 +0000 (UTC) X-FDA: 81590897598.18.966595C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 7EC234000A for ; Thu, 21 Dec 2023 13:25:37 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RWJGDBg5; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@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=1703165137; 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=yOUF/NRG7mUfYTB4RMtCJtSjpr7YJjQloMElL0RkM4I=; b=MoZYc/bBwIfKofsaLUdzWTyUqyzWKNGTaS/AEWGoPlUnCJCTSQRSqWZvjwBpJZONqmdKOs g5jLBsFPFW1CwJmALFox8uxDINxlqsdgMxFo95GJa2vRjPxIruKuyhEuGmnIxeRtOcuqfx Yn/2BboQUFxDaMza76t5sPa3KAymB9E= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RWJGDBg5; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703165137; a=rsa-sha256; cv=none; b=3lhXJGAxpjnlRW8azZJGjOro3TrPYC6Ti+G1Q+hXkDrSC9jnyBW9a151IhF/cFeQooIRml kptLeOhQ3jGRD1wXf2JgqTHUP6yxPNoYS1LxZL/z5TS38vyfsCb5945u9WmfZUof9U9R4+ QyoSlkx3ta3oixSql8iATnIkcfkeiXI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703165136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yOUF/NRG7mUfYTB4RMtCJtSjpr7YJjQloMElL0RkM4I=; b=RWJGDBg5uQbHaOKt432DIiHKmc2MSV1dl+dQlq+aiFCabhVMucw9b7gJWUWvqoJ9ZeD5c7 FTu6fpYDeU22jdPjz2pIEFTgElsxjNqzstB3IC3Jcy+t+MlqXf2rLF0KwjK3irQXbY40nk c8DNxP2EDetRDHAgTuZP2ZemtHGHet0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-691-MGPyVwAsMyaaWqEv59xzuQ-1; Thu, 21 Dec 2023 08:25:34 -0500 X-MC-Unique: MGPyVwAsMyaaWqEv59xzuQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B57B4101A5B3; Thu, 21 Dec 2023 13:25:33 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.39.195.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE310C15968; Thu, 21 Dec 2023 13:25:30 +0000 (UTC) From: David Howells To: Jeff Layton , Steve French Cc: David Howells , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Dominique Martinet , Eric Van Hensbergen , Ilya Dryomov , Christian Brauner , linux-cachefs@redhat.com, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 23/40] netfs: Prep to use folio->private for write grouping and streaming write Date: Thu, 21 Dec 2023 13:23:18 +0000 Message-ID: <20231221132400.1601991-24-dhowells@redhat.com> In-Reply-To: <20231221132400.1601991-1-dhowells@redhat.com> References: <20231221132400.1601991-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Rspamd-Queue-Id: 7EC234000A X-Rspam-User: X-Stat-Signature: umyxhix8pz6kgbqhh9b6t5qpgmko3p76 X-Rspamd-Server: rspam01 X-HE-Tag: 1703165137-876881 X-HE-Meta: U2FsdGVkX1/4SCSPLTb+aYcS/CwKvVfzFY2ZNjwQzaRg6BVbWuY1USdeXk1OavgQPxMOkvNvn7jRb21L77xdU/P8ChsMlPpa9OE70Vhd+yhxJOficFUuiUNSvUH8+V59OdLbx//v6FsiTLVjiriNe0Gune63YDSFVWItytFC9nUaXWqJjQ9FBKadDwnWHr3Tsv3iW7dvzpaD9AZEgu6kvicbaqsTF5SYR8hM6Npcks5CULj8deJvHp6q2a66qYZZcEgRyTrlgA2ttqk/rqV5MbAmaDNfRDR4UN7oFIThQHeVru61/num3GDx+eGwOIQDEUXMuT4NWD7A1dCeyFvHlvl1MpKSsEVYOrF0lxSbOq688EHj0k8N1Q//wRbfvWBjWmR0HIYXMKw5oB90ih/sAY0lQY/UZlc9+djjiy2Vu9o4EEkJ6TFaC1eFndRRS+lODzEfQxDfEjBUEUx6mjYwdtrGY+nq12iuV5lDoykpKBmPsJgvMJdlQ1SQ/qwIhnl56PHxlj6MV8R942ItWAESMU1yDh3tpRUu78fE9zOdpELJSwdDXWhNhj3j90tZvwmfc0EHoGA7yk/Z0yl58sM7ZNUaLSFo00Hj+mqZOqyf5ucA20fIt4853Fs7E7+e/f7+dU2V101dqx3hsbZTMMEbaDuASQ6mspmGNcbtvVXEgLnf0PReOeelmj3VlFROnR/f0zOIztHT4LS6cj5Rl/KslYoM5nS8oClE1LRcoNjBUKXd51S1fRNtoU7P6QOkeOqmpmIyPUC80yifElQ7yEv3MgWs9uSud6kUoyaV+rW38TEzxpYpyGmjKoarDyhDg/IEqONO4NecW5zRjon2w9vtejexofgPTdXM1fRKfzoiD9bVLRk6ZbrQvcEDgjPLNUBma81VU7rYuSNYCqHe1+bGCsbzmPNOgdtJ0eLW5KdbSQntBm0/OxQjF8x8nVEqj3LKJX8VSm6oRv2ijijaV/s KQ8Hf0iG cRYPhqziRpBcG/J4tN/vajlwtY2hz/y2Ag95HmGd5FOCcL5OKiXJ2N1uhyQjMAdGoZWXkCfVD5+sLIy/4DBoxeYwdfEd6V/P1zlSUMg1BzVPFEkdgdzkBlyeEjH58xHO2mcI2uyfisKOgfbOBNbytxKyWyM+msP6rKKjOzKr2urqy2ecgidhXw2rk+nfHItV3vqxQ4NGNSBWTWakGbXGmRQDwYyzX2UUXEx3mqWzlf7fuoZtvPWSoNLiO4VlamvKllwmL7hReeYdVTuFkvrH9QXpaJUnvWhnmYGwFLz4L8rahsx4= 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: Prepare to use folio->private to hold information write grouping and streaming write. These are implemented in the same commit as they both make use of folio->private and will be both checked at the same time in several places. "Write grouping" involves ordering the writeback of groups of writes, such as is needed for ceph snaps. A group is represented by a filesystem-supplied object which must contain a netfs_group struct. This contains just a refcount and a pointer to a destructor. "Streaming write" is the storage of data in folios that are marked dirty, but not uptodate, to avoid unnecessary reads of data. This is represented by a netfs_folio struct. This contains the offset and length of the modified region plus the otherwise displaced write grouping pointer. The way folio->private is multiplexed is: (1) If private is NULL then neither is in operation on a dirty folio. (2) If private is set, with bit 0 clear, then this points to a group. (3) If private is set, with bit 0 set, then this points to a netfs_folio struct (with bit 0 AND'ed out). Signed-off-by: David Howells Reviewed-by: Jeff Layton cc: linux-cachefs@redhat.com cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/netfs/internal.h | 28 ++++++++++++++++++++++++++ fs/netfs/misc.c | 46 +++++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 41 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index 2bf2e82b2ad7..d72292e40f9b 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -149,6 +149,34 @@ static inline bool netfs_is_cache_enabled(struct netfs_inode *ctx) #endif } +/* + * Get a ref on a netfs group attached to a dirty page (e.g. a ceph snap). + */ +static inline struct netfs_group *netfs_get_group(struct netfs_group *netfs_group) +{ + if (netfs_group) + refcount_inc(&netfs_group->ref); + return netfs_group; +} + +/* + * Dispose of a netfs group attached to a dirty page (e.g. a ceph snap). + */ +static inline void netfs_put_group(struct netfs_group *netfs_group) +{ + if (netfs_group && refcount_dec_and_test(&netfs_group->ref)) + netfs_group->free(netfs_group); +} + +/* + * Dispose of a netfs group attached to a dirty page (e.g. a ceph snap). + */ +static inline void netfs_put_group_many(struct netfs_group *netfs_group, int nr) +{ + if (netfs_group && refcount_sub_and_test(nr, &netfs_group->ref)) + netfs_group->free(netfs_group); +} + /* * fscache-cache.c */ diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c index 5d545073fe03..eeb44abe59c5 100644 --- a/fs/netfs/misc.c +++ b/fs/netfs/misc.c @@ -177,9 +177,55 @@ EXPORT_SYMBOL(netfs_clear_inode_writeback); */ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length) { + struct netfs_folio *finfo = NULL; + size_t flen = folio_size(folio); + _enter("{%lx},%zx,%zx", folio_index(folio), offset, length); folio_wait_fscache(folio); + + if (!folio_test_private(folio)) + return; + + finfo = netfs_folio_info(folio); + + if (offset == 0 && length >= flen) + goto erase_completely; + + if (finfo) { + /* We have a partially uptodate page from a streaming write. */ + unsigned int fstart = finfo->dirty_offset; + unsigned int fend = fstart + finfo->dirty_len; + unsigned int end = offset + length; + + if (offset >= fend) + return; + if (end <= fstart) + return; + if (offset <= fstart && end >= fend) + goto erase_completely; + if (offset <= fstart && end > fstart) + goto reduce_len; + if (offset > fstart && end >= fend) + goto move_start; + /* A partial write was split. The caller has already zeroed + * it, so just absorb the hole. + */ + } + return; + +erase_completely: + netfs_put_group(netfs_folio_group(folio)); + folio_detach_private(folio); + folio_clear_uptodate(folio); + kfree(finfo); + return; +reduce_len: + finfo->dirty_len = offset + length - finfo->dirty_offset; + return; +move_start: + finfo->dirty_len -= offset - finfo->dirty_offset; + finfo->dirty_offset = offset; } EXPORT_SYMBOL(netfs_invalidate_folio); diff --git a/include/linux/netfs.h b/include/linux/netfs.h index f87193fa0f16..bb78021332f5 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -140,6 +140,47 @@ struct netfs_inode { #define NETFS_ICTX_ODIRECT 0 /* The file has DIO in progress */ }; +/* + * A netfs group - for instance a ceph snap. This is marked on dirty pages and + * pages marked with a group must be flushed before they can be written under + * the domain of another group. + */ +struct netfs_group { + refcount_t ref; + void (*free)(struct netfs_group *netfs_group); +}; + +/* + * Information about a dirty page (attached only if necessary). + * folio->private + */ +struct netfs_folio { + struct netfs_group *netfs_group; /* Filesystem's grouping marker (or NULL). */ + unsigned int dirty_offset; /* Write-streaming dirty data offset */ + unsigned int dirty_len; /* Write-streaming dirty data length */ +}; +#define NETFS_FOLIO_INFO 0x1UL /* OR'd with folio->private. */ + +static inline struct netfs_folio *netfs_folio_info(struct folio *folio) +{ + void *priv = folio_get_private(folio); + + if ((unsigned long)priv & NETFS_FOLIO_INFO) + return (struct netfs_folio *)((unsigned long)priv & ~NETFS_FOLIO_INFO); + return NULL; +} + +static inline struct netfs_group *netfs_folio_group(struct folio *folio) +{ + struct netfs_folio *finfo; + void *priv = folio_get_private(folio); + + finfo = netfs_folio_info(folio); + if (finfo) + return finfo->netfs_group; + return priv; +} + /* * Resources required to do operations on a cache. */