From patchwork Fri May 19 07:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 96241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1062708vqo; Fri, 19 May 2023 01:03:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ztD8pPg6tqFJBDxqTOALfzq6PVjfBN6E6vjke2jvNU8xrdcSBiQuU/PqLsUnrDsFvpTRb X-Received: by 2002:a05:6a00:1916:b0:64d:1e10:5002 with SMTP id y22-20020a056a00191600b0064d1e105002mr2242279pfi.10.1684483410070; Fri, 19 May 2023 01:03:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684483410; cv=none; d=google.com; s=arc-20160816; b=B6tWozoFouBEYwXwuwyr05CJphdTzKDIHNlqBjW7TYE53rc5tnJ2MbHARx/+el9JPr BU3KYDozu3W3p1hUR70vRbARxhak+HiuAA9hxYJBK6tsbWWia3H9m7XH7NPWXg7/f//2 H81aSaho9eXH0ygR/dJg7l8eZM3+VdwJ479xnztCaJDKD4NdakAjLn54cXQXyfl0cWha 8TAGIIsKqL38hIrTZcGNZqLIEvdbUlRcImU5m5jljQMiVW9ZTsVqTHUCO1lONHTSfNQ6 t11BFBARBq+iXA9uMyc6IigFGO8UwapL5xa6KYuxRiATSYwr98VJ4HuRDeSiw5e41zPw W2xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=g820KSNTP7OMqJOKF462B/JivphTXg8NZzTw8fVuImA=; b=IWOdrh+cLrhw73euvEZcy4DJtsjw2zzyni/glPuG1qiEOsnMqjJ/QYE1al4wwJzrr/ cRAk1ubkEUa3xWQl0+Wro4hJ4ofKmAIpFilgUooInqsiSRLboSWY7u2pIHkLPT/0BSTN ggQWtm+8a+Ilj/BwRMxSVo6eud1cke0sxspoEhK7dAfopTI5ax5MIPgNSk6rTvePaWWZ rdM4Ugy19FBv1dpiYCtjd6ilogN8VZJ6s7WwK63sSl2DoLdLmpgjdJPsWCvXU05BB3TR tWw7SvEd01q+cSucDie1XeJ32JGhhUdpO5iLcYdKkjCSq/pEgKmiES/8bXO84+Z6xRvL 0KKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Y1Y4ogU9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 66-20020a621845000000b006436ead4abesi3129880pfy.227.2023.05.19.01.02.55; Fri, 19 May 2023 01:03:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Y1Y4ogU9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231297AbjESHnb (ORCPT + 99 others); Fri, 19 May 2023 03:43:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231266AbjESHmv (ORCPT ); Fri, 19 May 2023 03:42:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD46E173C for ; Fri, 19 May 2023 00:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684482106; 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=g820KSNTP7OMqJOKF462B/JivphTXg8NZzTw8fVuImA=; b=Y1Y4ogU9sVFKhucR6tVRqjC7fEBt3N7wXjv1pxFWgr0x3HNU2528XdrNM7UttaghDTDSMR TinyBQAE/7rNU+8Gh3ZeGqMYFIQdXFHRrkrgxBUx+9UOulFt2jifSHczl5mMWQ0xxjRtEI Ee14dxk42yx7COKtGjSQ51q0GMTI9cY= 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-438-CWsHB0HDM6aXruJL4c8kbg-1; Fri, 19 May 2023 03:41:40 -0400 X-MC-Unique: CWsHB0HDM6aXruJL4c8kbg-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 B8C7E29AB3F4; Fri, 19 May 2023 07:41:39 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id D58D7C0004B; Fri, 19 May 2023 07:41:36 +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, Christoph Hellwig , Dominique Martinet , Eric Van Hensbergen , Latchesar Ionkov , Christian Schoenebeck , v9fs@lists.linux.dev Subject: [PATCH v20 11/32] 9p: Add splice_read stub Date: Fri, 19 May 2023 08:40:26 +0100 Message-Id: <20230519074047.1739879-12-dhowells@redhat.com> In-Reply-To: <20230519074047.1739879-1-dhowells@redhat.com> References: <20230519074047.1739879-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766308876506416348?= X-GMAIL-MSGID: =?utf-8?q?1766308876506416348?= Add a splice_read stub for 9p. We should use direct_splice_read() if 9PL_DIRECT is set and filemap_splice_read() otherwise. Note that this doesn't seem to be particularly related to O_DIRECT. Signed-off-by: David Howells cc: Christoph Hellwig cc: Al Viro cc: Jens Axboe cc: Dominique Martinet cc: Eric Van Hensbergen cc: Latchesar Ionkov cc: Christian Schoenebeck cc: v9fs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-mm@kvack.org --- fs/9p/vfs_file.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 6c31b8c8112d..0f3cb439ab2d 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -374,6 +374,28 @@ v9fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) return ret; } +/* + * v9fs_file_splice_read - splice-read from a file + * @in: The 9p file to read from + * @ppos: Where to find/update the file position + * @pipe: The pipe to splice into + * @len: The maximum amount of data to splice + * @flags: SPLICE_F_* flags + */ +static ssize_t v9fs_file_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags) +{ + struct p9_fid *fid = in->private_data; + + p9_debug(P9_DEBUG_VFS, "fid %d count %zu offset %lld\n", + fid->fid, len, *ppos); + + if (fid->mode & P9L_DIRECT) + return direct_splice_read(in, ppos, pipe, len, flags); + return filemap_splice_read(in, ppos, pipe, len, flags); +} + /** * v9fs_file_write_iter - write to a file * @iocb: The operation parameters @@ -569,7 +591,7 @@ const struct file_operations v9fs_file_operations = { .release = v9fs_dir_release, .lock = v9fs_file_lock, .mmap = generic_file_readonly_mmap, - .splice_read = generic_file_splice_read, + .splice_read = v9fs_file_splice_read, .splice_write = iter_file_splice_write, .fsync = v9fs_file_fsync, }; @@ -583,7 +605,7 @@ const struct file_operations v9fs_file_operations_dotl = { .lock = v9fs_file_lock_dotl, .flock = v9fs_file_flock_dotl, .mmap = v9fs_file_mmap, - .splice_read = generic_file_splice_read, + .splice_read = v9fs_file_splice_read, .splice_write = iter_file_splice_write, .fsync = v9fs_file_fsync_dotl, };