From patchwork Fri Oct 13 16:03:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13421155 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 17229CDB483 for ; Fri, 13 Oct 2023 16:05:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73A996B013C; Fri, 13 Oct 2023 12:05:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 711396B0145; Fri, 13 Oct 2023 12:05:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D88A6B0146; Fri, 13 Oct 2023 12:05:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4ED1E6B013C for ; Fri, 13 Oct 2023 12:05:21 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0783E120259 for ; Fri, 13 Oct 2023 16:05:20 +0000 (UTC) X-FDA: 81340912842.20.2B1EAF4 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 40FD114004F for ; Fri, 13 Oct 2023 16:05:18 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DGMPQuGG; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.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=1697213119; 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=/wI2ukAfhLlByZQe0rXpGLnwelltmScQCYU5cYtls1s=; b=qD4rLs/x8xgLfxocSR1sQ/EgHFprXSLcIC+PbeAk4Gu3aR2G8nyiI9L1zFGj1NmqFso0Nn okQyJVU+AHc6eCmRYcHArvsrnRfzVIuVX9q25pyM+s14otIV6Za+oXyQ9sXN3ycbHxy1ek 2FStf66hCuGIbVmzzZKWUQGhwlVktng= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DGMPQuGG; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.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=1697213119; a=rsa-sha256; cv=none; b=14sgs+AU0gtVhJclh1QDN2OUuiVqA94H7dahnD9qsNxUvOKk7GtNNmsK7PsVI8pGrJPdnx EPZp0btiD/xOh7yioHcb6vbsM7n1/8w4ZCPpG6jd43Jkdty1MWHB7rLBglcppSoZezGSdk COTtu2Lb48gcWlKC4DF2GcowkeZDFwA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697213118; 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=/wI2ukAfhLlByZQe0rXpGLnwelltmScQCYU5cYtls1s=; b=DGMPQuGGRXMGRMWMVYPv3j70k6eJdi39iJkMUIMgkOKBWsCH6b1dj4pnoU+6nRswepDhvR rlqI3w2YJgio0bx+6/iGDbrOXOo7OsBDOqWrgbXxgMUxg94l2nyAeOBrJjPnC0VhG3ims4 HfkHjE8c7m4S+5Tc8chxd0dS//zfSxw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-393-Y3JGXtQpP-C4R3eDg4Xd4A-1; Fri, 13 Oct 2023 12:05:12 -0400 X-MC-Unique: Y3JGXtQpP-C4R3eDg4Xd4A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4C5A88B7A8; Fri, 13 Oct 2023 16:05:10 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A8DB201F457; Fri, 13 Oct 2023 16:05:08 +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 , Ilya Dryomov , Christian Brauner , 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, linux-cachefs@redhat.com Subject: [RFC PATCH 13/53] netfs: Add bounce buffering support Date: Fri, 13 Oct 2023 17:03:42 +0100 Message-ID: <20231013160423.2218093-14-dhowells@redhat.com> In-Reply-To: <20231013160423.2218093-1-dhowells@redhat.com> References: <20231013160423.2218093-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspamd-Queue-Id: 40FD114004F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5u13a1wbw3i955xemodmetdpgk48tj3h X-HE-Tag: 1697213118-445530 X-HE-Meta: U2FsdGVkX18i0L1BbbIcWZr1APZPhF5Y4I4h9G1+F84vs1i3SJ8WhtameOolRm0KAlf72AxPD9+T3+Ib4cqnjzmXzUJAjS/3mqvYBh+8RwZcogXfWeqNoW55T1bRV5wtuDVADRm1CqraL+9zDJQRX8NiktRcegiS32FLYF1/kBM8lV+gaVSiuDfQdCY/Hyg/W4btY6bnYu2X5vT8an6l1ksRR8R5FPcm4reHgMwkzxo5XnwvqiT+v6kIJAE8cYso/F0FixSgPG4BMtq8sE3ky3aB7FjAfzxAJFQ626JsCHjlSxK3JEQ/RMW7CtasA9Rw81/nEuUZNjINl31I5vnQ5/jI2MUoPNr5l+oXtxi60wrY0CwJZZOfUlhDodHFrqwxa235U84yYT2fOBhiHkwjziqEhMtH0eAYBGMSAYUKanuBFNwCiADFebaNrp5b84pS7+QAB6NouLi3WMiss0hPXkMYDEFfoG8LhQoxgfu3hscZ+lTHmoerDTAyonXyazxe4cxUFF1cSxYvGHZx2jr3uxG2KLIySiP1JptSSfJE2lfVmmwT+fGjej6FBjzfMrJv7EJMv4aVz7QAsAsnk+FkNCJXAzCu/T5/KfhpxM+k+080D9PizTfd/g4N4Kn087tRrQwaWWYkZ2N9SzkYDilndYZodkuX7VHnK3kRHaANAsVjlRiKoS73S6uuC3QtUmBWM6mOlGhGMKCEAe+I9urevMyRmR3so5f8UMa44nkymgrBpiSosxi+VNc5+0gX8wBCT4sqzc0JEODPk70Kzd416tXD2wiClqlVgKgd+c6NVb0KURlkG1paGJ8DmndM8AzftdVUZbCocxp6UN+blNIjgp4qfo5b7AqAa3S8TSxwglALiwfLiMd5QG4xAiVzpzZ4oy82hwnKnDm329MfVsqxGRZxyOq6FrZtFhTHDmwzvf5Xh267mPJZSq0rOBEatEvf2Bx2kEAfWFYNh9kxN2R CEp4F+GA EXmq1I7IwjzAO6AylTbhLn6OIPfnykNQtvYoKIQgS9VcV2JUcj07cR4P4x8vrXc9rUTmMwgiiHaeUEvrNq/j9AySTNeY5EAf/5UaDuYyImJgUE9pRXOwb0w/mehnPadxRDAX7FbWk68WlXH25A3icCxf7k3ZPrD+1NErcxlsNVZi75NeR0TBuszifiYj7W8PObtY040S8WOl6Ch7uCd7+B1IMKlcgbWF9wzEe3yn041r6fDbwrQN9sbfgu5d0DpZ+sNuWG5AmoQkDavxAQ7JZbICsswnR+jOHuHHkjWeD0CeaGSo= 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: 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 4396318081bf..0782a284dda8 100644 --- a/fs/netfs/objects.c +++ b/fs/netfs/objects.c @@ -35,6 +35,7 @@ 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); @@ -43,6 +44,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, 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); } @@ -96,6 +98,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 e8d702ac6968..a7220e906287 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -196,6 +196,7 @@ struct netfs_io_request { struct iov_iter iter; /* Unencrypted-side iterator */ struct iov_iter io_iter; /* I/O (Encrypted-side) iterator */ struct bio_vec *direct_bv; /* DIO buffer list (when handling iovec-iter) */ + struct xarray bounce; /* Bounce buffer (eg. for crypto/compression) */ void *netfs_priv; /* Private data for the netfs */ unsigned int direct_bv_count; /* Number of elements in bv[] */ unsigned int debug_id; @@ -220,6 +221,7 @@ struct netfs_io_request { #define NETFS_RREQ_IN_PROGRESS 5 /* Unlocked when the request completes */ #define NETFS_RREQ_NONBLOCK 6 /* Don't block if possible (O_NONBLOCK) */ #define NETFS_RREQ_BLOCKED 7 /* We blocked */ +#define NETFS_RREQ_USE_BOUNCE_BUFFER 8 /* Use bounce buffer */ const struct netfs_request_ops *netfs_ops; };