From patchwork Mon May 22 13:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 97455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1466923vqo; Mon, 22 May 2023 06:56:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4PEUM0c7KzJIm0DoN7kzko2BH9GhEQJRATJw0jAWG5FRuiiurWesXnKsFeBtel7yNX0kEa X-Received: by 2002:a05:6a20:12c7:b0:10c:41a6:ac1f with SMTP id v7-20020a056a2012c700b0010c41a6ac1fmr183747pzg.16.1684763769550; Mon, 22 May 2023 06:56:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684763769; cv=none; d=google.com; s=arc-20160816; b=PzMJ9IBmzi8UzMKTzJWdWDpYwYdDjN5FD4Y258eaBzs+oj4mu/9qHzWCKo4KbHsa7W 4bzEEgkMgHiLi7AO/bh4d5a0Bc9owqLs5Be19ftJAohNk4ofs6k+N5cSnAv/I/7S66FR 3BrvgDM8F7cNZfoRy1pkLJRbx+EytsYrzrzc0mktaPniJt9faPg5CWXQWcaCMn3i9kPE pzt5+ZuABOjEg/BAQcGS2kNldpmO6OfNsCeWcgrhmwBsEt+cgoE6Y+cebT8FmG3q7g/3 n4xZ8LrRzwm6doX6UV9E+Ggf+b9JN4ZJHvv0Zd1kIoYKzs+Hp6nd0r5lP9dZNKZaaiAt PaRg== 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=biWhCp40UoPe+CyS0Ztg+L+BfqL/s+IwYQGGzgJK6kA=; b=g2jMav94P+tm7ZZTqW9QU4qChdvdzuIjr+Pl0XwpNhSOHdtuSbl7AmDBGULTPHpwkT jYvP6PKxMerHOtah8Pbb7nnftyzH3lBmz6zgyhXYQekF2HQa8baqWWw0Zhsu9/gDdjUT fk8AFAETUwE9QGerKNeL0DYHu0dHaGCK1+tKsdTY5KInfKzPHgmVLdS8V82ADFTfvT58 3VueO8lMD9I7ybQreMo3q5EK4MBE6iryNM0kdq0zz5329fRJk2oZQlJi8G8wjqJcphgT 5JvP3IuFyRYv+WhjoD7ecp5dQFY2jzZabdoVZJp66ImhcM29dsaM9bvg/UfT89IesPpM NCUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FIhyb1P9; 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 np8-20020a17090b4c4800b002532e0e9dc7si2774533pjb.166.2023.05.22.06.55.54; Mon, 22 May 2023 06:56:09 -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=FIhyb1P9; 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 S234125AbjEVNyW (ORCPT + 99 others); Mon, 22 May 2023 09:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234012AbjEVNwx (ORCPT ); Mon, 22 May 2023 09:52:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98BAEE53 for ; Mon, 22 May 2023 06:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763499; 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=biWhCp40UoPe+CyS0Ztg+L+BfqL/s+IwYQGGzgJK6kA=; b=FIhyb1P9GfeBf4HshcIa8Ty78WNWefAk45YMwXvKIlgkSIifKSEiadOJzCSx/GOPzxWscc WqXb7hk1bhCr8m8AgwaKA1zJlfiJ2sN1DZRHu27w2Guv8I44NQ92eQDMCd8opISRZIuF4s SnkC99TWSiDWe+HpbgSSuz0IshHIj+I= 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-671-pS6JrZMuO7KdRfWYxzCxgw-1; Mon, 22 May 2023 09:51:33 -0400 X-MC-Unique: pS6JrZMuO7KdRfWYxzCxgw-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 0380C800BFF; Mon, 22 May 2023 13:51:32 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3683C1ED99; Mon, 22 May 2023 13:51:28 +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 , Tyler Hicks , ecryptfs@vger.kernel.org Subject: [PATCH v22 17/31] ecryptfs: Provide a splice-read wrapper Date: Mon, 22 May 2023 14:50:04 +0100 Message-Id: <20230522135018.2742245-18-dhowells@redhat.com> In-Reply-To: <20230522135018.2742245-1-dhowells@redhat.com> References: <20230522135018.2742245-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?1766602854257650611?= X-GMAIL-MSGID: =?utf-8?q?1766602854257650611?= Provide a splice_read wrapper for ecryptfs to update the access time on the lower file after the operation. Splicing from a direct I/O fd will update the access time when ->read_iter() is called. Signed-off-by: David Howells cc: Christoph Hellwig cc: Al Viro cc: Jens Axboe cc: Tyler Hicks cc: ecryptfs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-mm@kvack.org --- fs/ecryptfs/file.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 268b74499c28..284395587be0 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -44,6 +44,31 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, return rc; } +/* + * ecryptfs_splice_read_update_atime + * + * generic_file_splice_read updates the atime of upper layer inode. But, it + * doesn't give us a chance to update the atime of the lower layer inode. This + * function is a wrapper to generic_file_read. It updates the atime of the + * lower level inode if generic_file_read returns without any errors. This is + * to be used only for file reads. The function to be used for directory reads + * is ecryptfs_read. + */ +static ssize_t ecryptfs_splice_read_update_atime(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags) +{ + ssize_t rc; + const struct path *path; + + rc = generic_file_splice_read(in, ppos, pipe, len, flags); + if (rc >= 0) { + path = ecryptfs_dentry_to_lower_path(in->f_path.dentry); + touch_atime(path); + } + return rc; +} + struct ecryptfs_getdents_callback { struct dir_context ctx; struct dir_context *caller; @@ -414,5 +439,5 @@ const struct file_operations ecryptfs_main_fops = { .release = ecryptfs_release, .fsync = ecryptfs_fsync, .fasync = ecryptfs_fasync, - .splice_read = generic_file_splice_read, + .splice_read = ecryptfs_splice_read_update_atime, };