From patchwork Sun Aug 27 13:28:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13367143 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 BD927C83F11 for ; Sun, 27 Aug 2023 13:32:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5DE2E280003; Sun, 27 Aug 2023 09:32:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B4F38E0001; Sun, 27 Aug 2023 09:32:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A3CD280003; Sun, 27 Aug 2023 09:32:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3C8238E0001 for ; Sun, 27 Aug 2023 09:32:18 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0E7E212020E for ; Sun, 27 Aug 2023 13:32:18 +0000 (UTC) X-FDA: 81169973556.13.FCDD0F4 Received: from out-249.mta1.migadu.com (out-249.mta1.migadu.com [95.215.58.249]) by imf07.hostedemail.com (Postfix) with ESMTP id 4D48A40024 for ; Sun, 27 Aug 2023 13:32:16 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=w2Ynrlkl; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf07.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.249 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=1693143136; 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=lgv74RiG6d0UNqtDYoWo9qRS2igfQfKNzBs00NwaCYZW5cUrEYLvk/0nw5OBvQCWusgNrE +ViTVcP+zKQbgSdP5pmdGLAzTaN0r+QXlmQwamUTK4BBiSAkm+m0ITD6PTK3dDNMi9r1bk rD5drHNEe2pShSJgOBmdEmDRdJwBodI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=w2Ynrlkl; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf07.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.249 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693143136; a=rsa-sha256; cv=none; b=eqKyOa40C58OBOMyoj9sXdBrLPQMepto3Xywtdev7bE0nJBAMn9B+eTPd5r5r3OurZ0xkk cKBWiJAJevpZd/6JfYvz8sIG8dSSxWfDPYAZpdIFxZbTl5FCFphvByPm+xtUq9i2jPUQLZ csnlPQzSFuwa1Y/SQH4mCNkG9sUmVdY= 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=1693143134; 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=w2Ynrlkl0lrPBgOEZvZgZsAroI/SroVLk9P1ruoBqvhkruN+yY2MpcktHEbfNgoWJ1BBu4 4ubUBExoqQaaP8jDC6A2V4vWqXAbneLZ+BhAJSfP0lzTzlCZEFFPuxh0PF54TbtDSMupEM g0UMdnFp1J3UGmAIMamiGdfpc/ghYvs= 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 03/11] vfs: add nowait flag for struct dir_context Date: Sun, 27 Aug 2023 21:28:27 +0800 Message-Id: <20230827132835.1373581-4-hao.xu@linux.dev> In-Reply-To: <20230827132835.1373581-1-hao.xu@linux.dev> References: <20230827132835.1373581-1-hao.xu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 4D48A40024 X-Stat-Signature: u7k9xf893dbf9didnupsacudqykyiwu7 X-HE-Tag: 1693143136-405106 X-HE-Meta: U2FsdGVkX19MU11KVfywUca5JnVycZLFAt9Q0vwEWwAYj2LNR3l45XAEj7my0Ktj1uuu6GACOjb3B15PQYkGU4G+u8sspr0uU5YPUu5GNaPOHCj7EwVOP2cRLHKiaxf/ET9wv2YQuNQv8SWeH7yr1DeIr+2AouxtU9CgWwS22w8nPoIFkuyp9qcX7uoo8kO7B7DibeeWCNcIO79EhmEQoMl4X0ANs5j09qBkMaNkBaXcxwUrHpz5qUNNhLZKd0E7oK90zVYzq06W+ngD5sDIBRuq2VagU6Sufwm0Y58zuWrlE7Eb9WCd4TbgScRQwP7F9PX9+UFQQmx0xBfsZNtVYIhmcSzPKOD0QxoV1fOTUc0jIKVySiAQPsiraFXbxLHnQZe/WMwcrDEu3/CddkxO2/akVeVDeDXKsySl/EbEA7JSIGVY27FFMI05l9fe0K/HBfSAqHGGWh7RBXJBVsReFHch/+8CUhFIQxpRrC7ODgUfOYI5CZJipfK2cVQTpYFirlKYjkr+nqilo6iHlvyhzfSf9FIprP5PW5A/CiwUtTOGz8Dslf6x1MZ2dtB3QKcbF7WOYg+WY9mOe3QimJ0K6Ue5t27870VSWtQhvCrI8otMNcfigh5NUH9HNKzq7nWmozZbd7WF+xeKKJxpsoXZDST348jByjzvEUzD/BOs01dk4r7RshdNxtwRKsiffEkT0A2szXE8OzaoZ2aDzTx0mMR9MdE/PnGOxXfYnsV9jh5OYhSkuSy8iX3qdFVeGNnP2Egm4rYbw6WVHIiIk8Rn+SdjWoGG8t1BxZEyNwFRSh7YQok6yAtaTBnptTNIB6J2OinAaN+F/OjW4Aw8zDuEL0RoywFKdgpJddoWfXACe6KzHRyGdd9mdgsw/V9+5jcTD/QeIYUEmKZsrZVikZkreu9t73n3RS4jV+v42C0AIjU5YAMkPG1Du1bg7ikxdOTBuIRk8Hi1hjk+LhgoaR8 VL2E7CZ/ MWh45dzfpJ3d16qLweKpsdTx/1XPhfT/5MduQR9VExpt4k02zeuHxT2NskMvcmHI9yMEV2uR45eTWjAqLl6hChLYhxJSX7fffeAvdyG0Tog6lOPZiWVqHt+mQKG5I+YJuUWjpRzhEbYaMoVawApJSaTR6F2xX7kWfBYT8UMBDhZCg1+aTAtokkA/bNfmgKMbDHkEjKOrAlPnnV9zEFu1eV/8gPtSPxiEUbua+qvC2SjaZrVUrI2XJ8eaQvLp/IytHhlLkylOfnXrBiK4AuHYwRIQr/XnDc5theU2GTZxerlsD0aWLv03B6uEtK/XjLOhae1TWZ/8iOheBaD+bbpsdOElHWs5R34I1Txresn2V0Fbcj3sgQvdyWAj8jogHEvLUOT4JaV9SFnt+Q5U= 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.