From patchwork Sat May 20 00:00:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13248992 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 5E67AC77B7A for ; Sat, 20 May 2023 00:01:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E58A1280009; Fri, 19 May 2023 20:01:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE188280001; Fri, 19 May 2023 20:01:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5B8F280009; Fri, 19 May 2023 20:01:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B26BD280001 for ; Fri, 19 May 2023 20:01:35 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 75CE0A0982 for ; Sat, 20 May 2023 00:01:35 +0000 (UTC) X-FDA: 80808679350.22.338A6AB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id B1EC18000C for ; Sat, 20 May 2023 00:01:33 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BaU8WPD0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.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=1684540893; 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=Mo6NWBR6hkfydtMnZeO+F5U5GhN+vbQRFCzRyccP/1I=; b=lVCPwdGmI3RQpRrfXf3BhVEnk4L2ItjgWDpXnEnCoVAhJy0z6Fkib518LpR1n+AMrXvSd7 Zu2ehWZAlDoJDSvqHRPT3Yog/Ov4wz42XrQ1NBUI2plk5eCRnM6D9pWoa4CTjMIUVcyiAu F0rHI53jKmoK5Xfc/FxQ2u9mNJfUo60= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BaU8WPD0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.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=1684540893; a=rsa-sha256; cv=none; b=CvMNI69ewyBZZQMXvzx1kHHIgA4aAd/Ifx0YJD0EVJHGG44ZwfRV11J9wgNYgM7Sr8Usus Gg7W3mvcBpxXi24BliCbJJpZTrdS2bg+1p7FjooEqnxn8vjOlZdvL3gHyksAQF/+soaHLy Mlp/jsL19T8hpGgVAtePYm4DCJO7V3A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684540892; 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=Mo6NWBR6hkfydtMnZeO+F5U5GhN+vbQRFCzRyccP/1I=; b=BaU8WPD0W+uGgg5OvxdPipeiFAavpK2mr6Os6mZR3oNnIwmqVgPsvCM5JaA8CpNTp/baM0 DAn2GiTLCfh89htCTq31No1XGtrf8J7srQ9lqhUDboqHSrd8J/CUhunwKbD73Oi1qwVpra d5eNUornyCDvw7l1cKDFMlohdmmfYaA= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-269-SoJDvSKvN3ST1yDutl5l3g-1; Fri, 19 May 2023 20:01:28 -0400 X-MC-Unique: SoJDvSKvN3ST1yDutl5l3g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCE281C041A2; Sat, 20 May 2023 00:01:26 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21827C154D1; Sat, 20 May 2023 00:01:24 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Jan Harkes , Christoph Hellwig , John Hubbard , coda@cs.cmu.edu, codalist@coda.cs.cmu.edu, linux-unionfs@vger.kernel.org Subject: [PATCH v21 11/30] coda: Implement splice-read Date: Sat, 20 May 2023 01:00:30 +0100 Message-Id: <20230520000049.2226926-12-dhowells@redhat.com> In-Reply-To: <20230520000049.2226926-1-dhowells@redhat.com> References: <20230520000049.2226926-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Queue-Id: B1EC18000C X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: z1wf8554wrb53peyncub845j51yz3edu X-HE-Tag: 1684540893-653948 X-HE-Meta: U2FsdGVkX18VBV3/klk1obfD/8rPfJpmWBKjsl/d8cwhzKTksGEW+B0PuHefmhTs5j1L3bQMCaGmbh/s2wPw4t8cknqF2/gI1ZARI110rrV8DQdGebFaK2QKPg33Oci+S+RIshz4x2wJFaR1Cl4f8OWn/YuzW+Bfc5iQ4kAdh3nHaJtDleIaRKNVnCGfosapBlp0hdzGqi8Ttae7EMTAhxCaOk0klDDpc+aTqMdgIz+065GMuKAakhrOmD3NLhGZCYsxTwYkP8D01tg4uDTkqldOxG73M9o4ci2VvaQUrb07UDGzH75oDf+tzcUmAP58oR8j0RbaJ2KqF0BvQfKwESO02JeB+DoeXuKrM6rjoiRiuE8JRKLLLcme4YQG6CrYEKa7guArvyAl5YSx+ulQxi4J5uB0ksmzxtf6wXHmg/Zqz2YxF2kAFp28/RT0GYb3IM2by4zFZHkApoLCkVphTzdTYWRsQ0nftxZIsh87pwi9xo123Q/uOOkVDtaU/bdwrgsYaRul1/xVQ7feXXWmL4qV5MXD2HqtXAD1AcaldLlfMPgGeDbgu2mdbxWhYdriEm6DFygjWIkYEuRB06krUuBfLuNfqJkY1ZIqhexk81CiqKWqhfpjBy3V96I+Y03+XlFt/d96TBUiokYEiyZIiTanI34BOvORT7+4uYbF0bPDq+9Z0fegC0z6ZFnZERWUANQNQBnOF4gwYznGZrPkMwL/wPk8MXEb2/8fTdtwX5wcUZzYoOfEzTzw1XjBAsux3Bg5Sqe3p8j3teVtBnWKT7zY4RL4xNc3bBr29ep78jG3XQ67Z4yoGLlrxNVKrHCmpxCkek+JGEbajaQVOJlHQdJBr6evcioByThpr45q8fy/0qjlGE7CNdmlP+Tx1XgKo3kkaGedUq/zEPaoSbe3sLhMYlX6v48kXn7Ai1evQM+SIyCgAbkJ8WZRd3v6Yaxl1ZdC1uPTDh3Sh1SuoET NBkISdSk xz/rnWqzxhcTp7tmM7fXVixg/m4FwJxugMtZbCdeTNnUraNqv1utL/K/tsk4eg59zP6TMnOadSoncPH5uhCffXZa4f0nqkyu2WCAAxp8LL4Zsmh74F/ezRpnSuxyaoT5pHNuvcYwysksHYSjAO5KLydBj9ZWIU1x2GbOg0hr+uvMxEOCkaMn3VVf6p2ejJGehg+HXNTW1cA4gaIwkE64MO6Cys6ghc0RF8TljBZ+iL4/eHmL6OUCcDw1qqB/sTy+HYIngPBqjKzfU6vBEvtRsbeOUD+4rRksxmg9fC41K/Z3Ka2/u9tGH6GYDhBtsIj+Ain8hRBujBDOzIVNYGdXz4+1jPc3KVZQnGeoaJqc5h2JMma2YwIV2jfe9oOZv8Il6y+FClVtNZj+gYrenKI868L8c0shXLOS3PGbDD7HM1rXLuCw9nKbd5+iJAQ== 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: Implement splice-read for coda by passing the request down a layer rather than going through generic_file_splice_read() which is going to be changed to assume that ->read_folio() is present on buffered files. Signed-off-by: David Howells Acked-by: Jan Harkes cc: Christoph Hellwig cc: Jens Axboe cc: Al Viro cc: John Hubbard cc: David Hildenbrand cc: Matthew Wilcox cc: coda@cs.cmu.edu cc: codalist@coda.cs.cmu.edu cc: linux-unionfs@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- Notes: ver #17) - Use vfs_splice_read() helper rather than open-coding checks. fs/coda/file.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/fs/coda/file.c b/fs/coda/file.c index 3f3c81e6b1ab..12b26bd13564 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "coda_psdev.h" @@ -94,6 +95,32 @@ coda_file_write_iter(struct kiocb *iocb, struct iov_iter *to) return ret; } +static ssize_t +coda_file_splice_read(struct file *coda_file, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags) +{ + struct inode *coda_inode = file_inode(coda_file); + struct coda_file_info *cfi = coda_ftoc(coda_file); + struct file *in = cfi->cfi_container; + loff_t ki_pos = *ppos; + ssize_t ret; + + ret = venus_access_intent(coda_inode->i_sb, coda_i2f(coda_inode), + &cfi->cfi_access_intent, + len, ki_pos, CODA_ACCESS_TYPE_READ); + if (ret) + goto finish_read; + + ret = vfs_splice_read(in, ppos, pipe, len, flags); + +finish_read: + venus_access_intent(coda_inode->i_sb, coda_i2f(coda_inode), + &cfi->cfi_access_intent, + len, ki_pos, CODA_ACCESS_TYPE_READ_FINISH); + return ret; +} + static void coda_vm_open(struct vm_area_struct *vma) { @@ -302,5 +329,5 @@ const struct file_operations coda_file_operations = { .open = coda_open, .release = coda_release, .fsync = coda_fsync, - .splice_read = generic_file_splice_read, + .splice_read = coda_file_splice_read, };