From patchwork Wed Jun 28 15:25:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13295921 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 F4208EB64DA for ; Wed, 28 Jun 2023 15:25:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 691738D0003; Wed, 28 Jun 2023 11:25:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 641D18D0001; Wed, 28 Jun 2023 11:25:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5097F8D0003; Wed, 28 Jun 2023 11:25:14 -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 42B8D8D0001 for ; Wed, 28 Jun 2023 11:25:14 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0CEFCC0A9C for ; Wed, 28 Jun 2023 15:25:14 +0000 (UTC) X-FDA: 80952530148.12.37F7CBB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 183C6A0023 for ; Wed, 28 Jun 2023 15:25:11 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="p/3sJWhs"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687965912; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HvXjUFv2Mu75qhSRrn0KZaontdvtcYunu6qPvJZN9Kw=; b=hKWiGFT48/QBmIHWpn0kFtQExhYyEhJYKkAVUiP1uRopFXG8ITHuwxMG2Z6kouwMk/tDjZ E2xULN7n2nM/y0X8Mb6lod6J1zsb6cuZxwEO/lGmKS1DWXeOo9GnMGQ36g9j9D2OsdQKbg Pu/n16OU6yCi7XutzKyd+eW4U4Kh5us= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="p/3sJWhs"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687965912; a=rsa-sha256; cv=none; b=PmS3AjdVn2Z4Qr/Aai1AaE/EqybOUv+7wdU0opfZoC3/fq+jctwGbT8rwVakh4NUqVN2K0 i13z/R1I9YBReTF/zQaYh9FXAw532u2t1fSYV055ZiImTS9rsDIn1Mwgexr9bD/sb2GzJt RkAXqFUY4IvI1bKXRb5EOnBiPwL3zL4= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2EA5861362; Wed, 28 Jun 2023 15:25:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03D3CC433C0; Wed, 28 Jun 2023 15:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687965910; bh=1/kaoCog/lqOfH5B87rGS+l38/fN9AN0iB2Xjv/TkMU=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=p/3sJWhs31NmFOoWPEaGLREXN3MCt5ITWUnr8s1nabcSizzYALGInWR6OvQNmyMdV NKV0K/+jgmaN5/Up9GORuZJ9c3nttObQKMTZIvoVOmPPRUjAYu5y/a+MQF5AFnRkGT 2WDBZs53PqqOmbOgtAVNc5kLa1aXxPflPOl2reCFh/uzbTrGx+xvZ3gB9qurpvEQQ4 eWEeQm/A1/LI5RqE2loTKizYrefb0SLj/IwYh30cfQFnS+EpDBXZ+dAM3acAyC1SJb vk7v+g4wAhyAin6LOTU75s8v+A5nXSvQgyM4CrNPbP2EhTQN+33p/elUi9vCur1wJr GDloO6iYbJh5g== Subject: [PATCH v6 1/3] libfs: Add directory operations for stable offsets From: Chuck Lever To: viro@zeniv.linux.org.uk, brauner@kernel.org, hughd@google.com, akpm@linux-foundation.org Cc: Chuck Lever , jlayton@redhat.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Date: Wed, 28 Jun 2023 11:25:09 -0400 Message-ID: <168796590904.157221.11286772826871541854.stgit@manet.1015granger.net> In-Reply-To: <168796579723.157221.1988816921257656153.stgit@manet.1015granger.net> References: <168796579723.157221.1988816921257656153.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Rspamd-Queue-Id: 183C6A0023 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: nfzic4m8ws44qpe5szrpetzqezfxstrp X-HE-Tag: 1687965911-442384 X-HE-Meta: U2FsdGVkX19JvwaukLZ5avWeRvdIxPZJsyhiJxBpiRgJTs16nxLGDbIfMQOMBRT/C8bCrNuAaQbPd6PATwbxYN91dcyC4rnYZW5OTLQP/JWHAdcVcWlnohyKrnKr0QFNfUWrc00m6pzRL9wSXk/N2hoOyn4I7FCVNjUIbHfschh8vT22MYrFTqwTMIDnNhdZCGqZ28U0hq1ea6rLP7+GcIOs7e+8+mtyy4OteKuXYM0qrmxzQWbvwu9FLd7wK560GoZf206DiwI0U8TtiVlMIIkKLbAB+Gn1Z6tN5BS+WHjnGxZCKKjDNBKRC5swrWSlT1kOvFux4lBZD4I2RQRPZFvlaoE4e2aKG+wYHp6/chjYRKmvj+Wf+i8jciRk99SxmmY3h0d41O0Y/qYzoCvPLeu7Ox7Zgu0pZE8wMKhICmQwggtzHSCniQDqVTP7SzVCacnzdMyv81Y7qDWqUyWX3g7j/lCj4YFiXLeFzEYHtFPyBOk7hZg153XKWaD/GAbiu8lyBH3vHswYDdW0lR28C4flf4expxLq/iGnYiyCgNGPySzsSOvvw6QFeFOgDiZDryM6n92gogCG82LLJx8mJOAnJpNKlOHpEzzaA4PDbw0c64n9j0YbsFywjBgsWcn3a1Mg8S6TdbUDESD/2GTOK7IE/b4YCZe06a9gVBz80NZ4ZcvGTytc+X3UgJBt1Bjgl2bIGwqcZ+8pXHalhcfpyAagra3qbNrHa+Cs3gSRKYS+dOvK+pYANUHWPti/CzmngCA1oxWtfJqgH+6SgMuQu3WTytLD5E/cyZq+FHhrLbsdoLVA1x2jtV1sc5Uzq1zjxMmXAnEF43Vjl+6AFY3NPPYUtm7lxofFXDPi/82uFWkA82/HoX2emRi2kc7Naq4YHZMfkDQMWz02Z9qYwIO6QAt+7zSfbjUpeQyv8tTinMmxQ+AEQK5oe3FmPRpYNzsZZRjACInymNJDdJZotK7 AOIb2eIo Y8ODfjXLi0V/P/du6zTFNcuHkhgUsy5WU4Hc1+yKvB10xQVdYB8Ia24l27UYXla2VTVH7nzJDQ1vJ+ngclBWhxG+ggUmMlM4GiNT+PUP7nwv8k+t5ctZKVGUd493bDLKh5lNGXa0kFYttkVS8hLrE3REVzdPOlm+gTguJqXwvtvSkxBg4Gd/w4hf3HQFq9D9ulxMyXSUMKR4P7Qm2eR5PHhOAu8WDuemgUT4Ds6hFHjmohQgO8J6wNbR7smvFNceN2YEbXfP2wuYXRuDEqcCg6rEESg== 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: Chuck Lever Create a vector of directory operations in fs/libfs.c that handles directory seeks and readdir via stable offsets instead of the current cursor-based mechanism. For the moment these are unused. Signed-off-by: Chuck Lever --- fs/libfs.c | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 18 ++++ 2 files changed, 265 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index 89cf614a3271..2b0d5ac472df 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -239,6 +239,253 @@ const struct inode_operations simple_dir_inode_operations = { }; EXPORT_SYMBOL(simple_dir_inode_operations); +static void offset_set(struct dentry *dentry, unsigned long offset) +{ + dentry->d_fsdata = (void *)offset; +} + +static unsigned long dentry2offset(struct dentry *dentry) +{ + return (unsigned long)dentry->d_fsdata; +} + +/** + * simple_offset_init - initialize an offset_ctx + * @octx: directory offset map to be initialized + * + */ +void simple_offset_init(struct offset_ctx *octx) +{ + xa_init_flags(&octx->xa, XA_FLAGS_ALLOC1); + + /* 0 is '.', 1 is '..', so always start with offset 2 */ + octx->next_offset = 2; +} + +/** + * simple_offset_add - Add an entry to a directory's offset map + * @octx: directory offset ctx to be updated + * @dentry: new dentry being added + * + * Returns zero on success. @so_ctx and the dentry offset are updated. + * Otherwise, a negative errno value is returned. + */ +int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry) +{ + static const struct xa_limit limit = XA_LIMIT(2, U32_MAX); + u32 offset; + int ret; + + if (dentry2offset(dentry) != 0) + return -EBUSY; + + ret = xa_alloc_cyclic(&octx->xa, &offset, dentry, limit, + &octx->next_offset, GFP_KERNEL); + if (ret < 0) + return ret; + + offset_set(dentry, offset); + return 0; +} + +/** + * simple_offset_remove - Remove an entry to a directory's offset map + * @octx: directory offset ctx to be updated + * @dentry: dentry being removed + * + */ +void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry) +{ + unsigned long index = dentry2offset(dentry); + + if (index == 0) + return; + + xa_erase(&octx->xa, index); + offset_set(dentry, 0); +} + +/** + * simple_offset_rename_exchange - exchange rename with directory offsets + * @old_dir: parent of dentry being moved + * @old_dentry: dentry being moved + * @new_dir: destination parent + * @new_dentry: destination dentry + * + * Returns zero on success. Otherwise a negative errno is returned and the + * rename is rolled back. + */ +int simple_offset_rename_exchange(struct inode *old_dir, + struct dentry *old_dentry, + struct inode *new_dir, + struct dentry *new_dentry) +{ + struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx(old_dir); + struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx(new_dir); + unsigned long old_index = dentry2offset(old_dentry); + unsigned long new_index = dentry2offset(new_dentry); + int ret; + + simple_offset_remove(old_ctx, old_dentry); + simple_offset_remove(new_ctx, new_dentry); + + ret = simple_offset_add(new_ctx, old_dentry); + if (ret) + goto out_restore; + + ret = simple_offset_add(old_ctx, new_dentry); + if (ret) { + simple_offset_remove(new_ctx, old_dentry); + goto out_restore; + } + + ret = simple_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); + if (ret) { + simple_offset_remove(new_ctx, old_dentry); + simple_offset_remove(old_ctx, new_dentry); + goto out_restore; + } + return 0; + +out_restore: + offset_set(old_dentry, old_index); + xa_store(&old_ctx->xa, old_index, old_dentry, GFP_KERNEL); + offset_set(new_dentry, new_index); + xa_store(&new_ctx->xa, new_index, new_dentry, GFP_KERNEL); + return ret; +} + +/** + * simple_offset_destroy - Release offset map + * @octx: directory offset ctx that is about to be destroyed + * + * During fs teardown (eg. umount), a directory's offset map might still + * contain entries. xa_destroy() cleans out anything that remains. + */ +void simple_offset_destroy(struct offset_ctx *octx) +{ + xa_destroy(&octx->xa); +} + +/** + * offset_dir_llseek - Advance the read position of a directory descriptor + * @file: an open directory whose position is to be updated + * @offset: a byte offset + * @whence: enumerator describing the starting position for this update + * + * SEEK_END, SEEK_DATA, and SEEK_HOLE are not supported for directories. + * + * Returns the updated read position if successful; otherwise a + * negative errno is returned and the read position remains unchanged. + */ +static loff_t offset_dir_llseek(struct file *file, loff_t offset, int whence) +{ + switch (whence) { + case SEEK_CUR: + offset += file->f_pos; + fallthrough; + case SEEK_SET: + if (offset >= 0) + break; + fallthrough; + default: + return -EINVAL; + } + + return vfs_setpos(file, offset, U32_MAX); +} + +static struct dentry *offset_find_next(struct xa_state *xas) +{ + struct dentry *child, *found = NULL; + + rcu_read_lock(); + child = xas_next_entry(xas, U32_MAX); + if (!child) + goto out; + spin_lock_nested(&child->d_lock, DENTRY_D_LOCK_NESTED); + if (simple_positive(child)) + found = dget_dlock(child); + spin_unlock(&child->d_lock); +out: + rcu_read_unlock(); + return found; +} + +static bool offset_dir_emit(struct dir_context *ctx, struct dentry *dentry) +{ + loff_t offset = dentry2offset(dentry); + struct inode *inode = d_inode(dentry); + + return ctx->actor(ctx, dentry->d_name.name, dentry->d_name.len, offset, + inode->i_ino, fs_umode_to_dtype(inode->i_mode)); +} + +static void offset_iterate_dir(struct dentry *dir, struct dir_context *ctx) +{ + struct inode *inode = d_inode(dir); + struct offset_ctx *so_ctx = inode->i_op->get_offset_ctx(inode); + XA_STATE(xas, &so_ctx->xa, ctx->pos); + struct dentry *dentry; + + while (true) { + spin_lock(&dir->d_lock); + dentry = offset_find_next(&xas); + spin_unlock(&dir->d_lock); + if (!dentry) + break; + + if (!offset_dir_emit(ctx, dentry)) { + dput(dentry); + break; + } + + dput(dentry); + ctx->pos = xas.xa_index + 1; + } +} + +/** + * offset_readdir - Emit entries starting at offset @ctx->pos + * @file: an open directory to iterate over + * @ctx: directory iteration context + * + * Caller must hold @file's i_rwsem to prevent insertion or removal of + * entries during this call. + * + * On entry, @ctx->pos contains an offset that represents the first entry + * to be read from the directory. + * + * The operation continues until there are no more entries to read, or + * until the ctx->actor indicates there is no more space in the caller's + * output buffer. + * + * On return, @ctx->pos contains an offset that will read the next entry + * in this directory when shmem_readdir() is called again with @ctx. + * + * Return values: + * %0 - Complete + */ +static int offset_readdir(struct file *file, struct dir_context *ctx) +{ + struct dentry *dir = file->f_path.dentry; + + lockdep_assert_held(&d_inode(dir)->i_rwsem); + + if (!dir_emit_dots(file, ctx)) + return 0; + + offset_iterate_dir(dir, ctx); + return 0; +} + +const struct file_operations simple_offset_dir_operations = { + .llseek = offset_dir_llseek, + .iterate_shared = offset_readdir, + .read = generic_read_dir, + .fsync = noop_fsync, +}; + static struct dentry *find_next_child(struct dentry *parent, struct dentry *prev) { struct dentry *child = NULL; diff --git a/include/linux/fs.h b/include/linux/fs.h index 133f0640fb24..85de389e4eb8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1767,6 +1767,7 @@ struct dir_context { struct iov_iter; struct io_uring_cmd; +struct offset_ctx; struct file_operations { struct module *owner; @@ -1854,6 +1855,7 @@ struct inode_operations { int (*fileattr_set)(struct mnt_idmap *idmap, struct dentry *dentry, struct fileattr *fa); int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa); + struct offset_ctx *(*get_offset_ctx)(struct inode *inode); } ____cacheline_aligned; static inline ssize_t call_read_iter(struct file *file, struct kiocb *kio, @@ -2954,6 +2956,22 @@ extern ssize_t simple_read_from_buffer(void __user *to, size_t count, extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos, const void __user *from, size_t count); +struct offset_ctx { + struct xarray xa; + u32 next_offset; +}; + +void simple_offset_init(struct offset_ctx *octx); +int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry); +void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry); +int simple_offset_rename_exchange(struct inode *old_dir, + struct dentry *old_dentry, + struct inode *new_dir, + struct dentry *new_dentry); +void simple_offset_destroy(struct offset_ctx *octx); + +extern const struct file_operations simple_offset_dir_operations; + extern int __generic_file_fsync(struct file *, loff_t, loff_t, int); extern int generic_file_fsync(struct file *, loff_t, loff_t, int);