From patchwork Mon Nov 11 00:52:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13870102 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 A18D6D12D5C for ; Mon, 11 Nov 2024 00:53:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17EBB6B0089; Sun, 10 Nov 2024 19:53:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 12E6A6B008A; Sun, 10 Nov 2024 19:53:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F12EA6B008C; Sun, 10 Nov 2024 19:53:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D20EC6B0089 for ; Sun, 10 Nov 2024 19:53:12 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9821D1215D7 for ; Mon, 11 Nov 2024 00:53:12 +0000 (UTC) X-FDA: 82771989510.11.2BC5EDE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 3AC0A140007 for ; Mon, 11 Nov 2024 00:52:43 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lrf5VPIU; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.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=1731286216; a=rsa-sha256; cv=none; b=LXLoQDO27sOSecQ1FaERIs1lC3oOjsMH9vHVEv9J5VJSOkQQALNBbtr3xfD2Gm9XWafddc 8SGo/xt5TJLv1PnCGRb6LznI8xbDdyiuWsDqxeG4oZLfvJsmiA8chKSKgIIrxtlH4MMH4L xjld0UsPMV2PSvAyHej+kH7A2UGUnK8= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lrf5VPIU; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.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=1731286216; 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=rtXzJ+fV4vyb9qvnzLh43ryjIhUuQz7njmNubhr4nPg=; b=rJ56eare/5QQJ0018rCmLaf0L8a+y4K28wfDMcb5/P+iyszrozXC9K/QtB2s4s0UdJZ9nE 4G7qdUPZNAFNaLuNDsINIWXFz6aDefx4C5ez4bOMXlzxJOHmhGnMyxfEBsx7MJwQOXnzWW NOseDkcg/7EAq5jpaqc73Xu5hYVw0B8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 195BC5C54AC; Mon, 11 Nov 2024 00:52:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DB9AC4CED6; Mon, 11 Nov 2024 00:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731286389; bh=Z1QVcRNEajq+vvtRp+aYnLkCErRyzdCuKYY5Gom358E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lrf5VPIUItWcKVtrlMjZyA9tq+5oyRSxI+GpQOE4It5Fkefwo9OvtC99jBNEAmCVO /jB3FJ1h0OrzKq6rZO3CvgotIAATbQ1c7zaXUesKHVANqRnZE9aExWhcKF+HJdRfqq MNH2HDC3jfuxXoHT70TnTXw+m5EgHdVIBRTGI7dExUKfhaJ05nDo6wczsw8sN1zN14 TUhUQr6YbDOedUUN5JyHBYo9kG/GVPCJxeamWdtcbATWWySK/aYoAEpy4N2wB0dL0k OXj7FNKqa1bAF+RgA2Jbro7kxneUAYLDi/Yrho3dK67Th8fBM5ZuogzGch/WAvDoeC vlrZ/CgdO2Wjw== From: cel@kernel.org To: Cc: yukuai1@huaweicloud.com, harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, viro@zeniv.linux.org.uk, brauner@kernel.org, Liam.Howlett@oracle.com, akpm@linux-foundation.org, hughd@google.com, willy@infradead.org, gregkh@linuxfoundation.org, sashal@kernel.org, srinivasan.shanmugam@amd.com, chiahsuan.chung@amd.com, mingo@kernel.org, mgorman@techsingularity.net, yukuai3@huawei.com, chengming.zhou@linux.dev, zhangpeng.00@bytedance.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, , linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org, linux-mm@kvack.org, yi.zhang@huawei.com, yangerkun@huawei.com, Chuck Lever , Jan Kara Subject: [RFC PATCH 2/6 6.6] libfs: Add simple_offset_empty() Date: Sun, 10 Nov 2024 19:52:38 -0500 Message-ID: <20241111005242.34654-3-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241111005242.34654-1-cel@kernel.org> References: <20241111005242.34654-1-cel@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 6piiuj468frd93mmy9q15fcctsqtekoq X-Rspamd-Queue-Id: 3AC0A140007 X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731286363-229510 X-HE-Meta: U2FsdGVkX1/hz3StQWXYWNIys5UzBGFAXtYKvQQ3NUTfQ873OChHTevIKmjNq8XSx1MFdmNW9/evU7dBaLb+JEOARI1FMKY8GQ1S3BdyBNwZ/6L4R4lHdQFHjI/sEzirvqHW8QTm/rqegUcBXeC3tCLxZg2Fb3G/5Gu6Xr4bbtrvPUK6pw8L2yrkq2ZcMJAiPwRmWtdOwUU4ir1Q4j/MO7fuMIjg/jgXUN3Lq5f/BCjhfoGQ+K+Y4/9UVj5+4EgtDBxIJsdqu6tBHbR2k+Nfya/BnR6ON3lkRgk9wTnGrqPIWIMHL1KNL+kCy704i13h1ASB/my//0gfoQzvV6rH+E+0yn1WBk2Vc51Yr/Q1eaqXnxfmq0wnfCzBHge/mD85bbPNELkZAaUd5Ne+cZmluGd1yeeu4pPrlT2B0CBxdfMpi+usjxu3OZtj/JUiI3rviVJhSZHJExWtwypHempaKpeDgPZ7ZtCGHBffr9HqxcMstcsSrKPY3GHTM1pn8wW/AmSvN0iVRUT33f2MuVvzMxy9/nwF1SzmrEJ5WmKFxKGXKf+yIbVAP/Xw4bBCFeiWH7JxWQetBrHtEwyuOC/2/LXYrwnuxQ243iRjK0kPvXlyL0aP7mEeMzI5gPwWmHhvKuKBOpf2TgHNH2lqOvpU/qEswdZRDs6c3J/R6ro+1Q9fk3vPrOIOw/2QM2bVjKK4E0ZMk9QDTljQagYChJa6a4Ur3K+o6Eey1LpIQWOcyzfvXW3AwJw6x0wHGasGTO+0LRQ3xs00eqi5zpS+AKZo8Al0z5tTOtXvI6SX2gOko9Oz11N7zdrypwtp6RIP4AKFM7z4Rm5SbOMj2p6jck3IQf66+6F6fuMzbvjVxy2uWIRBTRiCHVqzWBHfmGOAsjgcoFyaosxnQyc359B4WxkfdBxDl/boGmrBGKgh9hH7j6fcHeKL1nDticCll+gddopjwF8NH7FOsme5WTSYQe1 o14uY1zD jgyZvA+WiE0EntYWMfptK4GXG0XtHcHFqCZ5FEuaoRPt1LXkzDF5NDSue+F87PNeB56erQhoa6uFXf9rZ5fiP3XErT2IWSApKfCet85MQSy4Z2R/6iRDUvaVaFt0xYppc/E6XzZWr0kVMXFhW6DpgC1zLytfpY2ttyfHH7UCk4Q4ltZUUj2c1Z/EPNk4n+YvLyrkjES6JukpAHERzy6KfYSJmchndG6bB8jgCvpo74eE2Ntz3ECUWxQXB33YlkC6bzhNl70Bji2g2i0Z/3FwfMCpoxAz4XsjDfQk9zNZHxr/9XqQj5BSsEOVuBgl99zvRWugFYOgkdmnSP9Q= 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: List-Subscribe: List-Unsubscribe: From: Chuck Lever [ Upstream commit ecba88a3b32d733d41e27973e25b2bc580f64281 ] For simple filesystems that use directory offset mapping, rely strictly on the directory offset map to tell when a directory has no children. After this patch is applied, the emptiness test holds only the RCU read lock when the directory being tested has no children. In addition, this adds another layer of confirmation that simple_offset_add/remove() are working as expected. Reviewed-by: Jan Kara Signed-off-by: Chuck Lever Link: https://lore.kernel.org/r/170820143463.6328.7872919188371286951.stgit@91.116.238.104.host.secureserver.net Signed-off-by: Christian Brauner Stable-dep-of: 5a1a25be995e ("libfs: Add simple_offset_rename() API") Signed-off-by: Chuck Lever --- fs/libfs.c | 32 ++++++++++++++++++++++++++++++++ include/linux/fs.h | 1 + mm/shmem.c | 4 ++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 4a2205afcc88..66b428f3fc41 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -312,6 +312,38 @@ void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry) offset_set(dentry, 0); } +/** + * simple_offset_empty - Check if a dentry can be unlinked + * @dentry: dentry to be tested + * + * Returns 0 if @dentry is a non-empty directory; otherwise returns 1. + */ +int simple_offset_empty(struct dentry *dentry) +{ + struct inode *inode = d_inode(dentry); + struct offset_ctx *octx; + struct dentry *child; + unsigned long index; + int ret = 1; + + if (!inode || !S_ISDIR(inode->i_mode)) + return ret; + + index = DIR_OFFSET_MIN; + octx = inode->i_op->get_offset_ctx(inode); + xa_for_each(&octx->xa, index, child) { + spin_lock(&child->d_lock); + if (simple_positive(child)) { + spin_unlock(&child->d_lock); + ret = 0; + break; + } + spin_unlock(&child->d_lock); + } + + return ret; +} + /** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved diff --git a/include/linux/fs.h b/include/linux/fs.h index 6c3d86532e3f..5104405ce3e6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3197,6 +3197,7 @@ struct offset_ctx { 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_empty(struct dentry *dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, diff --git a/mm/shmem.c b/mm/shmem.c index 5d076022da24..e0d014eaaf73 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3373,7 +3373,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) static int shmem_rmdir(struct inode *dir, struct dentry *dentry) { - if (!simple_empty(dentry)) + if (!simple_offset_empty(dentry)) return -ENOTEMPTY; drop_nlink(d_inode(dentry)); @@ -3430,7 +3430,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return simple_offset_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); - if (!simple_empty(new_dentry)) + if (!simple_offset_empty(new_dentry)) return -ENOTEMPTY; if (flags & RENAME_WHITEOUT) {