From patchwork Thu Dec 21 13:23: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: 13501940 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 3C6E0C35274 for ; Thu, 21 Dec 2023 13:25:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33C068D0025; Thu, 21 Dec 2023 08:25:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EE718D0023; Thu, 21 Dec 2023 08:25:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13EA28D0025; Thu, 21 Dec 2023 08:25:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 007208D0023 for ; Thu, 21 Dec 2023 08:25:51 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D05FA40DA9 for ; Thu, 21 Dec 2023 13:25:51 +0000 (UTC) X-FDA: 81590898102.27.7BF983F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 1E14D2000A for ; Thu, 21 Dec 2023 13:25:49 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NsA+rJ/G"; spf=pass (imf03.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=1703165150; 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=E8DHadUMrAmyrD2zJ9OBx3Yj4DJWS/EFe1NwcHoJl/4=; b=WhHF7WegrH+2StXc8qVtAo2uf/b56sbo1gaW0vz/zcNXCOvmwycenNHmpYzsTL+1plgZjt 4+PPvUJLvOgbtoEdd4sjf8MjIsVOEQTNJw1bwtUE6q5E1jySGnXlciOt3U69I38YNl2jXg XGpMIjks5WsMJhnCXU1YrU2MaUqFxkI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NsA+rJ/G"; spf=pass (imf03.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=1703165150; a=rsa-sha256; cv=none; b=HtW2c3E6wyBMOFcJVE8wPiHiFUBLLkG3QmJcmDdZyuTRjH8J9vu5jGi1y/ws5T2qn8nl+C xR+gcWC/pWDO6FN4k01YrRn7CtoY3Rv+/e2IqZET/v2QNFAH5VzQL1f5DO0iv/FDhcXr+Z JI1L2/693iHb+Oh5d3b21Qf6q3RN2oY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703165149; 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=E8DHadUMrAmyrD2zJ9OBx3Yj4DJWS/EFe1NwcHoJl/4=; b=NsA+rJ/G3sr/506/Y/eg5xuzLSond9n5KytIKtKf/G97Wdx8IN95k/CqILFa15DNyj2pNn GZ5I6n+KGna3JT3elgv2BxUGQTRDE3NSN9Forx//v5qdksECTP1KL5yBdUuCa4/DiZwRtu sQEe5uoOhFCLz/+OCthZqp+A3/qaudM= 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-193-myTjaGsHONG7n6nhgTx9uA-1; Thu, 21 Dec 2023 08:25:46 -0500 X-MC-Unique: myTjaGsHONG7n6nhgTx9uA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 10A1E383008B; Thu, 21 Dec 2023 13:25:45 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.39.195.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E56351D5; Thu, 21 Dec 2023 13:25:42 +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 26/40] netfs: Make netfs_read_folio() handle streaming-write pages Date: Thu, 21 Dec 2023 13:23:21 +0000 Message-ID: <20231221132400.1601991-27-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.5 X-Rspamd-Queue-Id: 1E14D2000A X-Rspam-User: X-Stat-Signature: ck8kywhewui5ic7ua61qoueeinspadqz X-Rspamd-Server: rspam01 X-HE-Tag: 1703165149-901461 X-HE-Meta: U2FsdGVkX19Be8D7QOnDMAyS4j874rW5QaO6Ov/D6GWmfW3/uqa668U2+0sv3VlD4BhsTNkjvh/TI/T39x1Kuw9MIusZhbvHVV65enIf1rC/LiUmwO7cz29i1WKV3oyV+eLMmyoE9A37zyo7lHgftsvy1tWthIAtcZT/RVG+XNFZLr7LKdxb4WnQjZDghL0IIcuYpAD5qnXfXomKtf/d2rp1lW5STnKqznhdA5dMwksh7EggUqHNx/PLiSRcNiXU3tiy2wSw0iGczlw4kEHjbfR5+nyducsSV6SmOX/IWzphG4QJpvz6xm+bkp8oKJtl6FwsHPJvuijciPQDpRidTLYyp6rcpPjvylLhRTyeoKFbEwNU9afmst1MD+kEZXruvUMjiLYTMO5vFcvYtT5f5L7giAkdXAg0PC6XR7KK+KmfwBXCgcMS+Y+ywsPbDw/d7JBtmtYvd41gM07T1B0asH3Uc3AVTHOP2UnOE4boxTgigpkWx/R96732V/hbWqj0SbWx+kBq28feIkHdumL5OblADevXUm/dZzLiojhqchLm/kfTQ+C6tJdAvSQUJ0nCwsdmJIajiO88gfh8xkmp/RVnBYpv/09UFQptEC/0/G88WpVrZA4yhJqci+/AT9mjshmLTGRTFvZBqg2VWnMjPbkgtFUyV9982rsYTwSf1TNjgSHFX9C1B+JLaLP3uUuznkiqRdSSz/jppje8k8owjWYdwwmz2358+18gW/BOWdiOG0B43QyOn2Nd24ABi33Yyxn/vemufkW6YqRFoD1mcC6qtBLtR7p6QY+VDQ6nz3MRP+zHuxe9ThVTgYpIlEbi67cOTBv7lr82teRip7FKZtvD6lO/oabb1kuhScPeuy6MYinnQkJqhtGwHGGk5ZdKOAuURW46TM3hYIS7UtCnBqn3/X79LhkMptRppEFQw4d7EYmg5PpsNhXgocRWDcywtEKtz7NX667/JiyRTHZ /csSEuy7 k4X6bIRpCNvJigMtkp+yG6q/TvJxqe8x+DrO9fTX4Br0u5a2bitq3u3eSLVWs7alRbxNq3YHdrjEFAaBYIMeTmWXORi6kw0PZVF3B2ZWvNImvb1EvBtu85x2dC+N+GdhxgAkiJM1lvswwrOYTpqKeZVA+N6OwI2IIVZ4xMBnquWUVqSqWaLPHyLBZ5eNiLxSozk0wuZMml5BWzW55bJP/1MbM/NrU6+7A1SUzqnrbNT2FCmuY+G+CURrPIkYIkPwlyyR+PLnO4a9qXg3QYI/6g9NMvEAYE7+QnJ/vpQF2pOHZWbbIBDD5ueK21N5sMer50iozDIVL+Zt5W0IHocHB7pbqWw== 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: netfs_read_folio() needs to handle partially-valid pages that are marked dirty, but not uptodate in the event that someone tries to read a page was used to cache data by a streaming write. In such a case, make netfs_read_folio() set up a bvec iterator that points to the parts of the folio that need filling and to a sink page for the data that should be discarded and use that instead of i_pages as the iterator to be written to. This requires netfs_rreq_unlock_folios() to convert the page into a normal dirty uptodate page, getting rid of the partial write record and bumping the group pointer over to folio->private. 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/buffered_read.c | 61 ++++++++++++++++++++++++++++++++++-- include/trace/events/netfs.h | 2 ++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c index 73a6e4d61f9d..950f63fc156a 100644 --- a/fs/netfs/buffered_read.c +++ b/fs/netfs/buffered_read.c @@ -16,6 +16,7 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) { struct netfs_io_subrequest *subreq; + struct netfs_folio *finfo; struct folio *folio; pgoff_t start_page = rreq->start / PAGE_SIZE; pgoff_t last_page = ((rreq->start + rreq->len) / PAGE_SIZE) - 1; @@ -87,6 +88,15 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) if (!pg_failed) { flush_dcache_folio(folio); + finfo = netfs_folio_info(folio); + if (finfo) { + trace_netfs_folio(folio, netfs_folio_trace_filled_gaps); + if (finfo->netfs_group) + folio_change_private(folio, finfo->netfs_group); + else + folio_detach_private(folio); + kfree(finfo); + } folio_mark_uptodate(folio); } @@ -239,6 +249,7 @@ int netfs_read_folio(struct file *file, struct folio *folio) struct address_space *mapping = folio_file_mapping(folio); struct netfs_io_request *rreq; struct netfs_inode *ctx = netfs_inode(mapping->host); + struct folio *sink = NULL; int ret; _enter("%lx", folio_index(folio)); @@ -259,12 +270,56 @@ int netfs_read_folio(struct file *file, struct folio *folio) trace_netfs_read(rreq, rreq->start, rreq->len, netfs_read_trace_readpage); /* Set up the output buffer */ - iov_iter_xarray(&rreq->iter, ITER_DEST, &mapping->i_pages, - rreq->start, rreq->len); + if (folio_test_dirty(folio)) { + /* Handle someone trying to read from an unflushed streaming + * write. We fiddle the buffer so that a gap at the beginning + * and/or a gap at the end get copied to, but the middle is + * discarded. + */ + struct netfs_folio *finfo = netfs_folio_info(folio); + struct bio_vec *bvec; + unsigned int from = finfo->dirty_offset; + unsigned int to = from + finfo->dirty_len; + unsigned int off = 0, i = 0; + size_t flen = folio_size(folio); + size_t nr_bvec = flen / PAGE_SIZE + 2; + size_t part; + + ret = -ENOMEM; + bvec = kmalloc_array(nr_bvec, sizeof(*bvec), GFP_KERNEL); + if (!bvec) + goto discard; + + sink = folio_alloc(GFP_KERNEL, 0); + if (!sink) + goto discard; + + trace_netfs_folio(folio, netfs_folio_trace_read_gaps); + + rreq->direct_bv = bvec; + rreq->direct_bv_count = nr_bvec; + if (from > 0) { + bvec_set_folio(&bvec[i++], folio, from, 0); + off = from; + } + while (off < to) { + part = min_t(size_t, to - off, PAGE_SIZE); + bvec_set_folio(&bvec[i++], sink, part, 0); + off += part; + } + if (to < flen) + bvec_set_folio(&bvec[i++], folio, flen - to, to); + iov_iter_bvec(&rreq->iter, ITER_DEST, bvec, i, rreq->len); + } else { + iov_iter_xarray(&rreq->iter, ITER_DEST, &mapping->i_pages, + rreq->start, rreq->len); + } ret = netfs_begin_read(rreq, true); + if (sink) + folio_put(sink); netfs_put_request(rreq, false, netfs_rreq_trace_put_return); - return ret; + return ret < 0 ? ret : 0; discard: netfs_put_request(rreq, false, netfs_rreq_trace_put_discard); diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index 8308b81f36be..082a5e717b58 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -118,9 +118,11 @@ EM(netfs_folio_trace_clear_g, "clear-g") \ EM(netfs_folio_trace_copy_to_cache, "copy") \ EM(netfs_folio_trace_end_copy, "end-copy") \ + EM(netfs_folio_trace_filled_gaps, "filled-gaps") \ EM(netfs_folio_trace_kill, "kill") \ EM(netfs_folio_trace_mkwrite, "mkwrite") \ EM(netfs_folio_trace_mkwrite_plus, "mkwrite+") \ + EM(netfs_folio_trace_read_gaps, "read-gaps") \ EM(netfs_folio_trace_redirty, "redirty") \ EM(netfs_folio_trace_redirtied, "redirtied") \ EM(netfs_folio_trace_store, "store") \