From patchwork Fri Aug 25 13:54:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13365737 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C631C3DA66 for ; Fri, 25 Aug 2023 13:56:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9EA2D2800B5; Fri, 25 Aug 2023 09:56:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 972DA8E0015; Fri, 25 Aug 2023 09:56:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8145D2800B5; Fri, 25 Aug 2023 09:56:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6C8838E0015 for ; Fri, 25 Aug 2023 09:56:10 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4CB7114068E for ; Fri, 25 Aug 2023 13:56:10 +0000 (UTC) X-FDA: 81162776100.25.6A46E1B Received: from out-252.mta1.migadu.com (out-252.mta1.migadu.com [95.215.58.252]) by imf19.hostedemail.com (Postfix) with ESMTP id 92E521A001D for ; Fri, 25 Aug 2023 13:56:08 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=TwbW5BAd; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf19.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692971768; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=e5tdpTadoLYdZJB8cQ8K1ymkQcAcLx9XJrtCjJGJaVs=; b=Wi9xQh/BaNiyLifYWe/lkyaTVwBu/++oWhvcoFMXihVvIiOHAOA+E249oHjK8wmcFJxSEr jfZIt3yr9H9G2Yz29x+MiSc89LhAmACw280clOnHFhP5H1TgFRo8/8dCbZoFLjx5MWDJxZ ykS6EB0Y7bFqqDFmH8hV8IsMIk247r8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=TwbW5BAd; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf19.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692971768; a=rsa-sha256; cv=none; b=GZhTbcGkIapUGHtUdDjVDh6LCo4OY92fiVxcWFnhbSVDKFle/QyjpvMFljQZDbYLhS3X43 qmjauchDGu1yspPhYmUxTSqQIN0GZsbzzdCTGq/jpONG0WaSTVzZr9NTf7A8KbbaFSLA23 ByaZKDrfW1W9r/d0I8+mCRmn8lrrLyE= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1692971767; 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=e5tdpTadoLYdZJB8cQ8K1ymkQcAcLx9XJrtCjJGJaVs=; b=TwbW5BAdvmgSbpeRXB5oj2rBwHJYuNVAZ0wuNv54dKDSbdHWvpzdJPpdSYGzhDtIzGSB4F YisrVQZHUjFuGHrj+vJDxnd62bdWDda2XlxMi5lt3S7M7T/A05SHzZ7P+IsnTBGPpTbdoc kkwgLR7zX0hVNtt4X1uvx8MlGeKiBn4= From: Hao Xu To: io-uring@vger.kernel.org, Jens Axboe Cc: Dominique Martinet , Pavel Begunkov , Christian Brauner , Alexander Viro , Stefan Roesch , Clay Harris , Dave Chinner , "Darrick J . Wong" , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-cachefs@redhat.com, ecryptfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-unionfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, linux-nilfs@vger.kernel.org, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-mtd@lists.infradead.org, Wanpeng Li Subject: [PATCH 04/29] vfs: add nowait flag for struct dir_context Date: Fri, 25 Aug 2023 21:54:06 +0800 Message-Id: <20230825135431.1317785-5-hao.xu@linux.dev> In-Reply-To: <20230825135431.1317785-1-hao.xu@linux.dev> References: <20230825135431.1317785-1-hao.xu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 92E521A001D X-Stat-Signature: 11rhdgwikdfxkzzseyhipq87q1k11pmk X-Rspam-User: X-HE-Tag: 1692971768-517860 X-HE-Meta: U2FsdGVkX18byK5LCZSJZnifwk/t8esSpLrnBVeefWv4jYsS3zSK1a/9zI30hFH21GuUyuk2MGSlHAO0uqGG+QtKs/t3ZKc44CQEoK9F7wsdX4E8cl4xJV+UKQVN4/iH44ykLkZgLdo4sCoskh8i3zwl/fLOwLdydCxgQFnZzJIc7kJndDh6GUveyRWe76oPxBWgevgH9G4/2iXn9i4+Y9jkuzb7hMOIVhaTkiO3iuGe4Qp+eV3vSqN30coUb3FRJ7KwVScsiF/9QXPpyNsz2T4S8l+u7Pk3eyzAL6bw+UQ4ro8C+AkdHT7N11BS64ygwEl5wy4LIR5j/hxHQl//rLYc98qlnhT0FNkcSSsU7QRKDIlLESw5Qgxrlt5nDp/ifvrl3b6ZM58IM6mwBHOoz5FMrWTguWatOHcdtwYSTjhaCzSczCwCMoc06BPBH2wD9hIkCjPUh4r6gNaxL55p5WNt56j9aqlXwb7cm7rYEtykIHgzLzzrFUEUTtbognWvxPDHpn61rg+LtO0uJnrbUdJCU8fWsc7xppOh4UZnT+0N1wUBCot6kTnt2/tPuFvCY5e6F8fM3t8IHz3cLb0qh4fuwW4tuGiw0/3MqUQWuUYHNh9lctHu43J8S8SquSzRPU82dSGzHGr+M9LDeKgBbIAPkGcRblGeREnC5cTYhpru+bYnARDEctMe7Q2K/zhOFX3lcJ1u+6kZqFQhALbkzmpvzLOtTszFZkvuoRbbFIdNlHqD/R7Yzze53r8zY3kSKXaBBHNSN2N2stjC3K1F34OAVq5nzIY1BslylbCAbeHeYTbXKb2FgP4klCULrFkXlzB+bvQvQbqFOajPTuz3li9o3RyTwOPUCL0GinnJfZ0hrQhQtCDI1a1lfOjeYYqIePVOToOK8W13YFyCotflFOD9M9VJ+7oNEavy7EUOKEUYmYc+2QeGxqi2/OfiKq9Ic53vptRkXBnaZWGN0Tv NauKsQJ/ XdwU4Pn93LgdjwkMlqpe/Dz4mE9Vwm+XAh+0zqsiDygOr+sXhlnBBxqIeCaZhCJcQCfG6aonGX/kYw0ItsKxL1nMw0pE3TVV997jgTiIH6qYULy9cWIryjEjci46Ot/I0zmKHpLkSTkUwE5a4Enc3waWUU5tZK63iS8dyH8XySfES12o14NkRikA4BIIJw0rjHj/YVJ1EpaQQX3LMSNAbZ3mkzhxfjLteGmCtNL+2dKG5dGoUSJSgtfCsiFXbEu50peEffBygPeDozXszxwfS4UB1YVrp1R0CGpElJphvpBj4jTzRs0+ZYBvX0MkQ60cRZze6 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Hao Xu The flags will allow passing DIR_CONTEXT_F_NOWAIT to iterate() implementations that support it (as signaled through FMODE_NWAIT in file->f_mode) Notes: - considered using IOCB_NOWAIT but if we add more flags later it would be confusing to keep track of which values are valid, use dedicated flags - might want to check ctx.flags & DIR_CONTEXT_F_NOWAIT is only set when file->f_mode & FMODE_NOWAIT in iterate_dir() as e.g. WARN_ONCE? Co-developed-by: Dominique Martinet Signed-off-by: Dominique Martinet Signed-off-by: Hao Xu --- fs/internal.h | 2 +- fs/readdir.c | 6 ++++-- include/linux/fs.h | 8 ++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index b1f66e52d61b..7508d485c655 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -311,4 +311,4 @@ void mnt_idmap_put(struct mnt_idmap *idmap); struct linux_dirent64; int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent, - unsigned int count); + unsigned int count, unsigned long flags); diff --git a/fs/readdir.c b/fs/readdir.c index 9592259b7e7f..b80caf4c9321 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -358,12 +358,14 @@ static bool filldir64(struct dir_context *ctx, const char *name, int namlen, * @file : pointer to file struct of directory * @dirent : pointer to user directory structure * @count : size of buffer + * @flags : additional dir_context flags */ int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent, - unsigned int count) + unsigned int count, unsigned long flags) { struct getdents_callback64 buf = { .ctx.actor = filldir64, + .ctx.flags = flags, .count = count, .current_dir = dirent }; @@ -395,7 +397,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, if (!f.file) return -EBADF; - error = vfs_getdents(f.file, dirent, count); + error = vfs_getdents(f.file, dirent, count, 0); fdput_pos(f); return error; diff --git a/include/linux/fs.h b/include/linux/fs.h index 6867512907d6..f3e315e8efdd 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1719,8 +1719,16 @@ typedef bool (*filldir_t)(struct dir_context *, const char *, int, loff_t, u64, struct dir_context { filldir_t actor; loff_t pos; + unsigned long flags; }; +/* + * flags for dir_context flags + * DIR_CONTEXT_F_NOWAIT: Request non-blocking iterate + * (requires file->f_mode & FMODE_NOWAIT) + */ +#define DIR_CONTEXT_F_NOWAIT (1 << 0) + /* * These flags let !MMU mmap() govern direct device mapping vs immediate * copying more easily for MAP_PRIVATE, especially for ROM filesystems.