From patchwork Tue Apr 30 14:00:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13649091 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 19FF6C4345F for ; Tue, 30 Apr 2024 14:03:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6AAFF6B00BD; Tue, 30 Apr 2024 10:03:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 65A696B00BF; Tue, 30 Apr 2024 10:03:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D43E6B00C0; Tue, 30 Apr 2024 10:03:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2E5EA6B00BD for ; Tue, 30 Apr 2024 10:03:10 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E0DE840802 for ; Tue, 30 Apr 2024 14:03:09 +0000 (UTC) X-FDA: 82066364898.22.5F61C1D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 01BDF140021 for ; Tue, 30 Apr 2024 14:03:07 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=f0T3ElAE; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.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=1714485788; 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=RVKnlQo0k8LYSKy/5xkID19zXhvzF8VfogUxkP/ClX8=; b=LqS7exr3y8ffl6lL1xTGMAg74TgZekbapcPbTzJeWEQhle4pmfl1+9yPA/u9pcF3nRYiDU M0wkE4Szb4Fc/8DGIdj0fT0KplcYm46L/oN7xiwkiQ2H4ZwQ5T3WdosKL26KOCKyaZjOGR RkN9zknfGC4oT71BJ87Kyc1CwEm6o80= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=f0T3ElAE; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.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=1714485788; a=rsa-sha256; cv=none; b=wVTuPrzzer9qZHnrmD9CEjzf7mA+oFnIkPG672V7C+3Z4/6/4QSntdDjUlIWFBKghMmd1U +iiIt3bR5PKccpciXCC4F+KIvPh01cE8ejV4NCd87gd9tV59Vhu0OfFTONwr34LCjtqgnn WQSN8OLpJm9z7jkoW4V/hROh1HT8TCc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714485787; 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=RVKnlQo0k8LYSKy/5xkID19zXhvzF8VfogUxkP/ClX8=; b=f0T3ElAEtMxOf40Tgaj3PCGx0FRrSIC7PQCSP9q1HRlASmIFwXax/3hHOmAO0qggY9tQZz U4xRDRX3kjUFbAqkxUUddvbXeHcNhC2loS/WCR9N4RH5EFLwqrgws+4DraZVCFbAAscq6X CHLgeCaDJBXBSvvqqmBcxk/YNYpJyaI= 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-611-0FXqmQelOLGG4J2V-HVVnQ-1; Tue, 30 Apr 2024 10:03:00 -0400 X-MC-Unique: 0FXqmQelOLGG4J2V-HVVnQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 20E123819C42; Tue, 30 Apr 2024 14:02:12 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 417FE1121312; Tue, 30 Apr 2024 14:02:09 +0000 (UTC) From: David Howells To: Christian Brauner , Jeff Layton , Gao Xiang , Dominique Martinet Cc: David Howells , Matthew Wilcox , Steve French , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, 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-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 16/22] netfs, afs: Implement helpers for new write code Date: Tue, 30 Apr 2024 15:00:47 +0100 Message-ID: <20240430140056.261997-17-dhowells@redhat.com> In-Reply-To: <20240430140056.261997-1-dhowells@redhat.com> References: <20240430140056.261997-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 01BDF140021 X-Stat-Signature: 7zb9ci1qykbajqp4kngou3kbb1ms15q1 X-Rspam-User: X-HE-Tag: 1714485787-27073 X-HE-Meta: U2FsdGVkX19hsME3fps3lCFnHcjdNH1heuMGgNqa+gUsvzD3SkYBzetaB/ra/Urmijp5rJnL706cn8pkqHyoS7VWnBoqrL3Sy3U+xXHdr50FeEPgGsKN0wkBRbq8n/cGUF4GKgPtEPFruFMdNiQYvrhSq29yncTUznfZoRJ2J+zWK+VMfRNgbv+J/9sN3rIzjbX8N9HgiV7xVN1dWkcikCfyxEml5jvL62L7RdiCuqK/Jhd98BC81QAnBqCF3+LhgqbbEhXgW20fv+q33ZFD1yomI/klthkdmPUKPVuuXFKQBZFpoGE8UUTuLN5xPi81oXMNA1IJ5GkRtphq9aUVPrTKbgBy2GPWIsrvtPYIdHKjulhsBDXceg5SznxZJSkZm9TIaYNokyEKKfzwqDssFUbczjq/iXHhzX1XyYF1sLWwrv8te/XM6LMOMoUukHEMiiFFYXoYRXuW//wKllaymAW102tUYeTZ6r1PPQ5oOV+D7Dzp8J+U4Jod6dcRxKFeXUXdAqB8WUtXqac2Nd8mBN+Q47o2H8Wzg6nqrsfQtDqZvBtcTDtzLFq2Y8j/khyaaKhG0ZFX4vP2OtGMTyyv4is3qeLx4p54MzO9QdigRPOIXr3o6U5N8+IPz/9QOouYZ4bXTGWX0h9Y6oCuHJ2l6LmRkmkIlGu8lzfQHa1yWZQo5UN9zaM87LpWPn9Tovrin1E/4caOTm3hrfLlOPNcZxyFNMfTBhODaZ7whuEdq/ifNBa+hTCpdDnwvANTsanqLE1eMcwMpP4GE/hMmzEXUOIMDW+jusCyAxGtP8Eh3yqBRc5MnWdomxtrgM4SZq++7nV1XmyNi89XK+fh7RFM/yPqDsZBaGOo64zAqZ6z8czv6y2GedaXeHrya05dRHvnGYxaYPqMhpCDTiN10QcZaHTtHMlnb0nHFeKWfn5NRl2Hstl87gSJB4CjZBrBrBNEYTo+puWxsO8xtTLQJbJ m4/W/mER sN4vMb6PZ503GkQf2r3wIxIOK6cDr6yhJ6HQLuiZSGLyJ/uc9EPW85P9tv5HQT/q9hDZ7JpHpZ8vy/WoIqmXQLqhK/njukRfGzFjxX8KbqytJLJ2s0I0wsjVIqsSgqLXUpWjN+i+FkBoQJ1xWxybYQKfW9MBokTeHfr1qu29yvRONOZAddHv++T+7dYGsHeQAkPahdK+tsHuYdgn+ekVf7KAhFIZMhE6+a/XyUVmhHrH36hHl7Ix0Aqf/soIlJLn7hchbkxPyhSCd1yb6kawFLG7L8YKVPuT5Nn16mmg+seM4cIMHuS7SYdYXkiZD21+G33ddlIIDnO0ev/K4azjijVH8k4t9uuOUxhwKGbKQMP6tqAHog2D+Yadqu/Kd8qkJQlO3 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: Implement the helpers for the new write code in afs. There's now an optional ->prepare_write() that allows the filesystem to set the parameters for the next write, such as maximum size and maximum segment count, and an ->issue_write() that is called to initiate an (asynchronous) write operation. Signed-off-by: David Howells Reviewed-by: Jeff Layton cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- Notes: Changes ======= ver #2) - Don't do the StoreData RPC inline, but keep doing it from a workqueue. fs/afs/file.c | 3 +++ fs/afs/internal.h | 3 +++ fs/afs/write.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/fs/afs/file.c b/fs/afs/file.c index dfd8f60f5e1f..db9ebae84fa2 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -400,6 +400,9 @@ const struct netfs_request_ops afs_req_ops = { .update_i_size = afs_update_i_size, .invalidate_cache = afs_netfs_invalidate_cache, .create_write_requests = afs_create_write_requests, + .begin_writeback = afs_begin_writeback, + .prepare_write = afs_prepare_write, + .issue_write = afs_issue_write, }; static void afs_add_open_mmap(struct afs_vnode *vnode) diff --git a/fs/afs/internal.h b/fs/afs/internal.h index b93aa026daa4..dcf0ae0323d3 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -1598,6 +1598,9 @@ extern int afs_check_volume_status(struct afs_volume *, struct afs_operation *); /* * write.c */ +void afs_prepare_write(struct netfs_io_subrequest *subreq); +void afs_issue_write(struct netfs_io_subrequest *subreq); +void afs_begin_writeback(struct netfs_io_request *wreq); extern int afs_writepages(struct address_space *, struct writeback_control *); extern int afs_fsync(struct file *, loff_t, loff_t, int); extern vm_fault_t afs_page_mkwrite(struct vm_fault *vmf); diff --git a/fs/afs/write.c b/fs/afs/write.c index 1bc26466eb72..34595f482718 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -194,6 +194,60 @@ void afs_create_write_requests(struct netfs_io_request *wreq, loff_t start, size netfs_queue_write_request(subreq); } +/* + * Writeback calls this when it finds a folio that needs uploading. This isn't + * called if writeback only has copy-to-cache to deal with. + */ +void afs_begin_writeback(struct netfs_io_request *wreq) +{ + wreq->io_streams[0].avail = true; +} + +/* + * Prepare a subrequest to write to the server. This sets the max_len + * parameter. + */ +void afs_prepare_write(struct netfs_io_subrequest *subreq) +{ + //if (test_bit(NETFS_SREQ_RETRYING, &subreq->flags)) + // subreq->max_len = 512 * 1024; + //else + subreq->max_len = 256 * 1024 * 1024; +} + +/* + * Issue a subrequest to write to the server. + */ +static void afs_issue_write_worker(struct work_struct *work) +{ + struct netfs_io_subrequest *subreq = container_of(work, struct netfs_io_subrequest, work); + struct afs_vnode *vnode = AFS_FS_I(subreq->rreq->inode); + ssize_t ret; + + _enter("%x[%x],%zx", + subreq->rreq->debug_id, subreq->debug_index, subreq->io_iter.count); + +#if 0 // Error injection + if (subreq->debug_index == 3) + return netfs_write_subrequest_terminated(subreq, -ENOANO, false); + + if (!test_bit(NETFS_SREQ_RETRYING, &subreq->flags)) { + set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags); + return netfs_write_subrequest_terminated(subreq, -EAGAIN, false); + } +#endif + + ret = afs_store_data(vnode, &subreq->io_iter, subreq->start); + netfs_write_subrequest_terminated(subreq, ret < 0 ? ret : subreq->len, false); +} + +void afs_issue_write(struct netfs_io_subrequest *subreq) +{ + subreq->work.func = afs_issue_write_worker; + if (!queue_work(system_unbound_wq, &subreq->work)) + WARN_ON_ONCE(1); +} + /* * write some of the pending data back to the server */