From patchwork Wed Feb 15 15:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 57607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp262172wrn; Wed, 15 Feb 2023 07:44:25 -0800 (PST) X-Google-Smtp-Source: AK7set85Jgxxw2Rg9hyZ0ULqsHV4lng6mnGC36K56phpVRbMaZZq8nkUuRDCCiteKDI8wIqCl/K9 X-Received: by 2002:a05:6402:151a:b0:4ab:4289:e9f8 with SMTP id f26-20020a056402151a00b004ab4289e9f8mr2087764edw.3.1676475864904; Wed, 15 Feb 2023 07:44:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676475864; cv=none; d=google.com; s=arc-20160816; b=DRKVZRUXUMU+QqVTWyFmv6QZlEUdKNlEygjuncRYTUKWhon/B3igukvMIv58ziBFHd L+F3dGQ4Ch8xUDoJn4SeJ7ri+nm/kcr8nYFjTMm31qVx9FTpsh1o6+xwtv9TsrmSZmqg kkWQm2DbkM05nL4xq0jso5ex80K68UZ1DQZZccb65zlT/Ts9/UNKSW1wzf/yb06hMoav nRYJ1gAlrvKJu2UtIPg1yNrhDh73NG1ZzVjDHmCxiIDTFkpZEYoedtQmdvaKVNpyeKDj +SwdE8oSxXImTRsyRG+LvS1OH7TIkx8S40gZu+cFdJgZoh5lfW4Kqya7pu3OLRChbwHq NYTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:content-transfer-encoding :content-id:mime-version:subject:cc:to:references:in-reply-to:from :organization:dkim-signature; bh=Us0zCop2bZgqcPW/JXsl5O/r2nwlZx53CdefM19JIrA=; b=cY4ufVjq4uC7W2ympaRvRvhPhjKtqemHP1hwNuT44U8N3uYqXkAQ3MNGpJQkw59Fue aGXB9pXl0YkrvqJ098qjIFaNXuj9eKE0B++3Xsm4zLb9u/5KEL/C+vA3StvEnlW6PYDM MrYIVE74XhvRcuLoey2XSbQw4+SaOCJjVDucePky0Aqc6DCfcew0XJMPHkNJ7ykpSC2+ rZJScbZnGAbSEWCcGJ2rZOmAisH+9X+Kjw/2ZqQnIntXB+2/QdUigTq/qf30iHFD81Ow Gjmdj2parNyUg5LW1Ic1+PPvR6ReWtArqcq9xx/H11SgM1OEiytEU0eHhiujxg7FrgcX v6OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PTZhOUiB; 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 d8-20020a50ea88000000b004aaa51b36e2si22464860edo.38.2023.02.15.07.44.00; Wed, 15 Feb 2023 07:44:24 -0800 (PST) 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=PTZhOUiB; 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 S229477AbjBOPmS (ORCPT + 99 others); Wed, 15 Feb 2023 10:42:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229728AbjBOPmQ (ORCPT ); Wed, 15 Feb 2023 10:42:16 -0500 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 E0FE43669B for ; Wed, 15 Feb 2023 07:41:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676475667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Us0zCop2bZgqcPW/JXsl5O/r2nwlZx53CdefM19JIrA=; b=PTZhOUiBWB/5ykVlxxnLYC+UggT+G+Q6btEZ/m0wgZO/vg9qAlhyD0BGTpXAKg9FF3/Xaj ruWWB4SBFA2eQM5w0WHjqwmvmYiMwRoBnax6KT3xfIDSEFSSziWsNEziheqDrbIGisiuRy bYdl5CgFeyOI1XWsoI69e4GkXZZH9E4= 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-630-LVpfoPQGNw6GNKM_irhueg-1; Wed, 15 Feb 2023 10:41:02 -0500 X-MC-Unique: LVpfoPQGNw6GNKM_irhueg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2A5E885620; Wed, 15 Feb 2023 15:41:01 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BF9418EC1; Wed, 15 Feb 2023 15:40:58 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: References: <20230214171330.2722188-1-dhowells@redhat.com> <20230214171330.2722188-6-dhowells@redhat.com> To: Miklos Szeredi Cc: dhowells@redhat.com, Jens Axboe , Al Viro , Christoph Hellwig , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard , linux-unionfs@vger.kernel.org Subject: [PATCH v15 05/17] overlayfs: Implement splice-read MIME-Version: 1.0 Content-ID: <3370084.1676475658.1@warthog.procyon.org.uk> Date: Wed, 15 Feb 2023 15:40:58 +0000 Message-ID: <3370085.1676475658@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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 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?1757827576035949768?= X-GMAIL-MSGID: =?utf-8?q?1757912356262340106?= How about the attached then? David --- overlayfs: Implement splice-read Implement splice-read for overlayfs 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 cc: Christoph Hellwig cc: Jens Axboe cc: Al Viro cc: John Hubbard cc: David Hildenbrand cc: Matthew Wilcox cc: Miklos Szeredi 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 #15) - Remove redundant FMODE_CAN_ODIRECT check on real file. - Do rw_verify_area() on the real file, not the overlay file. - Fix a file leak. fs/overlayfs/file.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index c9d0c362c7ef..72a545da51a2 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -419,6 +419,37 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) return ret; } +static ssize_t ovl_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) +{ + const struct cred *old_cred; + struct fd real; + ssize_t ret; + + ret = ovl_real_fdget(in, &real); + if (ret) + return ret; + + ret = -EINVAL; + if (!real.file->f_op->splice_read) + goto out_fdput; + + ret = rw_verify_area(READ, real.file, ppos, len); + if (unlikely(ret < 0)) + goto out_fdput; + + old_cred = ovl_override_creds(file_inode(in)->i_sb); + ret = real.file->f_op->splice_read(real.file, ppos, pipe, len, flags); + + revert_creds(old_cred); + ovl_file_accessed(in); +out_fdput: + fdput(real); + + return ret; +} + /* * Calling iter_file_splice_write() directly from overlay's f_op may deadlock * due to lock order inversion between pipe->mutex in iter_file_splice_write() @@ -695,7 +726,7 @@ const struct file_operations ovl_file_operations = { .fallocate = ovl_fallocate, .fadvise = ovl_fadvise, .flush = ovl_flush, - .splice_read = generic_file_splice_read, + .splice_read = ovl_splice_read, .splice_write = ovl_splice_write, .copy_file_range = ovl_copy_file_range,