From patchwork Thu Dec 7 21:21:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13484034 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 0CFE0C10DC3 for ; Thu, 7 Dec 2023 21:23:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 497DD6B0074; Thu, 7 Dec 2023 16:23:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 449706B00A0; Thu, 7 Dec 2023 16:23:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E85B6B00A1; Thu, 7 Dec 2023 16:23:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1B7FE6B0074 for ; Thu, 7 Dec 2023 16:23:11 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DDDA1801AE for ; Thu, 7 Dec 2023 21:23:10 +0000 (UTC) X-FDA: 81541297740.05.EC40370 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 1934E40002 for ; Thu, 7 Dec 2023 21:23:07 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fTMAn2Sj; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701984188; a=rsa-sha256; cv=none; b=p3kWdBmSUhYsxDS8pVS0wH3wOi0gA+NZEUUR5IILFO0hJr2XHTuU8BRJD8Hl2eX35XfhmD 9RB0F4u2Q1bHeXb3C/DAK99IX3xsY0pa81/3s3W1QnJaHFpaN89gR5tp4Elq1P4VkfBHix 96E68VswSqjisjCyrRhgAFZZwBEzoLg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fTMAn2Sj; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1701984188; 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=8LJStTcEUC8o0lLNAVpCzprXOnufVOzk9OY/aFWfrk0=; b=dd4zfxUsfkIC8TrT2CDyqJIgng02DLxc4b+gc5Y439ojZOk4WstUgxZ8MsAhEuiGYcbTT/ s/qIets4mPrpAQyipp+xmvwS2xiR7Zt6VGHrcQhH2uhKq7qSlQ3LF7sE2krODUQeWiVily gvyPGk+tI8cIpj5V0Q9uLrKemNTpjSE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701984187; 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=8LJStTcEUC8o0lLNAVpCzprXOnufVOzk9OY/aFWfrk0=; b=fTMAn2SjA1adAV5V4fQlqAjRndhlfKu96N1Mj4Pttt5ExqGPoD+btCVBLH0q0s80TCxMhe sbZ5feDCdTbufn86CLTukoh34S6umWyFRUFFjeaGpmOap9Mv25CbIAb3q590RU1r1x1ext dWoofEBQwbnXQSMBPkktOKLHFbxNt0o= 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-654-_nDF-Qt8MKuELyYFtWU5zg-1; Thu, 07 Dec 2023 16:23:00 -0500 X-MC-Unique: _nDF-Qt8MKuELyYFtWU5zg-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 140E38489A5; Thu, 7 Dec 2023 21:22:59 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A4A1C185A0; Thu, 7 Dec 2023 21:22:56 +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 v3 14/59] netfs: Provide tools to create a buffer in an xarray Date: Thu, 7 Dec 2023 21:21:21 +0000 Message-ID: <20231207212206.1379128-15-dhowells@redhat.com> In-Reply-To: <20231207212206.1379128-1-dhowells@redhat.com> References: <20231207212206.1379128-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1934E40002 X-Stat-Signature: a6j6jqsqr535zprtkgfottb7r8ggzxr6 X-HE-Tag: 1701984187-860151 X-HE-Meta: U2FsdGVkX183ShIne0abjL8iHObPPlLnINaBkXdBVnBxeilfedgzat+e7nutNuMsAZhRcLm+abweCC9T10gaHsE+h9KlVC3Gof7Kq4ynvycDeRm/GdXi6zdvdQiTQr1V8Xkh4j4FUfolgHcZXwwspQ03oAwHJqiQ/2UWwuN0nvtM2WMrgpqgZqM2ut+DXjnzQ+CVBv9qSFOA0Frv6VpGQ1d2VwE7Jq7iZan55qiw95615DvGZqLaEWerETNrtGjxiCkr7N5sT7124luAuTLqX7HW6SnpVHNojXZLhRnYStB+z00IE2Ztha3jKFwjJlp8Yfi963Jk2ZOIELZxuz08PCkM1j1rEGymN6KKf7B9DexKadnZJAvB+P05pPOnSpjR3Uh5MNtEleeK4a+tD/Y+O2cP6726NUaXh+oH+JO6zxAkmwt9KDxM7+w4CS0AohLzw1yAf8cmJtX95Qg0p4BFKIFPckvNIiGm4MYjtYTamm+vgai7wwlVZMcWAy3284TrWVu1OgbqZ+a0rkfbjTQdjY1qJF6Nz9O6xPBk80RXoqLKOhhPda2m3g9KaCcJ6h4NDWgVHrJ7srumuuwIaE8B7IezQt23FrNUv1wl4yvAi/k6n64YruawKJFcjuDq9IvQFTjnTxcZ+835xhBV/OYqegoMBFzCHp7+kL/e7PdnsekskEqpGWXUD2Oqs5qTjJHShXgSzB7Ldfd5o8PJPBC1naDju0Lu/jLuUeNqhEV/gARhb2aMok50ANnuON7DQzVpqSRfLBZVSlk97YSfCGbROEHG1cgiGfYF63ZOT0I20YWmZbz6irgFN4/el6gq9c/bOdvIXoFThlW60G3j0puz8++/i4ONqyhjtAk+JsOB9clABMJvUFTFUwa//lTkBadfwlK1ghIVImVuVGAf4bpuZGJrak6pJPGUSQcd57IBAFyA38hsGWBP/VMSgPb5a3UWnoXNYF/LoTKzGd6XWXL KLV+OMGG /Rc5XSEwF/ByG52CmYm2EUJ8KQ/D1AQTklGE9RFtQCaHi7UYeVn9/Kgvqnas/hfgzh2/WzcZrHqRajomJ/SeMm57ZF9iYPY8AqvCmCM/n9IDTXt0+7TvCgzCEtwrSQrWPfNqgFJgfdw6p54xe/aSCJKPGShZZqaPnhEMav1SV93H86MvXT6CqPUz/oJzCauRU00Vl/B75urUQj/ZjF8O8IvuVVv2VWkspdPuZgbubOE2tsisMcPoUJ9opjeWB1mL1nRXfxlpY01CZvDvw7KoOHmvs0o6hXcUfVjlKj+50uIa+uzE+HKEJXN8MpyraAcYX/M/v 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 cc: 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 2bd99989dd7f..1f25e8622b8a 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 d946d85764de..96014c3d1683 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,