From patchwork Tue Mar 14 22:07:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 69862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2010713wrd; Tue, 14 Mar 2023 15:15:55 -0700 (PDT) X-Google-Smtp-Source: AK7set8ayPPQ5wPvmvuncOUn2v/P8ISsmU/bUdXtmQ8wvPFUd/gQtjEIjvZ6tJiYpqkOcpEgPHPL X-Received: by 2002:a05:6a20:690e:b0:c7:651c:1bae with SMTP id q14-20020a056a20690e00b000c7651c1baemr31480516pzj.32.1678832155461; Tue, 14 Mar 2023 15:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678832155; cv=none; d=google.com; s=arc-20160816; b=JyVYGdpGGF7004jNZBpqN3aONXFfzh9r6fkrgSrMR6yUVUqI7w8H5UXVoaWOyiLm2q 6uHvZgh6vFqPUBBkAsdcKsuxIGWSleMMLqrR33RdyuVmx1Df2RnMPmCTS+aQB9q6aCnE BpfZc2R/c9wbNIrqMr4Dic17LU553Vs1z8kzi1WJteT5K0bvTcGx8lxHByszpYEs//Bz O8YjOB4/ukXn0z+kspekqAqgJz2gJMUEUZFVGF8ATxo/clng6z0VJaGwSHMq4pqmDCX/ WiuF7r7p97JIgCcHzhbuCXmhgNFr65wWO/LXCiK0kWWd5tbwQQIHe4lqu8Es8Xv2ZsTo o7zA== 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=74aMisHJvcrsbS5g8R7662ZNEA+1A6hMiypJVvVd5yo=; b=MNBXjMMNbbIx/TcLBLSBlNbVjqloJUtKAAolKIebVaBZC/2XUQcLV0AOapA1QVDK38 SaCSFbPMFDcLcrCr17J7lbZlMXw+8pmWzOl+2Eugo4zTwkvX9c7d3e9Vs1r5tX5lwcYZ F8po/6UHWTfAIycMeW7tIRxeOFJrHhKjYeC50h9wC9PU/Ua54X/234ipg3WVVSow/0cF jvc/ky4bduz5ty7fW2KZdj7XskYCD+lEveITYhvTANF3R3A2u1yHQSW9e5/Ckg1/YuT/ Zx6d2fRKCIKeQDKK0Y82kW1HWnWsO2NmFI6En33OiODo85Vqm4HN3v/wcdQNwr8hD2Qg nVRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eG6ejL6M; 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 t4-20020a654b84000000b00502efeb73e1si3053395pgq.717.2023.03.14.15.15.42; Tue, 14 Mar 2023 15:15:55 -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=eG6ejL6M; 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 S231313AbjCNWJi (ORCPT + 99 others); Tue, 14 Mar 2023 18:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjCNWJP (ORCPT ); Tue, 14 Mar 2023 18:09:15 -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 635CC20692 for ; Tue, 14 Mar 2023 15:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678831703; 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=74aMisHJvcrsbS5g8R7662ZNEA+1A6hMiypJVvVd5yo=; b=eG6ejL6MxEJrZU/a70OVDPXbUjEFK0vJK9NbZmX1dG7gtMEcIhPUDANpZ7FQCLkfWWzkui 6n5IDXXywLzyD58+t18fY5dwNtsH/hKaDIkXiHeV/FqoRT78qC0Dx6ot0OJKlP6ct2J+O2 GyrKFfvnIeC6JoJ6yNmgmwXli5UPNwg= 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-482-OmsvrtS9MnWFP7mBkgbzgQ-1; Tue, 14 Mar 2023 18:08:20 -0400 X-MC-Unique: OmsvrtS9MnWFP7mBkgbzgQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 15FA9811E6E; Tue, 14 Mar 2023 22:08:19 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B11D347507A; Tue, 14 Mar 2023 22:08:16 +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 , John Hubbard , Miklos Szeredi , linux-unionfs@vger.kernel.org Subject: [PATCH v18 04/15] overlayfs: Implement splice-read Date: Tue, 14 Mar 2023 22:07:46 +0000 Message-Id: <20230314220757.3827941-5-dhowells@redhat.com> In-Reply-To: <20230314220757.3827941-1-dhowells@redhat.com> References: <20230314220757.3827941-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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?1760383106049711966?= X-GMAIL-MSGID: =?utf-8?q?1760383106049711966?= 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 #17) - Use vfs_splice_read() helper rather than open-coding checks. 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 7c04f033aadd..86197882ff35 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -419,6 +419,27 @@ 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; + + old_cred = ovl_override_creds(file_inode(in)->i_sb); + ret = vfs_splice_read(real.file, ppos, pipe, len, flags); + revert_creds(old_cred); + ovl_file_accessed(in); + + 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 +716,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,