From: "Darrick J. Wong" <djwong@kernel.org>
To: allison.henderson@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v4 21/27] xfs: Add parent pointers to rename
Date: Tue, 25 Oct 2022 14:28:57 -0700 [thread overview]
Message-ID: <Y1hVGatPEsRqNjJR@magnolia> (raw)
In-Reply-To: <20221021222936.934426-22-allison.henderson@oracle.com>
On Fri, Oct 21, 2022 at 03:29:30PM -0700, allison.henderson@oracle.com wrote:
> From: Allison Henderson <allison.henderson@oracle.com>
>
> This patch removes the old parent pointer attribute during the rename
> operation, and re-adds the updated parent pointer. In the case of
> xfs_cross_rename, we modify the routine not to roll the transaction just
> yet. We will do this after the parent pointer is added in the calling
> xfs_rename function.
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> fs/xfs/libxfs/xfs_attr.c | 2 +-
> fs/xfs/libxfs/xfs_attr.h | 1 +
> fs/xfs/libxfs/xfs_parent.c | 31 ++++++++++++
> fs/xfs/libxfs/xfs_parent.h | 7 +++
> fs/xfs/xfs_inode.c | 96 +++++++++++++++++++++++++++++++++++---
> 5 files changed, 130 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index e967728d1ee7..3f9bd8401f33 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -923,7 +923,7 @@ xfs_attr_defer_add(
> }
>
> /* Sets an attribute for an inode as a deferred operation */
> -static int
> +int
> xfs_attr_defer_replace(
> struct xfs_da_args *args)
> {
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 033005542b9e..985761264d1f 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -546,6 +546,7 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);
> int xfs_attr_get(struct xfs_da_args *args);
> int xfs_attr_defer_add(struct xfs_da_args *args);
> int xfs_attr_defer_remove(struct xfs_da_args *args);
> +int xfs_attr_defer_replace(struct xfs_da_args *args);
> int xfs_attr_set(struct xfs_da_args *args);
> int xfs_attr_set_iter(struct xfs_attr_intent *attr);
> int xfs_attr_remove_iter(struct xfs_attr_intent *attr);
> diff --git a/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c
> index c09f49b7c241..49ac95a301c4 100644
> --- a/fs/xfs/libxfs/xfs_parent.c
> +++ b/fs/xfs/libxfs/xfs_parent.c
> @@ -142,6 +142,37 @@ xfs_parent_defer_remove(
> return xfs_attr_defer_remove(args);
> }
>
> +
> +int
> +xfs_parent_defer_replace(
> + struct xfs_trans *tp,
> + struct xfs_inode *old_ip,
old_dp -- we've been (slowly and poorly) trying to name directory inode
pointer variables "dp" instead of "ip".
> + struct xfs_parent_defer *old_parent,
> + xfs_dir2_dataptr_t old_diroffset,
> + struct xfs_name *parent_name,
> + struct xfs_inode *new_ip,
> + struct xfs_parent_defer *new_parent,
> + xfs_dir2_dataptr_t new_diroffset,
> + struct xfs_inode *child)
> +{
> + struct xfs_da_args *args = &new_parent->args;
> +
> + xfs_init_parent_name_rec(&old_parent->rec, old_ip, old_diroffset);
Does old_parent get used for anything other than its embedded
xfs_parent_name_rec?
The xfs_da_args structure is already 136 bytes (and probably more with
the additions needed for pptrs) but the parent_name_rec is only 16. If
old_parent->args is unused, then I think we ought to make
xfs_parent_defer slightly larger instead of going for a second memory
allocation:
struct xfs_parent_defer {
struct xfs_parent_name_rec rec;
struct xfs_parent_name_rec old_rec;
struct xfs_da_args args;
};
xfs_init_parent_name_rec(&new_parent->old_rec, old_dp,
old_diroffset);
> + xfs_init_parent_name_rec(&new_parent->rec, new_ip, new_diroffset);
> + new_parent->args.name = (const uint8_t *)&old_parent->rec;
> + new_parent->args.namelen = sizeof(struct xfs_parent_name_rec);
> + new_parent->args.new_name = (const uint8_t *)&new_parent->rec;
> + new_parent->args.new_namelen = sizeof(struct xfs_parent_name_rec);
> + args->trans = tp;
> + args->dp = child;
> + if (parent_name) {
Is parent_name ever non-null for a replacement?
> + new_parent->args.value = (void *)parent_name->name;
> + new_parent->args.valuelen = parent_name->len;
> + }
> + args->hashval = xfs_da_hashname(args->name, args->namelen);
> + return xfs_attr_defer_replace(args);
> +}
> +
> void
> xfs_parent_cancel(
> xfs_mount_t *mp,
> diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h
> index 1c506532c624..5d8966a12084 100644
> --- a/fs/xfs/libxfs/xfs_parent.h
> +++ b/fs/xfs/libxfs/xfs_parent.h
> @@ -27,6 +27,13 @@ int xfs_parent_init(xfs_mount_t *mp, struct xfs_parent_defer **parentp);
> int xfs_parent_defer_add(struct xfs_trans *tp, struct xfs_parent_defer *parent,
> struct xfs_inode *dp, struct xfs_name *parent_name,
> xfs_dir2_dataptr_t diroffset, struct xfs_inode *child);
> +int xfs_parent_defer_replace(struct xfs_trans *tp, struct xfs_inode *old_ip,
> + struct xfs_parent_defer *old_parent,
> + xfs_dir2_dataptr_t old_diroffset,
> + struct xfs_name *parent_name, struct xfs_inode *new_ip,
> + struct xfs_parent_defer *new_parent,
> + xfs_dir2_dataptr_t new_diroffset,
> + struct xfs_inode *child);
> int xfs_parent_defer_remove(struct xfs_trans *tp, struct xfs_inode *dp,
> struct xfs_parent_defer *parent,
> xfs_dir2_dataptr_t diroffset,
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index b6b805ea30e5..a882daaeaf63 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2915,7 +2915,7 @@ xfs_rename_alloc_whiteout(
> int error;
>
> error = xfs_create_tmpfile(mnt_userns, dp, S_IFCHR | WHITEOUT_MODE,
> - false, &tmpfile);
> + xfs_has_parent(dp->i_mount), &tmpfile);
> if (error)
> return error;
>
> @@ -2941,6 +2941,31 @@ xfs_rename_alloc_whiteout(
> return 0;
> }
>
> +unsigned int
> +xfs_rename_space_res(
XFS_RENAME_SPACE_RES probably can go away now?
--D
> + struct xfs_mount *mp,
> + struct xfs_name *src_name,
> + struct xfs_parent_defer *target_parent_ptr,
> + struct xfs_name *target_name,
> + struct xfs_parent_defer *new_parent_ptr,
> + struct xfs_inode *wip)
> +{
> + unsigned int ret;
> +
> + ret = XFS_DIRREMOVE_SPACE_RES(mp) +
> + XFS_DIRENTER_SPACE_RES(mp, target_name->len);
> +
> + if (new_parent_ptr) {
> + if (wip)
> + ret += xfs_pptr_calc_space_res(mp, src_name->len);
> + ret += 2 * xfs_pptr_calc_space_res(mp, target_name->len);
> + }
> + if (target_parent_ptr)
> + ret += xfs_pptr_calc_space_res(mp, target_name->len);
> +
> + return ret;
> +}
> +
> /*
> * xfs_rename
> */
> @@ -2967,6 +2992,12 @@ xfs_rename(
> int spaceres;
> bool retried = false;
> int error, nospace_error = 0;
> + xfs_dir2_dataptr_t new_diroffset;
> + xfs_dir2_dataptr_t old_diroffset;
> + struct xfs_parent_defer *old_parent_ptr = NULL;
> + struct xfs_parent_defer *new_parent_ptr = NULL;
> + struct xfs_parent_defer *target_parent_ptr = NULL;
> + struct xfs_parent_defer *wip_parent_ptr = NULL;
>
> trace_xfs_rename(src_dp, target_dp, src_name, target_name);
>
> @@ -2990,10 +3021,29 @@ xfs_rename(
>
> xfs_sort_for_rename(src_dp, target_dp, src_ip, target_ip, wip,
> inodes, &num_inodes);
> + if (xfs_has_parent(mp)) {
> + error = xfs_parent_init(mp, &old_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + error = xfs_parent_init(mp, &new_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + if (wip) {
> + error = xfs_parent_init(mp, &wip_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + }
> + if (target_ip != NULL) {
> + error = xfs_parent_init(mp, &target_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + }
> + }
>
> retry:
> nospace_error = 0;
> - spaceres = XFS_RENAME_SPACE_RES(mp, target_name->len);
> + spaceres = xfs_rename_space_res(mp, src_name, target_parent_ptr,
> + target_name, new_parent_ptr, wip);
> error = xfs_trans_alloc(mp, &M_RES(mp)->tr_rename, spaceres, 0, 0, &tp);
> if (error == -ENOSPC) {
> nospace_error = error;
> @@ -3165,7 +3215,7 @@ xfs_rename(
> * to account for the ".." reference from the new entry.
> */
> error = xfs_dir_createname(tp, target_dp, target_name,
> - src_ip->i_ino, spaceres, NULL);
> + src_ip->i_ino, spaceres, &new_diroffset);
> if (error)
> goto out_trans_cancel;
>
> @@ -3186,7 +3236,7 @@ xfs_rename(
> * name at the destination directory, remove it first.
> */
> error = xfs_dir_replace(tp, target_dp, target_name,
> - src_ip->i_ino, spaceres, NULL);
> + src_ip->i_ino, spaceres, &new_diroffset);
> if (error)
> goto out_trans_cancel;
>
> @@ -3259,14 +3309,39 @@ xfs_rename(
> */
> if (wip)
> error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino,
> - spaceres, NULL);
> + spaceres, &old_diroffset);
> else
> error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino,
> - spaceres, NULL);
> + spaceres, &old_diroffset);
>
> if (error)
> goto out_trans_cancel;
>
> + if (new_parent_ptr) {
> + if (wip) {
> + error = xfs_parent_defer_add(tp, wip_parent_ptr,
> + src_dp, src_name,
> + old_diroffset, wip);
> + if (error)
> + goto out_trans_cancel;
> + }
> +
> + error = xfs_parent_defer_replace(tp, src_dp, old_parent_ptr,
> + old_diroffset, target_name,
> + target_dp, new_parent_ptr,
> + new_diroffset, src_ip);
> + if (error)
> + goto out_trans_cancel;
> + }
> +
> + if (target_parent_ptr) {
> + error = xfs_parent_defer_remove(tp, target_dp,
> + target_parent_ptr,
> + new_diroffset, target_ip);
> + if (error)
> + goto out_trans_cancel;
> + }
> +
> xfs_trans_ichgtime(tp, src_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
> xfs_trans_log_inode(tp, src_dp, XFS_ILOG_CORE);
> if (new_parent)
> @@ -3281,6 +3356,15 @@ xfs_rename(
> out_unlock:
> xfs_iunlock_after_rename(inodes, num_inodes);
> out_release_wip:
> + if (new_parent_ptr)
> + xfs_parent_cancel(mp, new_parent_ptr);
> + if (old_parent_ptr)
> + xfs_parent_cancel(mp, old_parent_ptr);
> + if (target_parent_ptr)
> + xfs_parent_cancel(mp, target_parent_ptr);
> + if (wip_parent_ptr)
> + xfs_parent_cancel(mp, wip_parent_ptr);
> +
> if (wip)
> xfs_irele(wip);
> if (error == -ENOSPC && nospace_error)
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-10-25 21:29 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 22:29 [PATCH v4 00/27] Parent Pointers allison.henderson
2022-10-21 22:29 ` [PATCH v4 01/27] xfs: Add new name to attri/d allison.henderson
2022-10-25 19:09 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 02/27] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 allison.henderson
2022-10-28 1:52 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 03/27] xfs: Hold inode locks in xfs_ialloc allison.henderson
2022-10-28 1:54 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 04/27] xfs: Hold inode locks in xfs_trans_alloc_dir allison.henderson
2022-10-28 1:56 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 05/27] xfs: Hold inode locks in xfs_rename allison.henderson
2022-10-28 1:59 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 06/27] xfs: Expose init_xattrs in xfs_create_tmpfile allison.henderson
2022-10-25 19:13 ` Darrick J. Wong
2022-10-25 21:33 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 07/27] xfs: get directory offset when adding directory name allison.henderson
2022-10-28 2:02 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 08/27] xfs: get directory offset when removing " allison.henderson
2022-10-28 2:06 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 09/27] xfs: get directory offset when replacing a " allison.henderson
2022-10-21 22:29 ` [PATCH v4 10/27] xfs: add parent pointer support to attribute code allison.henderson
2022-10-21 22:29 ` [PATCH v4 11/27] xfs: define parent pointer xattr format allison.henderson
2022-10-21 22:29 ` [PATCH v4 12/27] xfs: Add xfs_verify_pptr allison.henderson
2022-10-21 22:29 ` [PATCH v4 13/27] xfs: Increase rename inode reservation allison.henderson
2022-10-25 19:15 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 14/27] xfs: extend transaction reservations for parent attributes allison.henderson
2022-10-25 20:55 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 15/27] xfs: parent pointer attribute creation allison.henderson
2022-10-25 21:11 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 16/27] xfs: add parent attributes to link allison.henderson
2022-10-25 20:58 ` Darrick J. Wong
2022-10-21 22:29 ` [PATCH v4 17/27] xfs: add parent attributes to symlink allison.henderson
2022-10-25 21:06 ` Darrick J. Wong
2022-10-21 22:29 ` [PATCH v4 18/27] xfs: remove parent pointers in unlink allison.henderson
2022-10-25 21:14 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 19/27] xfs: Add parent pointers to xfs_cross_rename allison.henderson
2022-10-25 21:32 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 20/27] xfs: Indent xfs_rename allison.henderson
2022-10-21 22:29 ` [PATCH v4 21/27] xfs: Add parent pointers to rename allison.henderson
2022-10-25 21:28 ` Darrick J. Wong [this message]
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 22/27] xfs: Add the parent pointer support to the superblock version 5 allison.henderson
2022-10-21 22:29 ` [PATCH v4 23/27] xfs: Add helper function xfs_attr_list_context_init allison.henderson
2022-10-21 22:29 ` [PATCH v4 24/27] xfs: Filter XFS_ATTR_PARENT for getfattr allison.henderson
2022-10-25 21:34 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 25/27] xfs: Add parent pointer ioctl allison.henderson
2022-10-21 22:29 ` [PATCH v4 26/27] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res allison.henderson
2022-10-21 22:29 ` [PATCH v4 27/27] xfs: drop compatibility minimum log size computations for reflink allison.henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y1hVGatPEsRqNjJR@magnolia \
--to=djwong@kernel.org \
--cc=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox