From patchwork Fri May 19 07:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 96227 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1058203vqo; Fri, 19 May 2023 00:53:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7NTnEdj+9v6qEj5M6WPodzCgsgNfFJdfNyMxu1U9F2jyqwJ8nqJqDbpR6qDi9BH/Jdnrbz X-Received: by 2002:a17:90a:d302:b0:23f:2661:f94c with SMTP id p2-20020a17090ad30200b0023f2661f94cmr1369546pju.47.1684482791517; Fri, 19 May 2023 00:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684482791; cv=none; d=google.com; s=arc-20160816; b=ZstwKxW4bkLN9AoM+iquXiNj4EpEJux2Wf46Yvb6OswAE3CC8YalH0KDDRPI54PoBW /N92t32zIWUuMJL55JMQzrt11jSI0HmTARDG71OtB7KRMyTzHK+OGvRiV4OjdzFFpF9+ 0FpTndzFWUb1vaqtuBCrzLTblY2K5Cubp3HbWqot8TyBDygc4x6YT8pP5iwYL5NgJxZv FHMpDL4xsUN3Pt6puh/kPyGQCAKRZ+hEDZeoOkV3gfuU0fPUCYQg2KG6Uho/4gX1LHeB wuxbyZx2JYrwyKr7xL4xMU8EiOCZxJ4LCZEbmBE3YsUSWd4HNQcLxnd3njSW9LY5hJ1c 3qxQ== 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=zBEjCltxDmlnA0oSyuagNhPyHRx1meJicqC3uPUtKyk=; b=VcarahFZ21j1SNFzK2engetKv9R+3+HVIbBuMcOjWpcQ/Wzn7PCYGChUc2aMUlVECk 7MaIeNJqaUsEKcfwA/Wnj4z0LwijNOfVul6xDqsDnlhyoBF9hWC1fI0wnr+NsLsFiXrc 1PP4JeonHFvdX8++wGD6xW8YtLi2Auop4zs3+J1irFUJ7bgXB4yA6lr1k0Oz8FlK3QI+ W2v1Xh5zLOIvauw1nwqTe47iwCbgl1Sk3yxjwKaA0B4D0U9JOJo4/xW2rqXEaomyoN9v rOnrPys1ioi7+b9+duDkfK6xEXW16FhKRVTPCHD07j8Wzu0nSxX2IdlERyk1cCy35GiF 8I1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NEVtnIlj; 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 u26-20020a63b55a000000b005347fcb785dsi2376244pgo.181.2023.05.19.00.52.56; Fri, 19 May 2023 00:53:11 -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=NEVtnIlj; 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 S231372AbjESHnW (ORCPT + 99 others); Fri, 19 May 2023 03:43:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230454AbjESHmu (ORCPT ); Fri, 19 May 2023 03:42:50 -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 B1730EC for ; Fri, 19 May 2023 00:41:47 -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=zBEjCltxDmlnA0oSyuagNhPyHRx1meJicqC3uPUtKyk=; b=NEVtnIljkpKx3z/jm3K1GFMsMivjnkRjWMXnmdC4w2K7RQTf03R9xPfr6x2Xmghcak4zOL IyLOCP8MsZZ5QnvyPnQ83XBeZ2EmZIZtHZDs/0hrASzTmdAIrcTtjv3LJlETwjLmaNc6za XVTp/YobX+18dF0xAacUzbdzOuaDef4= 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-500-_1BGeCTTMTyFaYpS14WWgQ-1; Fri, 19 May 2023 03:41:43 -0400 X-MC-Unique: _1BGeCTTMTyFaYpS14WWgQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B00A03C02180; Fri, 19 May 2023 07:41:42 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7169740CFD45; Fri, 19 May 2023 07:41:40 +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 , Marc Dionne , linux-afs@lists.infradead.org Subject: [PATCH v20 12/32] afs: Provide a splice-read stub Date: Fri, 19 May 2023 08:40:27 +0100 Message-Id: <20230519074047.1739879-13-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.1 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=ham 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?1766308227953836440?= X-GMAIL-MSGID: =?utf-8?q?1766308227953836440?= Provide a splice_read stub for AFS to call afs_validate() before going into generic_file_splice_read() so that i_size can be brought as up to date as possible. Signed-off-by: David Howells cc: Christoph Hellwig cc: Al Viro cc: Jens Axboe cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-mm@kvack.org --- fs/afs/file.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/fs/afs/file.c b/fs/afs/file.c index 719b31374879..d8a6b09dadf7 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -25,6 +25,9 @@ static void afs_invalidate_folio(struct folio *folio, size_t offset, static bool afs_release_folio(struct folio *folio, gfp_t gfp_flags); static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter); +static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags); static void afs_vm_open(struct vm_area_struct *area); static void afs_vm_close(struct vm_area_struct *area); static vm_fault_t afs_vm_map_pages(struct vm_fault *vmf, pgoff_t start_pgoff, pgoff_t end_pgoff); @@ -36,7 +39,7 @@ const struct file_operations afs_file_operations = { .read_iter = afs_file_read_iter, .write_iter = afs_file_write, .mmap = afs_file_mmap, - .splice_read = generic_file_splice_read, + .splice_read = afs_file_splice_read, .splice_write = iter_file_splice_write, .fsync = afs_fsync, .lock = afs_lock, @@ -587,3 +590,18 @@ static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) return generic_file_read_iter(iocb, iter); } + +static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags) +{ + struct afs_vnode *vnode = AFS_FS_I(file_inode(in)); + struct afs_file *af = in->private_data; + int ret; + + ret = afs_validate(vnode, af->key); + if (ret < 0) + return ret; + + return generic_file_splice_read(in, ppos, pipe, len, flags); +}