From patchwork Mon Apr 15 15:20:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13630215 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1714478685 for ; Mon, 15 Apr 2024 15:21:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713194465; cv=none; b=i6PQs2/YEbgKMFpBtbNXA8PmPINl9eIK3/MM9/yHRB8XMwrbF0gh0hUaUYbwrMwEOmil5H/eEnFIfXA76pi1PiAaFdRoDL9VY2BL57rt057hj4hniBWEK867xX/ytEF6iBYX1G+ZIB2NnKAPblLPWUsFwXkxGgPBuHqKzk1tKas= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713194465; c=relaxed/simple; bh=U591gILez3TCPIxsg2AZfCAyLmatKMd0D5f4AlEzUAo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MonnEIxex5cQkuxH7cuJ1ONh50mFOqD7Tsf9IXyNEl2iBu9JB82StZIUCeTAE0jIx6KNeacwbzx1d9mLcLrI2NfI3QKuLCFXRgPLKy8B26FKfcZM45Bs7w+/QzQQLCuVneEPGOV+CcUDh03wf1bhuGiAOWigMjGvzu6a/omY56E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tnesVMj3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tnesVMj3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0A8CC2BD10; Mon, 15 Apr 2024 15:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713194465; bh=U591gILez3TCPIxsg2AZfCAyLmatKMd0D5f4AlEzUAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tnesVMj3h0+6+QlFogXGm3pQbaxsvGNT7TC89L75HvD36bYVy32OBCezVwERvPvcB Jy0gPRKAL1KIOR6mzXeeIwdDnIWKogDWtramNz4DW3E7geV0nfaZT0YAe8t7NLNleb ohb53LfsQ0qmRw7u8CdeOkkYZhZIaZtOu6zX59uVy/CmEI7QoqLHuegsSl0bxjELsN yEAcBpkvD3O3KWDtc7GBGR1RqA4/BlJLx4PV9TKNDzP2xZWbDQncKOAUzUcWU4D+7K w47zabvHdZbF42rD2M5ObdD4B/5h5evHJtH1XxcC8uGR1LppKu1Af3jTdBReQ46AXn 5owG47Foj/odA== From: cel@kernel.org To: Christian Brauner Cc: , Chuck Lever Subject: [PATCH v2 1/3] libfs: Fix simple_offset_rename_exchange() Date: Mon, 15 Apr 2024 11:20:54 -0400 Message-ID: <20240415152057.4605-2-cel@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415152057.4605-1-cel@kernel.org> References: <20240415152057.4605-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever User space expects the replacement (old) directory entry to have the same directory offset after the rename. Suggested-by: Christian Brauner Fixes: a2e459555c5f ("shmem: stable directory offsets") Signed-off-by: Chuck Lever --- fs/libfs.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 3a6f2cb364f8..ab61fae92cde 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -295,6 +295,18 @@ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry) return 0; } +static int simple_offset_replace(struct offset_ctx *octx, struct dentry *dentry, + long offset) +{ + int ret; + + ret = mtree_store(&octx->mt, offset, dentry, GFP_KERNEL); + if (ret) + 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 @@ -352,6 +364,9 @@ int simple_offset_empty(struct dentry *dentry) * @new_dir: destination parent * @new_dentry: destination dentry * + * This API preserves the directory offset values. Caller provides + * appropriate serialization. + * * Returns zero on success. Otherwise a negative errno is returned and the * rename is rolled back. */ @@ -369,11 +384,11 @@ int simple_offset_rename_exchange(struct inode *old_dir, simple_offset_remove(old_ctx, old_dentry); simple_offset_remove(new_ctx, new_dentry); - ret = simple_offset_add(new_ctx, old_dentry); + ret = simple_offset_replace(new_ctx, old_dentry, new_index); if (ret) goto out_restore; - ret = simple_offset_add(old_ctx, new_dentry); + ret = simple_offset_replace(old_ctx, new_dentry, old_index); if (ret) { simple_offset_remove(new_ctx, old_dentry); goto out_restore; @@ -388,10 +403,8 @@ int simple_offset_rename_exchange(struct inode *old_dir, return 0; out_restore: - offset_set(old_dentry, old_index); - mtree_store(&old_ctx->mt, old_index, old_dentry, GFP_KERNEL); - offset_set(new_dentry, new_index); - mtree_store(&new_ctx->mt, new_index, new_dentry, GFP_KERNEL); + (void)simple_offset_replace(old_ctx, old_dentry, old_index); + (void)simple_offset_replace(new_ctx, new_dentry, new_index); return ret; } From patchwork Mon Apr 15 15:20:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13630216 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86F1B60EF9 for ; Mon, 15 Apr 2024 15:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713194470; cv=none; b=GGikmKrR+CZMcvRpYJBzHIXxAhi2m0dkPxanQu0NPEdAoJvyV4m2Zmedy+uVeEu1ijA8kHA+HRiMncK7J7IDEKp2tYMu2Z3o7w1AHtUVnqohSf2ugPXgw+AtH6k8OKHlNT0JpTQdRMBKj35y5Jfv6nLPn8Ag8DYdKsfK3f8zJgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713194470; c=relaxed/simple; bh=76XY9UufZaCaS5UZa2jy4I5k/dGrgf74e5xgmWqe09Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gQypHt81aidIezDPWG+fOkQdNf3P7Ef3qB+rhbXq/vdFHHxYPCXGWrHZjfn5qZ92EmpmBm0vtmPTz65BTuz+yFZ1/qeHxdOquCAJSJho+6dydjB5epqfskVUaUxlf60dc/2u3Tz17H1qCEPeSeYJwFQU0Ui+AkA3z0a4d33TMe8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g7f39EsD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="g7f39EsD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B65CBC113CC; Mon, 15 Apr 2024 15:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713194470; bh=76XY9UufZaCaS5UZa2jy4I5k/dGrgf74e5xgmWqe09Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g7f39EsDYmG8jqT2DOE0ZWpm+WoD+6bkAz26uqXwDou5CJmeApB7Me1ZDrM1S5jE7 /dvf/TVQTsdcxsUMdeGYyau3/J9Vc0EzGYAD81mpRkKggh5+7Qt0uRFNGWtoxHElu/ TB8JYkSo8WhuS3+daDrhkKTm+Ii3U2XsQc+ujTlKWj8frZdRzDwtsEtMP/uEt1reH3 Dj7IbyKA+VplXpeamkeZmC6F0HF+7p9rTyVivY5N5MdqIyZuxL+wk11Kk5buCK+BZJ BeFIIvDNTjS+oV1GciHqXED9BqQSSsh0WIfGMaX9sH3i+Pt8o3fnRA6TdtIdQ0Veso Yt8Dm44S8TDJg== From: cel@kernel.org To: Christian Brauner Cc: , Chuck Lever Subject: [PATCH v2 2/3] libfs: Add simple_offset_rename() API Date: Mon, 15 Apr 2024 11:20:55 -0400 Message-ID: <20240415152057.4605-3-cel@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415152057.4605-1-cel@kernel.org> References: <20240415152057.4605-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever I'm about to fix a tmpfs rename bug that requires the use of internal simple_offset helpers that are not available in mm/shmem.c Signed-off-by: Chuck Lever --- fs/libfs.c | 21 +++++++++++++++++++++ include/linux/fs.h | 2 ++ mm/shmem.c | 3 +-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index ab61fae92cde..c392a6edd393 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -357,6 +357,27 @@ int simple_offset_empty(struct dentry *dentry) return ret; } +/** + * simple_offset_rename - handle directory offsets for rename + * @old_dir: parent directory of source entry + * @old_dentry: dentry of source entry + * @new_dir: parent_directory of destination entry + * @new_dentry: dentry of destination + * + * Caller provides appropriate serialization. + * + * Returns zero on success, a negative errno value on failure. + */ +int simple_offset_rename(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); + + simple_offset_remove(old_ctx, old_dentry); + return simple_offset_add(new_ctx, old_dentry); +} + /** * 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 8dfd53b52744..b09f14132110 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3340,6 +3340,8 @@ 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(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_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 0aad0d9a621b..c0fb65223963 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3473,8 +3473,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return error; } - simple_offset_remove(shmem_get_offset_ctx(old_dir), old_dentry); - error = simple_offset_add(shmem_get_offset_ctx(new_dir), old_dentry); + error = simple_offset_rename(old_dir, old_dentry, new_dir, new_dentry); if (error) return error; From patchwork Mon Apr 15 15:20:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13630217 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4455176F17 for ; Mon, 15 Apr 2024 15:21:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713194475; cv=none; b=ZHHwZw8/lNhmNLdfVkhv2VG4qcU+ZXYDGK05r6ZNP4xbfbecWqRMoqa0gkWd4BmWLQatkN1Taq77tlXfT3jxpAsK6tWfmpcgvNQvU6MsVnEeOuVIsdB8gGsxbkGWcLlo0dYahi2znO1Ns5qH4NruXORSSZuJuQp5eDTF/jONHkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713194475; c=relaxed/simple; bh=mO6wYl0n2gAH7rOKjNiOQSLCNMJDIMoBV14J5VV6Xlo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UsxAj8KWLVQrT2CbbiMvz0DudOoMObDAC1u65p6+/8dFmebO95Bp/W2GNS+4mpJuVkakIGevAEodCpR30l20KSM/XBp2RWPMirePlucVOOTlNa16U99r3o+IF9GLLHP0gDvF6x+jULqJ7yryl6Dm6XS/1FLziv/i0PJQ6SGB0Vw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vFCgA1FZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vFCgA1FZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81D91C113CC; Mon, 15 Apr 2024 15:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713194474; bh=mO6wYl0n2gAH7rOKjNiOQSLCNMJDIMoBV14J5VV6Xlo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vFCgA1FZx+zHL6zi8ml8urWl2cE0x72HPCSG5lHUoGzZC7mBECHmwM15eq2ZYPis/ cz+2gCQru56GVA0matdtGiYRGBASnJ+9xizjG9KO5O3OKYcLDSC081d6/9Eog6fhUA IJZvSz0oAsa8HstqEY49QOMRe13GYa9doMHhC07zT+YHVSBaGWshGXELk+u7sMffe4 Yc2RgwTDtYZB4qGyCLMJK54mJCRVTjeQ0CUEHqlGsGRmmIOLm0NmcZzIJ94oMb6Tnd EXdSEOyCSMfiz7SyNRbVoBCwTFEtsAYuy/aAikrHtLOZlMFNMEJP7j88MyHytfPljp xu2kmPS1fk/FA== From: cel@kernel.org To: Christian Brauner Cc: , Chuck Lever Subject: [PATCH v2 3/3] shmem: Fix shmem_rename2() Date: Mon, 15 Apr 2024 11:20:56 -0400 Message-ID: <20240415152057.4605-4-cel@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415152057.4605-1-cel@kernel.org> References: <20240415152057.4605-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever When renaming onto an existing directory entry, user space expects the replacement entry to have the same directory offset as the original one. Link: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15966 Fixes: a2e459555c5f ("shmem: stable directory offsets") Signed-off-by: Chuck Lever --- fs/libfs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index c392a6edd393..b635ee5adbcc 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -366,6 +366,9 @@ int simple_offset_empty(struct dentry *dentry) * * Caller provides appropriate serialization. * + * User space expects the directory offset value of the replaced + * (new) directory entry to be unchanged after a rename. + * * Returns zero on success, a negative errno value on failure. */ int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, @@ -373,8 +376,14 @@ int simple_offset_rename(struct inode *old_dir, struct dentry *old_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); + long new_offset = dentry2offset(new_dentry); simple_offset_remove(old_ctx, old_dentry); + + if (new_offset) { + offset_set(new_dentry, 0); + return simple_offset_replace(new_ctx, old_dentry, new_offset); + } return simple_offset_add(new_ctx, old_dentry); }