From patchwork Thu Dec 21 13:23:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13501930 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 CF030C35274 for ; Thu, 21 Dec 2023 13:25:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5E296B0074; Thu, 21 Dec 2023 08:25:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E0EBC6B0078; Thu, 21 Dec 2023 08:25:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C60A06B0083; Thu, 21 Dec 2023 08:25:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B19B06B0074 for ; Thu, 21 Dec 2023 08:25:13 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9013EA01AB for ; Thu, 21 Dec 2023 13:25:13 +0000 (UTC) X-FDA: 81590896506.04.3EE3268 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf15.hostedemail.com (Postfix) with ESMTP id DA34FA001F for ; Thu, 21 Dec 2023 13:25:11 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="WpF/84JY"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703165111; 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=Ppqe5/eIonwrzZ/jLo8c72gfFpAvKrjxuqv7T89lrl4=; b=3QUNkNcWWyn1AYtHoQiR2crn0GWCJ1j8dsUreB3OJynACf7/Ju+H681zgA9+Ay25FG1C61 K3NjOJECYaUdXxIF+VONxqlxXaWAtParsfeP5wFVnp117iIgOKXP3iaS1QYdKGiwt1h3hE 1m1qafZ0FnUmEYVF/S13COchkOR9KVk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="WpF/84JY"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703165111; a=rsa-sha256; cv=none; b=lPF54Bdfl6ht0QQQxn8HXPgjkEqbp/1h7wxcWHVlE1a2XfLXb0wzdhEkUTbbqmxDLBtFKE 4s0Ah//n0eHoMJWtXTAb/BeOsRF0cA0DiSFJ9+zJCp7wj+ugFs+C4VdnS9RsSvxZbn5Y0V PaidO153cViNQLkAC3wUlnMNXKZou+g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703165111; 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=Ppqe5/eIonwrzZ/jLo8c72gfFpAvKrjxuqv7T89lrl4=; b=WpF/84JY84B+thLW2fv9112p9YB+oIUY8KoV1zf13WgBBpCQ+g9V0ZRS0L/VInmFR7w9I7 CI9TpHQcbT70ACFYBpU23/SCr1+5vjP0OXYdxNnUniokkdzgr+YVXEMkCZawNYxpbiItaO yk3IXsdex9lF403gUCJmf8MU+pbsn+Y= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-267-T-OaSz2XMWyJ2kTJ901v0Q-1; Thu, 21 Dec 2023 08:25:09 -0500 X-MC-Unique: T-OaSz2XMWyJ2kTJ901v0Q-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 937461C0650B; Thu, 21 Dec 2023 13:25:06 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.39.195.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1273492BC7; Thu, 21 Dec 2023 13:25:03 +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 16/40] netfs: Provide tools to create a buffer in an xarray Date: Thu, 21 Dec 2023 13:23:11 +0000 Message-ID: <20231221132400.1601991-17-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.9 X-Rspam-User: X-Stat-Signature: ug467k68akfan3sm8rc343cfueqwrb6s X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DA34FA001F X-HE-Tag: 1703165111-573109 X-HE-Meta: U2FsdGVkX1+6b+rVz/WgLZuAF2HcP8ZX+7H6nGdOfkH1+ZWOUyTv3K84rJGpV0RxHCps5tL38/LonpYSPEhutJjd502ORdPZMd0TNZkw+WZk2yobcvFAmVg25ACE87JHXLWk0Fo7LuQW8mkAOs6DluKRHgbHV9tciQp321Bc8WaJGhIF9puieNFYMSJtVsvG+UTIjeG5XLg6UFrt0moeLyWfNARuoU0yG6cdvROE+k4ETZhxhnfEaf4wRvoYBHlnydL0dTe1ZX4Zg0i2u1YgNP+wbqEgJOXquR9LVlkiL4xN7PbXvT01ikYITRq+7IkA88NXzkyllbqpJtLGDHLqK2fgDJPKtyjQ8c+DBbuZ0rEcSfNeIePr2EOOEQ3wul/6W5hEXroGWM2q/wV8ExPrNWPoi5g899eGDp8b7bPJJUhAS0A6ULuFnD6j+yUbjOCO2sh96VbwPXBd3wY8HGniRJo/QNCVP8GlH5eZEky1YUriNU2o7Y4YBbew6pbTvO3iZnUT5m30UOjnIfgZTyzyx++2Ol8QxBXxRgJIMMrf3ekzD2R2eiRQBW050ZlNn4tdEeQEI/WBHw0lq5cTq2PIqaPq2Ygl90cXcmnieON+ZWsTK2pQ6/Zc9CrHYVackoeIdIJJqbXU/h0FjO+JMgpwJgx/cyWxoV5cmWRPV39GAOzIHb5TzHG9SZ4vs+qhxrgWtoBZOrcXtQ3Ig/fb5cjB7C5hd2OgNU3wB23rObE8UqOJffywiCSY2GdDvbZN5cOQQ31E8pzoqh4lw8gZK08ep9t527+5v+dgMGZ+MbsgH5FfuIPfdDyW3v4O7XFbTHp9glCE5NXBHnbzj6ZubjKLEeVcdpvsfPrwmGNvzfP4ITgUM67FTrl8+HpDyk+e0ZK1jJIBQxxvORN7qSd8z+nKQZerQ30MABqu99XEsFTQQSsgphVIeG97MaHT7Hf0VyNsgpLxtaYOuygekZpuvk1 tdJ3o9GZ UR7uouRk4TrucLWc3U59vVKm7CcH342FzQ7e1JLwh01OGOvpe6/LU+ShlS/UmhBuUuthOrl763+Uh5R59YqTcxAj9w7bL8DvvvR40eT+3J1xiSkVyv9GPfsdV7qT2WNkOMDGkHXwUfzQ4y1VTnZ2CpmwMrmLR/PcC+k1P5JELYBRcrM8E6ppcc0bEy1hgPS9NwXYgYUSEuuuSzvtqZBLFIho7CHjZvd4irYjHMM62GKWcof3k8mug6g6qf6GL9zm+EfSCUPi7mHa3EXgTf5bUsRQK6dXO5gdO/Y4RlaBDQGkQ+PMiruOXrmWYEfK/m6AqnxWwsG1wtxAS36BXUP/VIzWLl4stDtwJ7GiMyhcvVaMR2vc= 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: Provide tools to create a buffer in an xarray, with a function to add new folios with a mark. This will be used to create bounce buffer and can be used more easily to create a list of folios the span of which would require more than a page's worth of bio_vec structs. 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 | 13 +++++++ fs/netfs/misc.c | 81 +++++++++++++++++++++++++++++++++++++++++++ include/linux/netfs.h | 4 +++ 3 files changed, 98 insertions(+) diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index 4708fb15446b..b908c7e0a901 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -56,6 +56,19 @@ static inline void netfs_proc_add_rreq(struct netfs_io_request *rreq) {} static inline void netfs_proc_del_rreq(struct netfs_io_request *rreq) {} #endif +/* + * misc.c + */ +#define NETFS_FLAG_PUT_MARK BIT(0) +#define NETFS_FLAG_PAGECACHE_MARK BIT(1) +int netfs_xa_store_and_mark(struct xarray *xa, unsigned long index, + struct folio *folio, unsigned int flags, + gfp_t gfp_mask); +int netfs_add_folios_to_buffer(struct xarray *buffer, + struct address_space *mapping, + pgoff_t index, pgoff_t to, gfp_t gfp_mask); +void netfs_clear_buffer(struct xarray *buffer); + /* * objects.c */ diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c index 45bb19ec9a63..5d545073fe03 100644 --- a/fs/netfs/misc.c +++ b/fs/netfs/misc.c @@ -8,6 +8,87 @@ #include #include "internal.h" +/* + * Attach a folio to the buffer and maybe set marks on it to say that we need + * to put the folio later and twiddle the pagecache flags. + */ +int netfs_xa_store_and_mark(struct xarray *xa, unsigned long index, + struct folio *folio, unsigned int flags, + gfp_t gfp_mask) +{ + XA_STATE_ORDER(xas, xa, index, folio_order(folio)); + +retry: + xas_lock(&xas); + for (;;) { + xas_store(&xas, folio); + if (!xas_error(&xas)) + break; + xas_unlock(&xas); + if (!xas_nomem(&xas, gfp_mask)) + return xas_error(&xas); + goto retry; + } + + if (flags & NETFS_FLAG_PUT_MARK) + xas_set_mark(&xas, NETFS_BUF_PUT_MARK); + if (flags & NETFS_FLAG_PAGECACHE_MARK) + xas_set_mark(&xas, NETFS_BUF_PAGECACHE_MARK); + xas_unlock(&xas); + return xas_error(&xas); +} + +/* + * Create the specified range of folios in the buffer attached to the read + * request. The folios are marked with NETFS_BUF_PUT_MARK so that we know that + * these need freeing later. + */ +int netfs_add_folios_to_buffer(struct xarray *buffer, + struct address_space *mapping, + pgoff_t index, pgoff_t to, gfp_t gfp_mask) +{ + struct folio *folio; + int ret; + + if (to + 1 == index) /* Page range is inclusive */ + return 0; + + do { + /* TODO: Figure out what order folio can be allocated here */ + folio = filemap_alloc_folio(readahead_gfp_mask(mapping), 0); + if (!folio) + return -ENOMEM; + folio->index = index; + ret = netfs_xa_store_and_mark(buffer, index, folio, + NETFS_FLAG_PUT_MARK, gfp_mask); + if (ret < 0) { + folio_put(folio); + return ret; + } + + index += folio_nr_pages(folio); + } while (index <= to && index != 0); + + return 0; +} + +/* + * Clear an xarray buffer, putting a ref on the folios that have + * NETFS_BUF_PUT_MARK set. + */ +void netfs_clear_buffer(struct xarray *buffer) +{ + struct folio *folio; + XA_STATE(xas, buffer, 0); + + rcu_read_lock(); + xas_for_each_marked(&xas, folio, ULONG_MAX, NETFS_BUF_PUT_MARK) { + folio_put(folio); + } + rcu_read_unlock(); + xa_destroy(buffer); +} + /** * netfs_dirty_folio - Mark folio dirty and pin a cache object for writeback * @mapping: The mapping the folio belongs to. diff --git a/include/linux/netfs.h b/include/linux/netfs.h index bbb33ccbf719..c05150f51beb 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -109,6 +109,10 @@ static inline int wait_on_page_fscache_killable(struct page *page) return folio_wait_private_2_killable(page_folio(page)); } +/* Marks used on xarray-based buffers */ +#define NETFS_BUF_PUT_MARK XA_MARK_0 /* - Page needs putting */ +#define NETFS_BUF_PAGECACHE_MARK XA_MARK_1 /* - Page needs wb/dirty flag wrangling */ + enum netfs_io_source { NETFS_FILL_WITH_ZEROES, NETFS_DOWNLOAD_FROM_SERVER,