From patchwork Wed Dec 13 15:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13491222 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 092C2C4332F for ; Wed, 13 Dec 2023 15:25:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D23A78D0028; Wed, 13 Dec 2023 10:25:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C87378D0015; Wed, 13 Dec 2023 10:25:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A44CA8D0029; Wed, 13 Dec 2023 10:25:17 -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 7CC978D0028 for ; Wed, 13 Dec 2023 10:25:17 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 262C11C1487 for ; Wed, 13 Dec 2023 15:25:17 +0000 (UTC) X-FDA: 81562168674.24.3CE599D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 4A91E140012 for ; Wed, 13 Dec 2023 15:25:15 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ajzImziC; spf=pass (imf09.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=1702481115; 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=TyeDCrkCzlrF45NKmRnzOuDvS9hPtHcwk1ZYplID5CE=; b=SY9egxGuWUInjonQFr2gjve+YCmIjKEN3KlF+LBUKPKZzfqCEXWP+QzuxzDvOsE5THwOTb TP62XtEus9vxbtvd9CZluO7p2BV5G1QHYHuB0hZqW/FKjJltb2HWAkUeOhdn0MUDPRLuuT rrsQvkVFLGMnNca0Mb2tk1+j/KleDgc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702481115; a=rsa-sha256; cv=none; b=XntGJPIafOZ5T35pZr6iEHwnghqJunx8GZU7jeB4I8ZkLDhnvXBKysApwhVI5naJ14yKF6 SKWDwMF+tOjxt87c0Rw8n7sHmOmEfCvmdLcbj67DNNyeHLiHYe7xHwg9gFL/ZRVMQGtmfC dJHq9XDu7I/gj1QHX1CMK0xh/+ykJqE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ajzImziC; spf=pass (imf09.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702481114; 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=TyeDCrkCzlrF45NKmRnzOuDvS9hPtHcwk1ZYplID5CE=; b=ajzImziCdqdFmkBlqGlNXSAzRDbcPSyuGg6qn3Nkr3E7n4BAtSQ0WcTcP9bvRDhNdGJ2rF eNDzLEx4/Yf1JHIhWMV5nzAAxACHmbBX/iymeflTBqz+sXGjA61mg+RRrT0s7PfEoUYXNe Z8FafJ9oDVsAWek0xCORg7cHIAmQrJI= 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-279-80XknK_sN16WwcytEyXF_A-1; Wed, 13 Dec 2023 10:25:11 -0500 X-MC-Unique: 80XknK_sN16WwcytEyXF_A-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 74836863018; Wed, 13 Dec 2023 15:24:58 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FF89519D; Wed, 13 Dec 2023 15:24:55 +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 v4 15/39] netfs: Add bounce buffering support Date: Wed, 13 Dec 2023 15:23:25 +0000 Message-ID: <20231213152350.431591-16-dhowells@redhat.com> In-Reply-To: <20231213152350.431591-1-dhowells@redhat.com> References: <20231213152350.431591-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Stat-Signature: x5pqdhs145zujs19fcdfcu4owozhm6mi X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4A91E140012 X-Rspam-User: X-HE-Tag: 1702481115-416834 X-HE-Meta: U2FsdGVkX1+Fk4O7QZCJjK9/Rbc13nEDnYeC1Iiwzg6N7pgL6YMIg5S4QFcYQpSUHR5byq/eaxmQycpH66oxYx5i4iC/xFZsfFwnSDOQrhxDypLlvL/6a6YLDO7hmrvxxioSrgFzItVbD9ojgwUwgdQr9r/+g91lh0gQM7vuYgDYdXt0+MFn8ovCsE59D9hq9QLnTFRq/xDKfNMJDnWzwNk3RtrOFlwaPzuP/VDDAqbnRzbsKRq7BOKHTslw7iOGyGjMWzVXWosyQ0uSXBfgTCsl/g78B8gLyT6w6ntg7k3PS6B/fzkkk7oA/QPbXIH8GbD+AEE7fRt0aW176OvCPYA++9psVs3Yylmn50VGHRVzemrP4n2CNfFa90OVcKpGNbAvUsOyDu2Q7wSm4c/9SYhut2tbVlufmHYBFrFvYkhXUFlsHYa81rswxn+s6slRu0gEZQpoR/2uWyOgNXvZhzXTz4lt6l8ZGZIDyNQhcdUx6WS7QqyVmvWbf0SJxw03WYbdSBjbwTGTqorPMxpgsIqgi+OHoPCHiNxgRCcS2GW4PjhtXf4bwF4MxQ9JLqx6lYIVjNDsGk3F1CnMwgpq3Qu+VmkJKcNJJjQdB2c3ru/b4qGAU+HLNbCo8mfgMgL0UtllBRnlD+f4athpUku99nDzdeGblGHEo+HvUVAf8fP8IaDNhaiIipeMmSAcb6NcQaIBk2FUxhzZdAfxgJGYmwQvq1KvXyf6rQ687Xh4RCdubNvlhQo2n9n5OHAdBZLn3R/VLgqFA+36HMrpSn5nfFR3pymxDUzQP8k9xeQKs9b/VP8zPQLeUpsGFe6zr41nc2jxDO3ycYJHKFwjRpiOZ6siK6WbopLwIVsnjlMvy2I7NRlwq8muyPjj8PgG+mHE09yI6wiJbwWA5ttipNDLuaM2oXqNuOewUXKkU+wUv63YsCYNIAeqO5ovrlgvzJB09mVsbg94dBTBKjlbaM+ 6mFmRYLo khJzZ0xo65unsMDgJ9qaUy0mKwEk2pPcAaFidNtiXBhI2vUq53PUS110XQXvISjdVUxFGZLfwMByy9Vbh2Ep3nEyc6EsrjVmzM/QcSoe2zst64JW/zvplEWimgCRtK7oBYF9mp3cwXKgKBpz280Cn8FM3FgQkrmso3AiTIpc1wRr++a7LdoTSV/sEK9NTKLjL9fphhri4TnY257umBvK3nWFsKOihBEJi7oEc45T6jXcV2QwuON/Lf/zHuvhKL7qPeliAUAm/T+NRV5MKuYx28Pd/YqvcTLyr6x39avbJMsQepG8= 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: Add a second xarray struct to netfs_io_request for the purposes of holding a bounce buffer for when we have to deal with encrypted/compressed data or if we have to up/download data in blocks larger than we were asked for. 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/io.c | 6 +++++- fs/netfs/objects.c | 3 +++ include/linux/netfs.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/netfs/io.c b/fs/netfs/io.c index e9d408e211b8..d8e9cd6ce338 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -643,7 +643,11 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) return -EIO; } - rreq->io_iter = rreq->iter; + if (test_bit(NETFS_RREQ_USE_BOUNCE_BUFFER, &rreq->flags)) + iov_iter_xarray(&rreq->io_iter, ITER_DEST, &rreq->bounce, + rreq->start, rreq->len); + else + rreq->io_iter = rreq->iter; INIT_WORK(&rreq->work, netfs_rreq_work); diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c index 4df5e5eeada6..9f3f33c93317 100644 --- a/fs/netfs/objects.c +++ b/fs/netfs/objects.c @@ -35,12 +35,14 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, rreq->inode = inode; rreq->i_size = i_size_read(inode); rreq->debug_id = atomic_inc_return(&debug_ids); + xa_init(&rreq->bounce); INIT_LIST_HEAD(&rreq->subrequests); refcount_set(&rreq->ref, 1); __set_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags); if (rreq->netfs_ops->init_request) { ret = rreq->netfs_ops->init_request(rreq, file); if (ret < 0) { + xa_destroy(&rreq->bounce); kfree(rreq); return ERR_PTR(ret); } @@ -94,6 +96,7 @@ static void netfs_free_request(struct work_struct *work) } kvfree(rreq->direct_bv); } + netfs_clear_buffer(&rreq->bounce); kfree_rcu(rreq, rcu); netfs_stat_d(&netfs_n_rh_rreq); } diff --git a/include/linux/netfs.h b/include/linux/netfs.h index c05150f51beb..8a5b8e7bc358 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -194,6 +194,7 @@ struct netfs_io_request { struct iov_iter iter; /* Unencrypted-side iterator */ struct iov_iter io_iter; /* I/O (Encrypted-side) iterator */ void *netfs_priv; /* Private data for the netfs */ + struct xarray bounce; /* Bounce buffer (eg. for crypto/compression) */ struct bio_vec *direct_bv /* DIO buffer list (when handling iovec-iter) */ __counted_by(direct_bv_count); unsigned int direct_bv_count; /* Number of elements in direct_bv[] */ @@ -216,6 +217,7 @@ struct netfs_io_request { #define NETFS_RREQ_DONT_UNLOCK_FOLIOS 3 /* Don't unlock the folios on completion */ #define NETFS_RREQ_FAILED 4 /* The request failed */ #define NETFS_RREQ_IN_PROGRESS 5 /* Unlocked when the request completes */ +#define NETFS_RREQ_USE_BOUNCE_BUFFER 6 /* Use bounce buffer */ const struct netfs_request_ops *netfs_ops; };