* [PATCH v28 01/15] xfs: Fix double unlock in defer capture code
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 02/15] xfs: don't commit the first deferred transaction without intents Allison Henderson
` (14 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
The new deferred attr patch set uncovered a double unlock in the
recent port of the defer ops capture and continue code. During log
recovery, we're allowed to hold buffers to a transaction that's being
used to replay an intent item. When we capture the resources as part
of scheduling a continuation of an intent chain, we call xfs_buf_hold
to retain our reference to the buffer beyond the transaction commit,
but we do /not/ call xfs_trans_bhold to maintain the buffer lock.
This means that xfs_defer_ops_continue needs to relock the buffers
before xfs_defer_restore_resources joins then tothe new transaction.
Additionally, the buffers should not be passed back via the dres
structure since they need to remain locked unlike the inodes. So
simply set dr_bufs to zero after populating the dres structure.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
---
fs/xfs/libxfs/xfs_defer.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 0805ade2d300..6dac8d6b8c21 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -22,6 +22,7 @@
#include "xfs_refcount.h"
#include "xfs_bmap.h"
#include "xfs_alloc.h"
+#include "xfs_buf.h"
static struct kmem_cache *xfs_defer_pending_cache;
@@ -774,17 +775,25 @@ xfs_defer_ops_continue(
struct xfs_trans *tp,
struct xfs_defer_resources *dres)
{
+ unsigned int i;
+
ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
ASSERT(!(tp->t_flags & XFS_TRANS_DIRTY));
- /* Lock and join the captured inode to the new transaction. */
+ /* Lock the captured resources to the new transaction. */
if (dfc->dfc_held.dr_inos == 2)
xfs_lock_two_inodes(dfc->dfc_held.dr_ip[0], XFS_ILOCK_EXCL,
dfc->dfc_held.dr_ip[1], XFS_ILOCK_EXCL);
else if (dfc->dfc_held.dr_inos == 1)
xfs_ilock(dfc->dfc_held.dr_ip[0], XFS_ILOCK_EXCL);
+
+ for (i = 0; i < dfc->dfc_held.dr_bufs; i++)
+ xfs_buf_lock(dfc->dfc_held.dr_bp[i]);
+
+ /* Join the captured resources to the new transaction. */
xfs_defer_restore_resources(tp, &dfc->dfc_held);
memcpy(dres, &dfc->dfc_held, sizeof(struct xfs_defer_resources));
+ dres->dr_bufs = 0;
/* Move captured dfops chain and state to the transaction. */
list_splice_init(&dfc->dfc_dfops, &tp->t_dfops);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 02/15] xfs: don't commit the first deferred transaction without intents
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
2022-02-28 19:51 ` [PATCH v28 01/15] xfs: Fix double unlock in defer capture code Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 03/15] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
` (13 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
If the first operation in a string of defer ops has no intents,
then there is no reason to commit it before running the first call
to xfs_defer_finish_one(). This allows the defer ops to be used
effectively for non-intent based operations without requiring an
unnecessary extra transaction commit when first called.
This fixes a regression in per-attribute modification transaction
count when delayed attributes are not being used.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
---
fs/xfs/libxfs/xfs_defer.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 6dac8d6b8c21..5b3f3a7f1f65 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -510,9 +510,16 @@ xfs_defer_finish_noroll(
xfs_defer_create_intents(*tp);
list_splice_init(&(*tp)->t_dfops, &dop_pending);
- error = xfs_defer_trans_roll(tp);
- if (error)
- goto out_shutdown;
+ /*
+ * We must ensure the transaction is clean before we try to
+ * finish the next deferred item by committing logged intent
+ * items and anything else that dirtied the transaction.
+ */
+ if ((*tp)->t_flags & XFS_TRANS_DIRTY) {
+ error = xfs_defer_trans_roll(tp);
+ if (error)
+ goto out_shutdown;
+ }
/* Possibly relog intent items to keep the log moving. */
error = xfs_defer_relog(tp, &dop_pending);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 03/15] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
2022-02-28 19:51 ` [PATCH v28 01/15] xfs: Fix double unlock in defer capture code Allison Henderson
2022-02-28 19:51 ` [PATCH v28 02/15] xfs: don't commit the first deferred transaction without intents Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 04/15] xfs: Set up infrastructure for log attribute replay Allison Henderson
` (12 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
During an attr rename operation, blocks are saved for later removal
as rmtblkno2. The rmtblkno is used in the case of needing to alloc
more blocks if not enough were available. However, in the case
that no further blocks need to be added or removed, we can return as soon
as xfs_attr_node_addname completes, rather than rolling the transaction
with an -EAGAIN return. This extra loop does not hurt anything right
now, but it will be a problem later when we get into log items because
we end up with an empty log transaction. So, add a simple check to
cut out the unneeded iteration.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_attr.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 23523b802539..23502a24ce41 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -412,6 +412,14 @@ xfs_attr_set_iter(
if (error)
return error;
+ /*
+ * If addname was successful, and we dont need to alloc
+ * or remove anymore blks, we're done.
+ */
+ if (!args->rmtblkno &&
+ !(args->op_flags & XFS_DA_OP_RENAME))
+ return 0;
+
dac->dela_state = XFS_DAS_FOUND_NBLK;
}
trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 04/15] xfs: Set up infrastructure for log attribute replay
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (2 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 03/15] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 05/15] xfs: Implement attr logging and replay Allison Henderson
` (11 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
Currently attributes are modified directly across one or more
transactions. But they are not logged or replayed in the event of an
error. The goal of log attr replay is to enable logging and replaying
of attribute operations using the existing delayed operations
infrastructure. This will later enable the attributes to become part of
larger multi part operations that also must first be recorded to the
log. This is mostly of interest in the scheme of parent pointers which
would need to maintain an attribute containing parent inode information
any time an inode is moved, created, or removed. Parent pointers would
then be of interest to any feature that would need to quickly derive an
inode path from the mount point. Online scrub, nfs lookups and fs grow
or shrink operations are all features that could take advantage of this.
This patch adds two new log item types for setting or removing
attributes as deferred operations. The xfs_attri_log_item will log an
intent to set or remove an attribute. The corresponding
xfs_attrd_log_item holds a reference to the xfs_attri_log_item and is
freed once the transaction is done. Both log items use a generic
xfs_attr_log_format structure that contains the attribute name, value,
flags, inode, and an op_flag that indicates if the operations is a set
or remove.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/Makefile | 1 +
fs/xfs/libxfs/xfs_attr.c | 42 ++-
fs/xfs/libxfs/xfs_attr.h | 38 +++
fs/xfs/libxfs/xfs_defer.c | 10 +-
fs/xfs/libxfs/xfs_defer.h | 2 +
fs/xfs/libxfs/xfs_log_format.h | 44 +++-
fs/xfs/libxfs/xfs_log_recover.h | 2 +
fs/xfs/scrub/common.c | 2 +
fs/xfs/xfs_attr_item.c | 441 ++++++++++++++++++++++++++++++++
fs/xfs/xfs_attr_item.h | 46 ++++
fs/xfs/xfs_attr_list.c | 1 +
fs/xfs/xfs_ioctl32.c | 2 +
fs/xfs/xfs_iops.c | 2 +
fs/xfs/xfs_log.c | 4 +
fs/xfs/xfs_log.h | 11 +
fs/xfs/xfs_log_recover.c | 2 +
fs/xfs/xfs_ondisk.h | 2 +
17 files changed, 646 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 04611a1068b4..b056cfc6398e 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -102,6 +102,7 @@ xfs-y += xfs_log.o \
xfs_buf_item_recover.o \
xfs_dquot_item_recover.o \
xfs_extfree_item.o \
+ xfs_attr_item.o \
xfs_icreate_item.o \
xfs_inode_item.o \
xfs_inode_item_recover.o \
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 23502a24ce41..21594f814685 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -24,6 +24,10 @@
#include "xfs_quota.h"
#include "xfs_trans_space.h"
#include "xfs_trace.h"
+#include "xfs_attr_item.h"
+
+struct kmem_cache *xfs_attri_cache;
+struct kmem_cache *xfs_attrd_cache;
/*
* xfs_attr.c
@@ -61,8 +65,6 @@ STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,
struct xfs_da_state **state);
STATIC int xfs_attr_fillstate(xfs_da_state_t *state);
STATIC int xfs_attr_refillstate(xfs_da_state_t *state);
-STATIC int xfs_attr_set_iter(struct xfs_delattr_context *dac,
- struct xfs_buf **leaf_bp);
STATIC int xfs_attr_node_removename(struct xfs_da_args *args,
struct xfs_da_state *state);
@@ -166,7 +168,7 @@ xfs_attr_get(
/*
* Calculate how many blocks we need for the new attribute,
*/
-STATIC int
+int
xfs_attr_calc_size(
struct xfs_da_args *args,
int *local)
@@ -837,6 +839,40 @@ xfs_attr_set(
goto out_unlock;
}
+int __init
+xfs_attri_init_cache(void)
+{
+ xfs_attri_cache = kmem_cache_create("xfs_attri",
+ sizeof(struct xfs_attri_log_item),
+ 0, 0, NULL);
+
+ return xfs_attri_cache != NULL ? 0 : -ENOMEM;
+}
+
+void
+xfs_attri_destroy_cache(void)
+{
+ kmem_cache_destroy(xfs_attri_cache);
+ xfs_attri_cache = NULL;
+}
+
+int __init
+xfs_attrd_init_cache(void)
+{
+ xfs_attrd_cache = kmem_cache_create("xfs_attrd",
+ sizeof(struct xfs_attrd_log_item),
+ 0, 0, NULL);
+
+ return xfs_attrd_cache != NULL ? 0 : -ENOMEM;
+}
+
+void
+xfs_attrd_destroy_cache(void)
+{
+ kmem_cache_destroy(xfs_attrd_cache);
+ xfs_attrd_cache = NULL;
+}
+
/*========================================================================
* External routines when attribute list is inside the inode
*========================================================================*/
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 5e71f719bdd5..80b6f28b0d1a 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -28,6 +28,11 @@ struct xfs_attr_list_context;
*/
#define ATTR_MAX_VALUELEN (64*1024) /* max length of a value */
+static inline bool xfs_has_larp(struct xfs_mount *mp)
+{
+ return false;
+}
+
/*
* Kernel-internal version of the attrlist cursor.
*/
@@ -461,6 +466,11 @@ enum xfs_delattr_state {
struct xfs_delattr_context {
struct xfs_da_args *da_args;
+ /*
+ * Used by xfs_attr_set to hold a leaf buffer across a transaction roll
+ */
+ struct xfs_buf *leaf_bp;
+
/* Used in xfs_attr_rmtval_set_blk to roll through allocating blocks */
struct xfs_bmbt_irec map;
xfs_dablk_t lblkno;
@@ -474,6 +484,23 @@ struct xfs_delattr_context {
enum xfs_delattr_state dela_state;
};
+/*
+ * List of attrs to commit later.
+ */
+struct xfs_attr_item {
+ struct xfs_delattr_context xattri_dac;
+
+ /*
+ * Indicates if the attr operation is a set or a remove
+ * XFS_ATTR_OP_FLAGS_{SET,REMOVE}
+ */
+ unsigned int xattri_op_flags;
+
+ /* used to log this item to an intent */
+ struct list_head xattri_list;
+};
+
+
/*========================================================================
* Function prototypes for the kernel.
*========================================================================*/
@@ -490,10 +517,21 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args);
int xfs_attr_set_args(struct xfs_da_args *args);
+int xfs_attr_set_iter(struct xfs_delattr_context *dac,
+ struct xfs_buf **leaf_bp);
int xfs_attr_remove_args(struct xfs_da_args *args);
int xfs_attr_remove_iter(struct xfs_delattr_context *dac);
bool xfs_attr_namecheck(const void *name, size_t length);
void xfs_delattr_context_init(struct xfs_delattr_context *dac,
struct xfs_da_args *args);
+int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
+
+extern struct kmem_cache *xfs_attri_cache;
+extern struct kmem_cache *xfs_attrd_cache;
+
+int __init xfs_attri_init_cache(void);
+void xfs_attri_destroy_cache(void);
+int __init xfs_attrd_init_cache(void);
+void xfs_attrd_destroy_cache(void);
#endif /* __XFS_ATTR_H__ */
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 5b3f3a7f1f65..91adfb01c848 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -23,6 +23,7 @@
#include "xfs_bmap.h"
#include "xfs_alloc.h"
#include "xfs_buf.h"
+#include "xfs_attr.h"
static struct kmem_cache *xfs_defer_pending_cache;
@@ -870,7 +871,12 @@ xfs_defer_init_item_caches(void)
error = xfs_extfree_intent_init_cache();
if (error)
goto err;
-
+ error = xfs_attri_init_cache();
+ if (error)
+ goto err;
+ error = xfs_attrd_init_cache();
+ if (error)
+ goto err;
return 0;
err:
xfs_defer_destroy_item_caches();
@@ -881,6 +887,8 @@ xfs_defer_init_item_caches(void)
void
xfs_defer_destroy_item_caches(void)
{
+ xfs_attri_destroy_cache();
+ xfs_attrd_destroy_cache();
xfs_extfree_intent_destroy_cache();
xfs_bmap_intent_destroy_cache();
xfs_refcount_intent_destroy_cache();
diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index 7bb8a31ad65b..fcd23e5cf1ee 100644
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -63,6 +63,8 @@ extern const struct xfs_defer_op_type xfs_refcount_update_defer_type;
extern const struct xfs_defer_op_type xfs_rmap_update_defer_type;
extern const struct xfs_defer_op_type xfs_extent_free_defer_type;
extern const struct xfs_defer_op_type xfs_agfl_free_defer_type;
+extern const struct xfs_defer_op_type xfs_attr_defer_type;
+
/*
* Deferred operation item relogging limits.
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index b322db523d65..3301c369e815 100644
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -114,7 +114,12 @@ struct xfs_unmount_log_format {
#define XLOG_REG_TYPE_CUD_FORMAT 24
#define XLOG_REG_TYPE_BUI_FORMAT 25
#define XLOG_REG_TYPE_BUD_FORMAT 26
-#define XLOG_REG_TYPE_MAX 26
+#define XLOG_REG_TYPE_ATTRI_FORMAT 27
+#define XLOG_REG_TYPE_ATTRD_FORMAT 28
+#define XLOG_REG_TYPE_ATTR_NAME 29
+#define XLOG_REG_TYPE_ATTR_VALUE 30
+#define XLOG_REG_TYPE_MAX 30
+
/*
* Flags to log operation header
@@ -237,6 +242,8 @@ typedef struct xfs_trans_header {
#define XFS_LI_CUD 0x1243
#define XFS_LI_BUI 0x1244 /* bmbt update intent */
#define XFS_LI_BUD 0x1245
+#define XFS_LI_ATTRI 0x1246 /* attr set/remove intent*/
+#define XFS_LI_ATTRD 0x1247 /* attr set/remove done */
#define XFS_LI_TYPE_DESC \
{ XFS_LI_EFI, "XFS_LI_EFI" }, \
@@ -252,7 +259,9 @@ typedef struct xfs_trans_header {
{ XFS_LI_CUI, "XFS_LI_CUI" }, \
{ XFS_LI_CUD, "XFS_LI_CUD" }, \
{ XFS_LI_BUI, "XFS_LI_BUI" }, \
- { XFS_LI_BUD, "XFS_LI_BUD" }
+ { XFS_LI_BUD, "XFS_LI_BUD" }, \
+ { XFS_LI_ATTRI, "XFS_LI_ATTRI" }, \
+ { XFS_LI_ATTRD, "XFS_LI_ATTRD" }
/*
* Inode Log Item Format definitions.
@@ -869,4 +878,35 @@ struct xfs_icreate_log {
__be32 icl_gen; /* inode generation number to use */
};
+/*
+ * Flags for deferred attribute operations.
+ * Upper bits are flags, lower byte is type code
+ */
+#define XFS_ATTR_OP_FLAGS_SET 1 /* Set the attribute */
+#define XFS_ATTR_OP_FLAGS_REMOVE 2 /* Remove the attribute */
+#define XFS_ATTR_OP_FLAGS_TYPE_MASK 0xFF /* Flags type mask */
+
+/*
+ * This is the structure used to lay out an attr log item in the
+ * log.
+ */
+struct xfs_attri_log_format {
+ uint16_t alfi_type; /* attri log item type */
+ uint16_t alfi_size; /* size of this item */
+ uint32_t __pad; /* pad to 64 bit aligned */
+ uint64_t alfi_id; /* attri identifier */
+ uint64_t alfi_ino; /* the inode for this attr operation */
+ uint32_t alfi_op_flags; /* marks the op as a set or remove */
+ uint32_t alfi_name_len; /* attr name length */
+ uint32_t alfi_value_len; /* attr value length */
+ uint32_t alfi_attr_flags;/* attr flags */
+};
+
+struct xfs_attrd_log_format {
+ uint16_t alfd_type; /* attrd log item type */
+ uint16_t alfd_size; /* size of this item */
+ uint32_t __pad; /* pad to 64 bit aligned */
+ uint64_t alfd_alf_id; /* id of corresponding attri */
+};
+
#endif /* __XFS_LOG_FORMAT_H__ */
diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
index ff69a0000817..32e216255cb0 100644
--- a/fs/xfs/libxfs/xfs_log_recover.h
+++ b/fs/xfs/libxfs/xfs_log_recover.h
@@ -72,6 +72,8 @@ extern const struct xlog_recover_item_ops xlog_rui_item_ops;
extern const struct xlog_recover_item_ops xlog_rud_item_ops;
extern const struct xlog_recover_item_ops xlog_cui_item_ops;
extern const struct xlog_recover_item_ops xlog_cud_item_ops;
+extern const struct xlog_recover_item_ops xlog_attri_item_ops;
+extern const struct xlog_recover_item_ops xlog_attrd_item_ops;
/*
* Macros, structures, prototypes for internal log manager use.
diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index bf1f3607d0b6..97b54ac3075f 100644
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -23,6 +23,8 @@
#include "xfs_rmap_btree.h"
#include "xfs_log.h"
#include "xfs_trans_priv.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
#include "xfs_attr.h"
#include "xfs_reflink.h"
#include "xfs_ag.h"
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
new file mode 100644
index 000000000000..00ade15cf1eb
--- /dev/null
+++ b/fs/xfs/xfs_attr_item.c
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2022 Oracle. All Rights Reserved.
+ * Author: Allison Henderson <allison.henderson@oracle.com>
+ */
+
+#include "xfs.h"
+#include "xfs_fs.h"
+#include "xfs_format.h"
+#include "xfs_trans_resv.h"
+#include "xfs_shared.h"
+#include "xfs_mount.h"
+#include "xfs_defer.h"
+#include "xfs_log_format.h"
+#include "xfs_trans.h"
+#include "xfs_trans_priv.h"
+#include "xfs_log.h"
+#include "xfs_inode.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
+#include "xfs_attr.h"
+#include "xfs_attr_item.h"
+#include "xfs_trace.h"
+#include "xfs_inode.h"
+#include "xfs_trans_space.h"
+#include "xfs_error.h"
+#include "xfs_log_priv.h"
+#include "xfs_log_recover.h"
+
+static const struct xfs_item_ops xfs_attri_item_ops;
+static const struct xfs_item_ops xfs_attrd_item_ops;
+
+static inline struct xfs_attri_log_item *ATTRI_ITEM(struct xfs_log_item *lip)
+{
+ return container_of(lip, struct xfs_attri_log_item, attri_item);
+}
+
+STATIC void
+xfs_attri_item_free(
+ struct xfs_attri_log_item *attrip)
+{
+ kmem_free(attrip->attri_item.li_lv_shadow);
+ kmem_free(attrip);
+}
+
+/*
+ * Freeing the attrip requires that we remove it from the AIL if it has already
+ * been placed there. However, the ATTRI may not yet have been placed in the
+ * AIL when called by xfs_attri_release() from ATTRD processing due to the
+ * ordering of committed vs unpin operations in bulk insert operations. Hence
+ * the reference count to ensure only the last caller frees the ATTRI.
+ */
+STATIC void
+xfs_attri_release(
+ struct xfs_attri_log_item *attrip)
+{
+ ASSERT(atomic_read(&attrip->attri_refcount) > 0);
+ if (atomic_dec_and_test(&attrip->attri_refcount)) {
+ xfs_trans_ail_delete(&attrip->attri_item,
+ SHUTDOWN_LOG_IO_ERROR);
+ xfs_attri_item_free(attrip);
+ }
+}
+
+STATIC void
+xfs_attri_item_size(
+ struct xfs_log_item *lip,
+ int *nvecs,
+ int *nbytes)
+{
+ struct xfs_attri_log_item *attrip = ATTRI_ITEM(lip);
+
+ *nvecs += 2;
+ *nbytes += sizeof(struct xfs_attri_log_format) +
+ xlog_calc_iovec_len(attrip->attri_name_len);
+
+ if (!attrip->attri_value_len)
+ return;
+
+ *nvecs += 1;
+ *nbytes += xlog_calc_iovec_len(attrip->attri_value_len);
+}
+
+/*
+ * This is called to fill in the log iovecs for the given attri log
+ * item. We use 1 iovec for the attri_format_item, 1 for the name, and
+ * another for the value if it is present
+ */
+STATIC void
+xfs_attri_item_format(
+ struct xfs_log_item *lip,
+ struct xfs_log_vec *lv)
+{
+ struct xfs_attri_log_item *attrip = ATTRI_ITEM(lip);
+ struct xfs_log_iovec *vecp = NULL;
+
+ attrip->attri_format.alfi_type = XFS_LI_ATTRI;
+ attrip->attri_format.alfi_size = 1;
+
+ /*
+ * This size accounting must be done before copying the attrip into the
+ * iovec. If we do it after, the wrong size will be recorded to the log
+ * and we trip across assertion checks for bad region sizes later during
+ * the log recovery.
+ */
+
+ ASSERT(attrip->attri_name_len > 0);
+ attrip->attri_format.alfi_size++;
+
+ if (attrip->attri_value_len > 0)
+ attrip->attri_format.alfi_size++;
+
+ xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_ATTRI_FORMAT,
+ &attrip->attri_format,
+ sizeof(struct xfs_attri_log_format));
+ xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_ATTR_NAME,
+ attrip->attri_name,
+ xlog_calc_iovec_len(attrip->attri_name_len));
+ if (attrip->attri_value_len > 0)
+ xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_ATTR_VALUE,
+ attrip->attri_value,
+ xlog_calc_iovec_len(attrip->attri_value_len));
+}
+
+/*
+ * The unpin operation is the last place an ATTRI is manipulated in the log. It
+ * is either inserted in the AIL or aborted in the event of a log I/O error. In
+ * either case, the ATTRI transaction has been successfully committed to make
+ * it this far. Therefore, we expect whoever committed the ATTRI to either
+ * construct and commit the ATTRD or drop the ATTRD's reference in the event of
+ * error. Simply drop the log's ATTRI reference now that the log is done with
+ * it.
+ */
+STATIC void
+xfs_attri_item_unpin(
+ struct xfs_log_item *lip,
+ int remove)
+{
+ xfs_attri_release(ATTRI_ITEM(lip));
+}
+
+
+STATIC void
+xfs_attri_item_release(
+ struct xfs_log_item *lip)
+{
+ xfs_attri_release(ATTRI_ITEM(lip));
+}
+
+/*
+ * Allocate and initialize an attri item. Caller may allocate an additional
+ * trailing buffer of the specified size
+ */
+STATIC struct xfs_attri_log_item *
+xfs_attri_init(
+ struct xfs_mount *mp,
+ int buffer_size)
+
+{
+ struct xfs_attri_log_item *attrip;
+
+ if (buffer_size) {
+ attrip = kmem_alloc(sizeof(struct xfs_attri_log_item) +
+ buffer_size, KM_NOFS);
+ if (attrip == NULL)
+ return NULL;
+ } else {
+ attrip = kmem_cache_alloc(xfs_attri_cache,
+ GFP_NOFS | __GFP_NOFAIL);
+ }
+
+ xfs_log_item_init(mp, &attrip->attri_item, XFS_LI_ATTRI,
+ &xfs_attri_item_ops);
+ attrip->attri_format.alfi_id = (uintptr_t)(void *)attrip;
+ atomic_set(&attrip->attri_refcount, 2);
+
+ return attrip;
+}
+
+/*
+ * Copy an attr format buffer from the given buf, and into the destination attr
+ * format structure.
+ */
+STATIC int
+xfs_attri_copy_format(
+ struct xfs_log_iovec *buf,
+ struct xfs_attri_log_format *dst_attr_fmt)
+{
+ struct xfs_attri_log_format *src_attr_fmt = buf->i_addr;
+ size_t len;
+
+ len = sizeof(struct xfs_attri_log_format);
+ if (buf->i_len != len) {
+ XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL);
+ return -EFSCORRUPTED;
+ }
+
+ memcpy((char *)dst_attr_fmt, (char *)src_attr_fmt, len);
+ return 0;
+}
+
+static inline struct xfs_attrd_log_item *ATTRD_ITEM(struct xfs_log_item *lip)
+{
+ return container_of(lip, struct xfs_attrd_log_item, attrd_item);
+}
+
+STATIC void
+xfs_attrd_item_free(struct xfs_attrd_log_item *attrdp)
+{
+ kmem_free(attrdp->attrd_item.li_lv_shadow);
+ kmem_free(attrdp);
+}
+
+STATIC void
+xfs_attrd_item_size(
+ struct xfs_log_item *lip,
+ int *nvecs,
+ int *nbytes)
+{
+ *nvecs += 1;
+ *nbytes += sizeof(struct xfs_attrd_log_format);
+}
+
+/*
+ * This is called to fill in the log iovecs for the given attrd log item. We use
+ * only 1 iovec for the attrd_format, and we point that at the attr_log_format
+ * structure embedded in the attrd item.
+ */
+STATIC void
+xfs_attrd_item_format(
+ struct xfs_log_item *lip,
+ struct xfs_log_vec *lv)
+{
+ struct xfs_attrd_log_item *attrdp = ATTRD_ITEM(lip);
+ struct xfs_log_iovec *vecp = NULL;
+
+ attrdp->attrd_format.alfd_type = XFS_LI_ATTRD;
+ attrdp->attrd_format.alfd_size = 1;
+
+ xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_ATTRD_FORMAT,
+ &attrdp->attrd_format,
+ sizeof(struct xfs_attrd_log_format));
+}
+
+/*
+ * The ATTRD is either committed or aborted if the transaction is canceled. If
+ * the transaction is canceled, drop our reference to the ATTRI and free the
+ * ATTRD.
+ */
+STATIC void
+xfs_attrd_item_release(
+ struct xfs_log_item *lip)
+{
+ struct xfs_attrd_log_item *attrdp = ATTRD_ITEM(lip);
+
+ xfs_attri_release(attrdp->attrd_attrip);
+ xfs_attrd_item_free(attrdp);
+}
+
+STATIC xfs_lsn_t
+xfs_attri_item_committed(
+ struct xfs_log_item *lip,
+ xfs_lsn_t lsn)
+{
+ struct xfs_attri_log_item *attrip = ATTRI_ITEM(lip);
+
+ /*
+ * The attrip refers to xfs_attr_item memory to log the name and value
+ * with the intent item. This already occurred when the intent was
+ * committed so these fields are no longer accessed. Clear them out of
+ * caution since we're about to free the xfs_attr_item.
+ */
+ attrip->attri_name = NULL;
+ attrip->attri_value = NULL;
+
+ /*
+ * The ATTRI is logged only once and cannot be moved in the log, so
+ * simply return the lsn at which it's been logged.
+ */
+ return lsn;
+}
+
+STATIC bool
+xfs_attri_item_match(
+ struct xfs_log_item *lip,
+ uint64_t intent_id)
+{
+ return ATTRI_ITEM(lip)->attri_format.alfi_id == intent_id;
+}
+
+/* Is this recovered ATTRI format ok? */
+static inline bool
+xfs_attri_validate(
+ struct xfs_mount *mp,
+ struct xfs_attri_log_format *attrp)
+{
+ unsigned int op = attrp->alfi_op_flags &
+ XFS_ATTR_OP_FLAGS_TYPE_MASK;
+
+ if (attrp->__pad != 0)
+ return false;
+
+ /* alfi_op_flags should be either a set or remove */
+ if (op != XFS_ATTR_OP_FLAGS_SET && op != XFS_ATTR_OP_FLAGS_REMOVE)
+ return false;
+
+ if (attrp->alfi_value_len > XATTR_SIZE_MAX)
+ return false;
+
+ if ((attrp->alfi_name_len > XATTR_NAME_MAX) ||
+ (attrp->alfi_name_len == 0))
+ return false;
+
+ return xfs_verify_ino(mp, attrp->alfi_ino);
+}
+
+STATIC int
+xlog_recover_attri_commit_pass2(
+ struct xlog *log,
+ struct list_head *buffer_list,
+ struct xlog_recover_item *item,
+ xfs_lsn_t lsn)
+{
+ int error;
+ struct xfs_mount *mp = log->l_mp;
+ struct xfs_attri_log_item *attrip;
+ struct xfs_attri_log_format *attri_formatp;
+ char *name = NULL;
+ char *value = NULL;
+ int region = 0;
+ int buffer_size;
+
+ attri_formatp = item->ri_buf[region].i_addr;
+
+ /* Validate xfs_attri_log_format */
+ if (!xfs_attri_validate(mp, attri_formatp)) {
+ XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
+ return -EFSCORRUPTED;
+ }
+
+ buffer_size = attri_formatp->alfi_name_len +
+ attri_formatp->alfi_value_len;
+
+ /* memory alloc failure will cause replay to abort */
+ attrip = xfs_attri_init(mp, buffer_size);
+ if (attrip == NULL)
+ return -ENOMEM;
+
+ error = xfs_attri_copy_format(&item->ri_buf[region],
+ &attrip->attri_format);
+ if (error)
+ goto out;
+
+ attrip->attri_name_len = attri_formatp->alfi_name_len;
+ attrip->attri_value_len = attri_formatp->alfi_value_len;
+ region++;
+ name = ((char *)attrip) + sizeof(struct xfs_attri_log_item);
+ memcpy(name, item->ri_buf[region].i_addr, attrip->attri_name_len);
+ attrip->attri_name = name;
+
+ if (!xfs_attr_namecheck(name, attrip->attri_name_len)) {
+ XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
+ error = -EFSCORRUPTED;
+ goto out;
+ }
+
+ if (attrip->attri_value_len > 0) {
+ region++;
+ value = ((char *)attrip) + sizeof(struct xfs_attri_log_item) +
+ attrip->attri_name_len;
+ memcpy(value, item->ri_buf[region].i_addr,
+ attrip->attri_value_len);
+ attrip->attri_value = value;
+ }
+
+ /*
+ * The ATTRI has two references. One for the ATTRD and one for ATTRI to
+ * ensure it makes it into the AIL. Insert the ATTRI into the AIL
+ * directly and drop the ATTRI reference. Note that
+ * xfs_trans_ail_update() drops the AIL lock.
+ */
+ xfs_trans_ail_insert(log->l_ailp, &attrip->attri_item, lsn);
+ xfs_attri_release(attrip);
+ return 0;
+out:
+ xfs_attri_item_free(attrip);
+ return error;
+}
+
+/*
+ * This routine is called when an ATTRD format structure is found in a committed
+ * transaction in the log. Its purpose is to cancel the corresponding ATTRI if
+ * it was still in the log. To do this it searches the AIL for the ATTRI with
+ * an id equal to that in the ATTRD format structure. If we find it we drop
+ * the ATTRD reference, which removes the ATTRI from the AIL and frees it.
+ */
+STATIC int
+xlog_recover_attrd_commit_pass2(
+ struct xlog *log,
+ struct list_head *buffer_list,
+ struct xlog_recover_item *item,
+ xfs_lsn_t lsn)
+{
+ struct xfs_attrd_log_format *attrd_formatp;
+
+ attrd_formatp = item->ri_buf[0].i_addr;
+ if (item->ri_buf[0].i_len != sizeof(struct xfs_attrd_log_format)) {
+ XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL);
+ return -EFSCORRUPTED;
+ }
+
+ xlog_recover_release_intent(log, XFS_LI_ATTRI,
+ attrd_formatp->alfd_alf_id);
+ return 0;
+}
+
+static const struct xfs_item_ops xfs_attri_item_ops = {
+ .iop_size = xfs_attri_item_size,
+ .iop_format = xfs_attri_item_format,
+ .iop_unpin = xfs_attri_item_unpin,
+ .iop_committed = xfs_attri_item_committed,
+ .iop_release = xfs_attri_item_release,
+ .iop_match = xfs_attri_item_match,
+};
+
+const struct xlog_recover_item_ops xlog_attri_item_ops = {
+ .item_type = XFS_LI_ATTRI,
+ .commit_pass2 = xlog_recover_attri_commit_pass2,
+};
+
+static const struct xfs_item_ops xfs_attrd_item_ops = {
+ .flags = XFS_ITEM_RELEASE_WHEN_COMMITTED,
+ .iop_size = xfs_attrd_item_size,
+ .iop_format = xfs_attrd_item_format,
+ .iop_release = xfs_attrd_item_release,
+};
+
+const struct xlog_recover_item_ops xlog_attrd_item_ops = {
+ .item_type = XFS_LI_ATTRD,
+ .commit_pass2 = xlog_recover_attrd_commit_pass2,
+};
diff --git a/fs/xfs/xfs_attr_item.h b/fs/xfs/xfs_attr_item.h
new file mode 100644
index 000000000000..c3b779f82adb
--- /dev/null
+++ b/fs/xfs/xfs_attr_item.h
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (C) 2022 Oracle. All Rights Reserved.
+ * Author: Allison Henderson <allison.henderson@oracle.com>
+ */
+#ifndef __XFS_ATTR_ITEM_H__
+#define __XFS_ATTR_ITEM_H__
+
+/* kernel only ATTRI/ATTRD definitions */
+
+struct xfs_mount;
+struct kmem_zone;
+
+/*
+ * This is the "attr intention" log item. It is used to log the fact that some
+ * extended attribute operations need to be processed. An operation is
+ * currently either a set or remove. Set or remove operations are described by
+ * the xfs_attr_item which may be logged to this intent.
+ *
+ * During a normal attr operation, name and value point to the name and value
+ * fields of the caller's xfs_da_args structure. During a recovery, the name
+ * and value buffers are copied from the log, and stored in a trailing buffer
+ * attached to the xfs_attr_item until they are committed. They are freed when
+ * the xfs_attr_item itself is freed when the work is done.
+ */
+struct xfs_attri_log_item {
+ struct xfs_log_item attri_item;
+ atomic_t attri_refcount;
+ int attri_name_len;
+ int attri_value_len;
+ void *attri_name;
+ void *attri_value;
+ struct xfs_attri_log_format attri_format;
+};
+
+/*
+ * This is the "attr done" log item. It is used to log the fact that some attrs
+ * earlier mentioned in an attri item have been freed.
+ */
+struct xfs_attrd_log_item {
+ struct xfs_log_item attrd_item;
+ struct xfs_attri_log_item *attrd_attrip;
+ struct xfs_attrd_log_format attrd_format;
+};
+
+#endif /* __XFS_ATTR_ITEM_H__ */
diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 2d1e5134cebe..90a14e85e76d 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -15,6 +15,7 @@
#include "xfs_inode.h"
#include "xfs_trans.h"
#include "xfs_bmap.h"
+#include "xfs_da_btree.h"
#include "xfs_attr.h"
#include "xfs_attr_sf.h"
#include "xfs_attr_leaf.h"
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index 004ed2a251e8..618a46a1d5fb 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -17,6 +17,8 @@
#include "xfs_itable.h"
#include "xfs_fsops.h"
#include "xfs_rtalloc.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
#include "xfs_attr.h"
#include "xfs_ioctl.h"
#include "xfs_ioctl32.h"
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index b79b3846e71b..2b6b6f0434ff 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -13,6 +13,8 @@
#include "xfs_inode.h"
#include "xfs_acl.h"
#include "xfs_quota.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
#include "xfs_attr.h"
#include "xfs_trans.h"
#include "xfs_trace.h"
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 89fec9a18c34..8ba8563114b9 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2157,6 +2157,10 @@ xlog_print_tic_res(
REG_TYPE_STR(CUD_FORMAT, "cud_format"),
REG_TYPE_STR(BUI_FORMAT, "bui_format"),
REG_TYPE_STR(BUD_FORMAT, "bud_format"),
+ REG_TYPE_STR(ATTRI_FORMAT, "attri_format"),
+ REG_TYPE_STR(ATTRD_FORMAT, "attrd_format"),
+ REG_TYPE_STR(ATTR_NAME, "attr name"),
+ REG_TYPE_STR(ATTR_VALUE, "attr value"),
};
BUILD_BUG_ON(ARRAY_SIZE(res_type_str) != XLOG_REG_TYPE_MAX + 1);
#undef REG_TYPE_STR
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index dc1b77b92fc1..fd945eb66c32 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -21,6 +21,17 @@ struct xfs_log_vec {
#define XFS_LOG_VEC_ORDERED (-1)
+/*
+ * Calculate the log iovec length for a given user buffer length. Intended to be
+ * used by ->iop_size implementations when sizing buffers of arbitrary
+ * alignments.
+ */
+static inline int
+xlog_calc_iovec_len(int len)
+{
+ return roundup(len, sizeof(int32_t));
+}
+
static inline void *
xlog_prepare_iovec(struct xfs_log_vec *lv, struct xfs_log_iovec **vecp,
uint type)
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 96c997ed2ec8..f1edb315e341 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1800,6 +1800,8 @@ static const struct xlog_recover_item_ops *xlog_recover_item_ops[] = {
&xlog_cud_item_ops,
&xlog_bui_item_ops,
&xlog_bud_item_ops,
+ &xlog_attri_item_ops,
+ &xlog_attrd_item_ops,
};
static const struct xlog_recover_item_ops *
diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
index 25991923c1a8..758702b9495f 100644
--- a/fs/xfs/xfs_ondisk.h
+++ b/fs/xfs/xfs_ondisk.h
@@ -132,6 +132,8 @@ xfs_check_ondisk_structs(void)
XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format, 56);
XFS_CHECK_STRUCT_SIZE(struct xfs_qoff_logformat, 20);
XFS_CHECK_STRUCT_SIZE(struct xfs_trans_header, 16);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_attri_log_format, 40);
+ XFS_CHECK_STRUCT_SIZE(struct xfs_attrd_log_format, 16);
/*
* The v5 superblock format extended several v4 header structures with
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 05/15] xfs: Implement attr logging and replay
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (3 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 04/15] xfs: Set up infrastructure for log attribute replay Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 06/15] xfs: Skip flip flags for delayed attrs Allison Henderson
` (10 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
This patch adds the needed routines to create, log and recover logged
extended attribute intents.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_defer.c | 1 +
fs/xfs/libxfs/xfs_defer.h | 1 +
fs/xfs/libxfs/xfs_format.h | 9 +-
fs/xfs/xfs_attr_item.c | 360 +++++++++++++++++++++++++++++++++++++
4 files changed, 370 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 91adfb01c848..d15c39d21e86 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -186,6 +186,7 @@ static const struct xfs_defer_op_type *defer_op_types[] = {
[XFS_DEFER_OPS_TYPE_RMAP] = &xfs_rmap_update_defer_type,
[XFS_DEFER_OPS_TYPE_FREE] = &xfs_extent_free_defer_type,
[XFS_DEFER_OPS_TYPE_AGFL_FREE] = &xfs_agfl_free_defer_type,
+ [XFS_DEFER_OPS_TYPE_ATTR] = &xfs_attr_defer_type,
};
static void
diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index fcd23e5cf1ee..114a3a4930a3 100644
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -19,6 +19,7 @@ enum xfs_defer_ops_type {
XFS_DEFER_OPS_TYPE_RMAP,
XFS_DEFER_OPS_TYPE_FREE,
XFS_DEFER_OPS_TYPE_AGFL_FREE,
+ XFS_DEFER_OPS_TYPE_ATTR,
XFS_DEFER_OPS_TYPE_MAX,
};
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index d665c04e69dd..302b50bc5830 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -388,7 +388,9 @@ xfs_sb_has_incompat_feature(
return (sbp->sb_features_incompat & feature) != 0;
}
-#define XFS_SB_FEAT_INCOMPAT_LOG_ALL 0
+#define XFS_SB_FEAT_INCOMPAT_LOG_XATTRS (1 << 0) /* Delayed Attributes */
+#define XFS_SB_FEAT_INCOMPAT_LOG_ALL \
+ (XFS_SB_FEAT_INCOMPAT_LOG_XATTRS)
#define XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_LOG_ALL
static inline bool
xfs_sb_has_incompat_log_feature(
@@ -413,6 +415,11 @@ xfs_sb_add_incompat_log_features(
sbp->sb_features_log_incompat |= features;
}
+static inline bool xfs_sb_version_haslogxattrs(struct xfs_sb *sbp)
+{
+ return xfs_sb_is_v5(sbp) && (sbp->sb_features_log_incompat &
+ XFS_SB_FEAT_INCOMPAT_LOG_XATTRS);
+}
static inline bool
xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 00ade15cf1eb..6e4c65d82db5 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -13,6 +13,7 @@
#include "xfs_defer.h"
#include "xfs_log_format.h"
#include "xfs_trans.h"
+#include "xfs_bmap_btree.h"
#include "xfs_trans_priv.h"
#include "xfs_log.h"
#include "xfs_inode.h"
@@ -29,6 +30,8 @@
static const struct xfs_item_ops xfs_attri_item_ops;
static const struct xfs_item_ops xfs_attrd_item_ops;
+static struct xfs_attrd_log_item *xfs_trans_get_attrd(struct xfs_trans *tp,
+ struct xfs_attri_log_item *attrip);
static inline struct xfs_attri_log_item *ATTRI_ITEM(struct xfs_log_item *lip)
{
@@ -257,6 +260,163 @@ xfs_attrd_item_release(
xfs_attrd_item_free(attrdp);
}
+/*
+ * Performs one step of an attribute update intent and marks the attrd item
+ * dirty.. An attr operation may be a set or a remove. Note that the
+ * transaction is marked dirty regardless of whether the operation succeeds or
+ * fails to support the ATTRI/ATTRD lifecycle rules.
+ */
+STATIC int
+xfs_xattri_finish_update(
+ struct xfs_delattr_context *dac,
+ struct xfs_attrd_log_item *attrdp,
+ struct xfs_buf **leaf_bp,
+ uint32_t op_flags)
+{
+ struct xfs_da_args *args = dac->da_args;
+ unsigned int op = op_flags &
+ XFS_ATTR_OP_FLAGS_TYPE_MASK;
+ int error;
+
+ switch (op) {
+ case XFS_ATTR_OP_FLAGS_SET:
+ error = xfs_attr_set_iter(dac, leaf_bp);
+ break;
+ case XFS_ATTR_OP_FLAGS_REMOVE:
+ ASSERT(XFS_IFORK_Q(args->dp));
+ error = xfs_attr_remove_iter(dac);
+ break;
+ default:
+ error = -EFSCORRUPTED;
+ break;
+ }
+
+ /*
+ * Mark the transaction dirty, even on error. This ensures the
+ * transaction is aborted, which:
+ *
+ * 1.) releases the ATTRI and frees the ATTRD
+ * 2.) shuts down the filesystem
+ */
+ args->trans->t_flags |= XFS_TRANS_DIRTY;
+
+ /*
+ * attr intent/done items are null when logged attributes are disabled
+ */
+ if (attrdp)
+ set_bit(XFS_LI_DIRTY, &attrdp->attrd_item.li_flags);
+
+ return error;
+}
+
+/* Log an attr to the intent item. */
+STATIC void
+xfs_attr_log_item(
+ struct xfs_trans *tp,
+ struct xfs_attri_log_item *attrip,
+ struct xfs_attr_item *attr)
+{
+ struct xfs_attri_log_format *attrp;
+
+ tp->t_flags |= XFS_TRANS_DIRTY;
+ set_bit(XFS_LI_DIRTY, &attrip->attri_item.li_flags);
+
+ /*
+ * At this point the xfs_attr_item has been constructed, and we've
+ * created the log intent. Fill in the attri log item and log format
+ * structure with fields from this xfs_attr_item
+ */
+ attrp = &attrip->attri_format;
+ attrp->alfi_ino = attr->xattri_dac.da_args->dp->i_ino;
+ attrp->alfi_op_flags = attr->xattri_op_flags;
+ attrp->alfi_value_len = attr->xattri_dac.da_args->valuelen;
+ attrp->alfi_name_len = attr->xattri_dac.da_args->namelen;
+ attrp->alfi_attr_flags = attr->xattri_dac.da_args->attr_filter;
+
+ attrip->attri_name = (void *)attr->xattri_dac.da_args->name;
+ attrip->attri_value = attr->xattri_dac.da_args->value;
+ attrip->attri_name_len = attr->xattri_dac.da_args->namelen;
+ attrip->attri_value_len = attr->xattri_dac.da_args->valuelen;
+}
+
+/* Get an ATTRI. */
+static struct xfs_log_item *
+xfs_attr_create_intent(
+ struct xfs_trans *tp,
+ struct list_head *items,
+ unsigned int count,
+ bool sort)
+{
+ struct xfs_mount *mp = tp->t_mountp;
+ struct xfs_attri_log_item *attrip;
+ struct xfs_attr_item *attr;
+
+ ASSERT(count == 1);
+
+ if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
+ return NULL;
+
+ attrip = xfs_attri_init(mp, 0);
+ if (attrip == NULL)
+ return NULL;
+
+ xfs_trans_add_item(tp, &attrip->attri_item);
+ list_for_each_entry(attr, items, xattri_list)
+ xfs_attr_log_item(tp, attrip, attr);
+ return &attrip->attri_item;
+}
+
+/* Process an attr. */
+STATIC int
+xfs_attr_finish_item(
+ struct xfs_trans *tp,
+ struct xfs_log_item *done,
+ struct list_head *item,
+ struct xfs_btree_cur **state)
+{
+ struct xfs_attr_item *attr;
+ struct xfs_attrd_log_item *done_item = NULL;
+ int error;
+ struct xfs_delattr_context *dac;
+
+ attr = container_of(item, struct xfs_attr_item, xattri_list);
+ dac = &attr->xattri_dac;
+ if (done)
+ done_item = ATTRD_ITEM(done);
+
+ /*
+ * Always reset trans after EAGAIN cycle
+ * since the transaction is new
+ */
+ dac->da_args->trans = tp;
+
+ error = xfs_xattri_finish_update(dac, done_item, &dac->leaf_bp,
+ attr->xattri_op_flags);
+ if (error != -EAGAIN)
+ kmem_free(attr);
+
+ return error;
+}
+
+/* Abort all pending ATTRs. */
+STATIC void
+xfs_attr_abort_intent(
+ struct xfs_log_item *intent)
+{
+ xfs_attri_release(ATTRI_ITEM(intent));
+}
+
+/* Cancel an attr */
+STATIC void
+xfs_attr_cancel_item(
+ struct list_head *item)
+{
+ struct xfs_attr_item *attr;
+
+ attr = container_of(item, struct xfs_attr_item, xattri_list);
+ kmem_free(attr);
+}
+
STATIC xfs_lsn_t
xfs_attri_item_committed(
struct xfs_log_item *lip,
@@ -314,6 +474,160 @@ xfs_attri_validate(
return xfs_verify_ino(mp, attrp->alfi_ino);
}
+/*
+ * Process an attr intent item that was recovered from the log. We need to
+ * delete the attr that it describes.
+ */
+STATIC int
+xfs_attri_item_recover(
+ struct xfs_log_item *lip,
+ struct list_head *capture_list)
+{
+ struct xfs_attri_log_item *attrip = ATTRI_ITEM(lip);
+ struct xfs_attr_item *attr;
+ struct xfs_mount *mp = lip->li_mountp;
+ struct xfs_inode *ip;
+ struct xfs_da_args *args;
+ struct xfs_trans *tp;
+ struct xfs_trans_res tres;
+ struct xfs_attri_log_format *attrp;
+ int error, ret = 0;
+ int total;
+ int local;
+ struct xfs_attrd_log_item *done_item = NULL;
+
+ /*
+ * First check the validity of the attr described by the ATTRI. If any
+ * are bad, then assume that all are bad and just toss the ATTRI.
+ */
+ attrp = &attrip->attri_format;
+ if (!xfs_attri_validate(mp, attrp) ||
+ !xfs_attr_namecheck(attrip->attri_name, attrip->attri_name_len))
+ return -EFSCORRUPTED;
+
+ error = xlog_recover_iget(mp, attrp->alfi_ino, &ip);
+ if (error)
+ return error;
+
+ attr = kmem_zalloc(sizeof(struct xfs_attr_item) +
+ sizeof(struct xfs_da_args), KM_NOFS);
+ args = (struct xfs_da_args *)(attr + 1);
+
+ attr->xattri_dac.da_args = args;
+ attr->xattri_op_flags = attrp->alfi_op_flags;
+
+ args->dp = ip;
+ args->geo = mp->m_attr_geo;
+ args->whichfork = XFS_ATTR_FORK;
+ args->name = attrip->attri_name;
+ args->namelen = attrp->alfi_name_len;
+ args->hashval = xfs_da_hashname(args->name, args->namelen);
+ args->attr_filter = attrp->alfi_attr_flags;
+
+ if (attrp->alfi_op_flags == XFS_ATTR_OP_FLAGS_SET) {
+ args->value = attrip->attri_value;
+ args->valuelen = attrp->alfi_value_len;
+ args->total = xfs_attr_calc_size(args, &local);
+
+ tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
+ M_RES(mp)->tr_attrsetrt.tr_logres *
+ args->total;
+ tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
+ tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
+ total = args->total;
+ } else {
+ tres = M_RES(mp)->tr_attrrm;
+ total = XFS_ATTRRM_SPACE_RES(mp);
+ }
+ error = xfs_trans_alloc(mp, &tres, total, 0, XFS_TRANS_RESERVE, &tp);
+ if (error)
+ goto out;
+
+ args->trans = tp;
+ done_item = xfs_trans_get_attrd(tp, attrip);
+
+ xfs_ilock(ip, XFS_ILOCK_EXCL);
+ xfs_trans_ijoin(tp, ip, 0);
+
+ ret = xfs_xattri_finish_update(&attr->xattri_dac, done_item,
+ &attr->xattri_dac.leaf_bp,
+ attrp->alfi_op_flags);
+ if (ret == -EAGAIN) {
+ /* There's more work to do, so add it to this transaction */
+ xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_ATTR, &attr->xattri_list);
+ } else
+ error = ret;
+
+ if (error) {
+ xfs_trans_cancel(tp);
+ goto out_unlock;
+ }
+
+ error = xfs_defer_ops_capture_and_commit(tp, capture_list);
+
+out_unlock:
+ if (attr->xattri_dac.leaf_bp)
+ xfs_buf_relse(attr->xattri_dac.leaf_bp);
+
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ xfs_irele(ip);
+out:
+ if (ret != -EAGAIN)
+ kmem_free(attr);
+ return error;
+}
+
+/* Re-log an intent item to push the log tail forward. */
+static struct xfs_log_item *
+xfs_attri_item_relog(
+ struct xfs_log_item *intent,
+ struct xfs_trans *tp)
+{
+ struct xfs_attrd_log_item *attrdp;
+ struct xfs_attri_log_item *old_attrip;
+ struct xfs_attri_log_item *new_attrip;
+ struct xfs_attri_log_format *new_attrp;
+ struct xfs_attri_log_format *old_attrp;
+ int buffer_size;
+
+ old_attrip = ATTRI_ITEM(intent);
+ old_attrp = &old_attrip->attri_format;
+ buffer_size = old_attrp->alfi_value_len + old_attrp->alfi_name_len;
+
+ tp->t_flags |= XFS_TRANS_DIRTY;
+ attrdp = xfs_trans_get_attrd(tp, old_attrip);
+ set_bit(XFS_LI_DIRTY, &attrdp->attrd_item.li_flags);
+
+ new_attrip = xfs_attri_init(tp->t_mountp, buffer_size);
+ new_attrp = &new_attrip->attri_format;
+
+ new_attrp->alfi_ino = old_attrp->alfi_ino;
+ new_attrp->alfi_op_flags = old_attrp->alfi_op_flags;
+ new_attrp->alfi_value_len = old_attrp->alfi_value_len;
+ new_attrp->alfi_name_len = old_attrp->alfi_name_len;
+ new_attrp->alfi_attr_flags = old_attrp->alfi_attr_flags;
+
+ new_attrip->attri_name_len = old_attrip->attri_name_len;
+ new_attrip->attri_name = ((char *)new_attrip) +
+ sizeof(struct xfs_attri_log_item);
+ memcpy(new_attrip->attri_name, old_attrip->attri_name,
+ new_attrip->attri_name_len);
+
+ new_attrip->attri_value_len = old_attrip->attri_value_len;
+ if (new_attrip->attri_value_len > 0) {
+ new_attrip->attri_value = new_attrip->attri_name +
+ new_attrip->attri_name_len;
+
+ memcpy(new_attrip->attri_value, old_attrip->attri_value,
+ new_attrip->attri_value_len);
+ }
+
+ xfs_trans_add_item(tp, &new_attrip->attri_item);
+ set_bit(XFS_LI_DIRTY, &new_attrip->attri_item.li_flags);
+
+ return &new_attrip->attri_item;
+}
+
STATIC int
xlog_recover_attri_commit_pass2(
struct xlog *log,
@@ -387,6 +701,50 @@ xlog_recover_attri_commit_pass2(
return error;
}
+/*
+ * This routine is called to allocate an "attr free done" log item.
+ */
+static struct xfs_attrd_log_item *
+xfs_trans_get_attrd(struct xfs_trans *tp,
+ struct xfs_attri_log_item *attrip)
+{
+ struct xfs_attrd_log_item *attrdp;
+
+ ASSERT(tp != NULL);
+
+ attrdp = kmem_cache_alloc(xfs_attrd_cache, GFP_NOFS | __GFP_NOFAIL);
+
+ xfs_log_item_init(tp->t_mountp, &attrdp->attrd_item, XFS_LI_ATTRD,
+ &xfs_attrd_item_ops);
+ attrdp->attrd_attrip = attrip;
+ attrdp->attrd_format.alfd_alf_id = attrip->attri_format.alfi_id;
+
+ xfs_trans_add_item(tp, &attrdp->attrd_item);
+ return attrdp;
+}
+
+/* Get an ATTRD so we can process all the attrs. */
+static struct xfs_log_item *
+xfs_attr_create_done(
+ struct xfs_trans *tp,
+ struct xfs_log_item *intent,
+ unsigned int count)
+{
+ if (!intent)
+ return NULL;
+
+ return &xfs_trans_get_attrd(tp, ATTRI_ITEM(intent))->attrd_item;
+}
+
+const struct xfs_defer_op_type xfs_attr_defer_type = {
+ .max_items = 1,
+ .create_intent = xfs_attr_create_intent,
+ .abort_intent = xfs_attr_abort_intent,
+ .create_done = xfs_attr_create_done,
+ .finish_item = xfs_attr_finish_item,
+ .cancel_item = xfs_attr_cancel_item,
+};
+
/*
* This routine is called when an ATTRD format structure is found in a committed
* transaction in the log. Its purpose is to cancel the corresponding ATTRI if
@@ -420,7 +778,9 @@ static const struct xfs_item_ops xfs_attri_item_ops = {
.iop_unpin = xfs_attri_item_unpin,
.iop_committed = xfs_attri_item_committed,
.iop_release = xfs_attri_item_release,
+ .iop_recover = xfs_attri_item_recover,
.iop_match = xfs_attri_item_match,
+ .iop_relog = xfs_attri_item_relog,
};
const struct xlog_recover_item_ops xlog_attri_item_ops = {
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 06/15] xfs: Skip flip flags for delayed attrs
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (4 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 05/15] xfs: Implement attr logging and replay Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 07/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
` (9 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
This is a clean up patch that skips the flip flag logic for delayed attr
renames. Since the log replay keeps the inode locked, we do not need to
worry about race windows with attr lookups. So we can skip over
flipping the flag and the extra transaction roll for it
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 54 +++++++++++++++++++++--------------
fs/xfs/libxfs/xfs_attr_leaf.c | 3 +-
2 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 21594f814685..da257ad22f1f 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -358,6 +358,7 @@ xfs_attr_set_iter(
struct xfs_inode *dp = args->dp;
struct xfs_buf *bp = NULL;
int forkoff, error = 0;
+ struct xfs_mount *mp = args->dp->i_mount;
/* State machine switch */
switch (dac->dela_state) {
@@ -480,16 +481,21 @@ xfs_attr_set_iter(
* In a separate transaction, set the incomplete flag on the
* "old" attr and clear the incomplete flag on the "new" attr.
*/
- error = xfs_attr3_leaf_flipflags(args);
- if (error)
- return error;
- /*
- * Commit the flag value change and start the next trans in
- * series.
- */
- dac->dela_state = XFS_DAS_FLIP_LFLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
- return -EAGAIN;
+ if (!xfs_has_larp(mp)) {
+ error = xfs_attr3_leaf_flipflags(args);
+ if (error)
+ return error;
+ /*
+ * Commit the flag value change and start the next trans
+ * in series.
+ */
+ dac->dela_state = XFS_DAS_FLIP_LFLAG;
+ trace_xfs_attr_set_iter_return(dac->dela_state,
+ args->dp);
+ return -EAGAIN;
+ }
+
+ fallthrough;
case XFS_DAS_FLIP_LFLAG:
/*
* Dismantle the "old" attribute/value pair by removing a
@@ -592,17 +598,21 @@ xfs_attr_set_iter(
* In a separate transaction, set the incomplete flag on the
* "old" attr and clear the incomplete flag on the "new" attr.
*/
- error = xfs_attr3_leaf_flipflags(args);
- if (error)
- goto out;
- /*
- * Commit the flag value change and start the next trans in
- * series
- */
- dac->dela_state = XFS_DAS_FLIP_NFLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
- return -EAGAIN;
+ if (!xfs_has_larp(mp)) {
+ error = xfs_attr3_leaf_flipflags(args);
+ if (error)
+ goto out;
+ /*
+ * Commit the flag value change and start the next trans
+ * in series
+ */
+ dac->dela_state = XFS_DAS_FLIP_NFLAG;
+ trace_xfs_attr_set_iter_return(dac->dela_state,
+ args->dp);
+ return -EAGAIN;
+ }
+ fallthrough;
case XFS_DAS_FLIP_NFLAG:
/*
* Dismantle the "old" attribute/value pair by removing a
@@ -1270,6 +1280,7 @@ xfs_attr_node_addname_clear_incomplete(
{
struct xfs_da_args *args = dac->da_args;
struct xfs_da_state *state = NULL;
+ struct xfs_mount *mp = args->dp->i_mount;
int retval = 0;
int error = 0;
@@ -1277,7 +1288,8 @@ xfs_attr_node_addname_clear_incomplete(
* Re-find the "old" attribute entry after any split ops. The INCOMPLETE
* flag means that we will find the "old" attr, not the "new" one.
*/
- args->attr_filter |= XFS_ATTR_INCOMPLETE;
+ if (!xfs_has_larp(mp))
+ args->attr_filter |= XFS_ATTR_INCOMPLETE;
state = xfs_da_state_alloc(args);
state->inleaf = 0;
error = xfs_da3_node_lookup_int(state, &retval);
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 014daa8c542d..74b76b09509f 100644
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -1487,7 +1487,8 @@ xfs_attr3_leaf_add_work(
if (tmp)
entry->flags |= XFS_ATTR_LOCAL;
if (args->op_flags & XFS_DA_OP_RENAME) {
- entry->flags |= XFS_ATTR_INCOMPLETE;
+ if (!xfs_has_larp(mp))
+ entry->flags |= XFS_ATTR_INCOMPLETE;
if ((args->blkno2 == args->blkno) &&
(args->index2 <= args->index)) {
args->index2++;
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 07/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (5 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 06/15] xfs: Skip flip flags for delayed attrs Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 08/15] xfs: Remove unused xfs_attr_*_args Allison Henderson
` (8 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
These routines set up and queue a new deferred attribute operations.
These functions are meant to be called by any routine needing to
initiate a deferred attribute operation as opposed to the existing
inline operations. New helper function xfs_attr_item_init also added.
Finally enable delayed attributes in xfs_attr_set and xfs_attr_remove.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 71 ++++++++++++++++++++++++++++++++++++++--
fs/xfs/libxfs/xfs_attr.h | 2 ++
fs/xfs/xfs_log.c | 41 +++++++++++++++++++++++
fs/xfs/xfs_log.h | 1 +
4 files changed, 112 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index da257ad22f1f..848c19b34809 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -25,6 +25,8 @@
#include "xfs_trans_space.h"
#include "xfs_trace.h"
#include "xfs_attr_item.h"
+#include "xfs_attr.h"
+#include "xfs_log.h"
struct kmem_cache *xfs_attri_cache;
struct kmem_cache *xfs_attrd_cache;
@@ -729,6 +731,7 @@ xfs_attr_set(
int error, local;
int rmt_blks = 0;
unsigned int total;
+ int delayed = xfs_has_larp(mp);
if (xfs_is_shutdown(dp->i_mount))
return -EIO;
@@ -785,13 +788,19 @@ xfs_attr_set(
rmt_blks = xfs_attr3_rmt_blocks(mp, XFS_XATTR_SIZE_MAX);
}
+ if (delayed) {
+ error = xfs_attr_use_log_assist(mp);
+ if (error)
+ return error;
+ }
+
/*
* Root fork attributes can use reserved data blocks for this
* operation if necessary
*/
error = xfs_trans_alloc_inode(dp, &tres, total, 0, rsvd, &args->trans);
if (error)
- return error;
+ goto drop_incompat;
if (args->value || xfs_inode_hasattr(dp)) {
error = xfs_iext_count_may_overflow(dp, XFS_ATTR_FORK,
@@ -809,9 +818,10 @@ xfs_attr_set(
if (error != -ENOATTR && error != -EEXIST)
goto out_trans_cancel;
- error = xfs_attr_set_args(args);
+ error = xfs_attr_set_deferred(args);
if (error)
goto out_trans_cancel;
+
/* shortform attribute has already been committed */
if (!args->trans)
goto out_unlock;
@@ -819,7 +829,7 @@ xfs_attr_set(
if (error != -EEXIST)
goto out_trans_cancel;
- error = xfs_attr_remove_args(args);
+ error = xfs_attr_remove_deferred(args);
if (error)
goto out_trans_cancel;
}
@@ -841,6 +851,9 @@ xfs_attr_set(
error = xfs_trans_commit(args->trans);
out_unlock:
xfs_iunlock(dp, XFS_ILOCK_EXCL);
+drop_incompat:
+ if (delayed)
+ xlog_drop_incompat_feat(mp->m_log);
return error;
out_trans_cancel:
@@ -883,6 +896,58 @@ xfs_attrd_destroy_cache(void)
xfs_attrd_cache = NULL;
}
+STATIC int
+xfs_attr_item_init(
+ struct xfs_da_args *args,
+ unsigned int op_flags, /* op flag (set or remove) */
+ struct xfs_attr_item **attr) /* new xfs_attr_item */
+{
+
+ struct xfs_attr_item *new;
+
+ new = kmem_zalloc(sizeof(struct xfs_attr_item), KM_NOFS);
+ new->xattri_op_flags = op_flags;
+ new->xattri_dac.da_args = args;
+
+ *attr = new;
+ return 0;
+}
+
+/* Sets an attribute for an inode as a deferred operation */
+int
+xfs_attr_set_deferred(
+ struct xfs_da_args *args)
+{
+ struct xfs_attr_item *new;
+ int error = 0;
+
+ error = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_SET, &new);
+ if (error)
+ return error;
+
+ xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
+
+ return 0;
+}
+
+/* Removes an attribute for an inode as a deferred operation */
+int
+xfs_attr_remove_deferred(
+ struct xfs_da_args *args)
+{
+
+ struct xfs_attr_item *new;
+ int error;
+
+ error = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_REMOVE, &new);
+ if (error)
+ return error;
+
+ xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
+
+ return 0;
+}
+
/*========================================================================
* External routines when attribute list is inside the inode
*========================================================================*/
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 80b6f28b0d1a..b52156ad8e6e 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -525,6 +525,8 @@ bool xfs_attr_namecheck(const void *name, size_t length);
void xfs_delattr_context_init(struct xfs_delattr_context *dac,
struct xfs_da_args *args);
int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
+int xfs_attr_set_deferred(struct xfs_da_args *args);
+int xfs_attr_remove_deferred(struct xfs_da_args *args);
extern struct kmem_cache *xfs_attri_cache;
extern struct kmem_cache *xfs_attrd_cache;
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 8ba8563114b9..fdfafc7df1dc 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3993,3 +3993,44 @@ xlog_drop_incompat_feat(
{
up_read(&log->l_incompat_users);
}
+
+/*
+ * Get permission to use log-assisted atomic exchange of file extents.
+ *
+ * Callers must not be running any transactions or hold any inode locks, and
+ * they must release the permission by calling xlog_drop_incompat_feat
+ * when they're done.
+ */
+int
+xfs_attr_use_log_assist(
+ struct xfs_mount *mp)
+{
+ int error = 0;
+
+ /*
+ * Protect ourselves from an idle log clearing the logged xattrs log
+ * incompat feature bit.
+ */
+ xlog_use_incompat_feat(mp->m_log);
+
+ /*
+ * If log-assisted xattrs are already enabled, the caller can use the
+ * log assisted swap functions with the log-incompat reference we got.
+ */
+ if (xfs_sb_version_haslogxattrs(&mp->m_sb))
+ return 0;
+
+ /* Enable log-assisted xattrs. */
+ error = xfs_add_incompat_log_feature(mp,
+ XFS_SB_FEAT_INCOMPAT_LOG_XATTRS);
+ if (error)
+ goto drop_incompat;
+
+ xfs_warn_once(mp,
+"EXPERIMENTAL logged extended attributes feature added. Use at your own risk!");
+
+ return 0;
+drop_incompat:
+ xlog_drop_incompat_feat(mp->m_log);
+ return error;
+}
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index fd945eb66c32..053dad8d11a9 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -155,5 +155,6 @@ bool xlog_force_shutdown(struct xlog *log, int shutdown_flags);
void xlog_use_incompat_feat(struct xlog *log);
void xlog_drop_incompat_feat(struct xlog *log);
+int xfs_attr_use_log_assist(struct xfs_mount *mp);
#endif /* __XFS_LOG_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 08/15] xfs: Remove unused xfs_attr_*_args
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (6 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 07/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 09/15] xfs: Add log attribute error tag Allison Henderson
` (7 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
Remove xfs_attr_set_args, xfs_attr_remove_args, and xfs_attr_trans_roll.
These high level loops are now driven by the delayed operations code,
and can be removed.
Additionally collapse in the leaf_bp parameter of xfs_attr_set_iter
since we only have one caller that passes dac->leaf_bp
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 106 +++-----------------------------
fs/xfs/libxfs/xfs_attr.h | 8 +--
fs/xfs/libxfs/xfs_attr_remote.c | 1 -
fs/xfs/xfs_attr_item.c | 9 +--
4 files changed, 14 insertions(+), 110 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 848c19b34809..3d7531817e74 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -247,64 +247,9 @@ xfs_attr_is_shortform(
ip->i_afp->if_nextents == 0);
}
-/*
- * Checks to see if a delayed attribute transaction should be rolled. If so,
- * transaction is finished or rolled as needed.
- */
-STATIC int
-xfs_attr_trans_roll(
- struct xfs_delattr_context *dac)
-{
- struct xfs_da_args *args = dac->da_args;
- int error;
-
- if (dac->flags & XFS_DAC_DEFER_FINISH) {
- /*
- * The caller wants us to finish all the deferred ops so that we
- * avoid pinning the log tail with a large number of deferred
- * ops.
- */
- dac->flags &= ~XFS_DAC_DEFER_FINISH;
- error = xfs_defer_finish(&args->trans);
- } else
- error = xfs_trans_roll_inode(&args->trans, args->dp);
-
- return error;
-}
-
-/*
- * Set the attribute specified in @args.
- */
-int
-xfs_attr_set_args(
- struct xfs_da_args *args)
-{
- struct xfs_buf *leaf_bp = NULL;
- int error = 0;
- struct xfs_delattr_context dac = {
- .da_args = args,
- };
-
- do {
- error = xfs_attr_set_iter(&dac, &leaf_bp);
- if (error != -EAGAIN)
- break;
-
- error = xfs_attr_trans_roll(&dac);
- if (error) {
- if (leaf_bp)
- xfs_trans_brelse(args->trans, leaf_bp);
- return error;
- }
- } while (true);
-
- return error;
-}
-
STATIC int
xfs_attr_sf_addname(
- struct xfs_delattr_context *dac,
- struct xfs_buf **leaf_bp)
+ struct xfs_delattr_context *dac)
{
struct xfs_da_args *args = dac->da_args;
struct xfs_inode *dp = args->dp;
@@ -323,7 +268,7 @@ xfs_attr_sf_addname(
* It won't fit in the shortform, transform to a leaf block. GROT:
* another possible req'mt for a double-split btree op.
*/
- error = xfs_attr_shortform_to_leaf(args, leaf_bp);
+ error = xfs_attr_shortform_to_leaf(args, &dac->leaf_bp);
if (error)
return error;
@@ -332,7 +277,7 @@ xfs_attr_sf_addname(
* push cannot grab the half-baked leaf buffer and run into problems
* with the write verifier.
*/
- xfs_trans_bhold(args->trans, *leaf_bp);
+ xfs_trans_bhold(args->trans, dac->leaf_bp);
/*
* We're still in XFS_DAS_UNINIT state here. We've converted
@@ -340,7 +285,6 @@ xfs_attr_sf_addname(
* add.
*/
trace_xfs_attr_sf_addname_return(XFS_DAS_UNINIT, args->dp);
- dac->flags |= XFS_DAC_DEFER_FINISH;
return -EAGAIN;
}
@@ -353,8 +297,7 @@ xfs_attr_sf_addname(
*/
int
xfs_attr_set_iter(
- struct xfs_delattr_context *dac,
- struct xfs_buf **leaf_bp)
+ struct xfs_delattr_context *dac)
{
struct xfs_da_args *args = dac->da_args;
struct xfs_inode *dp = args->dp;
@@ -373,14 +316,14 @@ xfs_attr_set_iter(
* release the hold once we return with a clean transaction.
*/
if (xfs_attr_is_shortform(dp))
- return xfs_attr_sf_addname(dac, leaf_bp);
- if (*leaf_bp != NULL) {
- xfs_trans_bhold_release(args->trans, *leaf_bp);
- *leaf_bp = NULL;
+ return xfs_attr_sf_addname(dac);
+ if (dac->leaf_bp != NULL) {
+ xfs_trans_bhold_release(args->trans, dac->leaf_bp);
+ dac->leaf_bp = NULL;
}
if (xfs_attr_is_leaf(dp)) {
- error = xfs_attr_leaf_try_add(args, *leaf_bp);
+ error = xfs_attr_leaf_try_add(args, dac->leaf_bp);
if (error == -ENOSPC) {
error = xfs_attr3_leaf_to_node(args);
if (error)
@@ -399,7 +342,6 @@ xfs_attr_set_iter(
* be a node, so we'll fall down into the node
* handling code below
*/
- dac->flags |= XFS_DAC_DEFER_FINISH;
trace_xfs_attr_set_iter_return(
dac->dela_state, args->dp);
return -EAGAIN;
@@ -690,32 +632,6 @@ xfs_attr_lookup(
return xfs_attr_node_hasname(args, NULL);
}
-/*
- * Remove the attribute specified in @args.
- */
-int
-xfs_attr_remove_args(
- struct xfs_da_args *args)
-{
- int error;
- struct xfs_delattr_context dac = {
- .da_args = args,
- };
-
- do {
- error = xfs_attr_remove_iter(&dac);
- if (error != -EAGAIN)
- break;
-
- error = xfs_attr_trans_roll(&dac);
- if (error)
- return error;
-
- } while (true);
-
- return error;
-}
-
/*
* Note: If args->value is NULL the attribute will be removed, just like the
* Linux ->setattr API.
@@ -1309,7 +1225,6 @@ xfs_attr_node_addname(
* this. dela_state is still unset by this function at
* this point.
*/
- dac->flags |= XFS_DAC_DEFER_FINISH;
trace_xfs_attr_node_addname_return(
dac->dela_state, args->dp);
return -EAGAIN;
@@ -1324,7 +1239,6 @@ xfs_attr_node_addname(
error = xfs_da3_split(state);
if (error)
goto out;
- dac->flags |= XFS_DAC_DEFER_FINISH;
} else {
/*
* Addition succeeded, update Btree hashvals.
@@ -1578,7 +1492,6 @@ xfs_attr_remove_iter(
if (error)
goto out;
dac->dela_state = XFS_DAS_RM_NAME;
- dac->flags |= XFS_DAC_DEFER_FINISH;
trace_xfs_attr_remove_iter_return(dac->dela_state, args->dp);
return -EAGAIN;
}
@@ -1606,7 +1519,6 @@ xfs_attr_remove_iter(
if (error)
goto out;
- dac->flags |= XFS_DAC_DEFER_FINISH;
dac->dela_state = XFS_DAS_RM_SHRINK;
trace_xfs_attr_remove_iter_return(
dac->dela_state, args->dp);
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index b52156ad8e6e..5331551d5939 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -457,8 +457,7 @@ enum xfs_delattr_state {
/*
* Defines for xfs_delattr_context.flags
*/
-#define XFS_DAC_DEFER_FINISH 0x01 /* finish the transaction */
-#define XFS_DAC_LEAF_ADDNAME_INIT 0x02 /* xfs_attr_leaf_addname init*/
+#define XFS_DAC_LEAF_ADDNAME_INIT 0x01 /* xfs_attr_leaf_addname init*/
/*
* Context used for keeping track of delayed attribute operations
@@ -516,10 +515,7 @@ bool xfs_attr_is_leaf(struct xfs_inode *ip);
int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args);
-int xfs_attr_set_args(struct xfs_da_args *args);
-int xfs_attr_set_iter(struct xfs_delattr_context *dac,
- struct xfs_buf **leaf_bp);
-int xfs_attr_remove_args(struct xfs_da_args *args);
+int xfs_attr_set_iter(struct xfs_delattr_context *dac);
int xfs_attr_remove_iter(struct xfs_delattr_context *dac);
bool xfs_attr_namecheck(const void *name, size_t length);
void xfs_delattr_context_init(struct xfs_delattr_context *dac,
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index 83b95be9ded8..c806319134fb 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -695,7 +695,6 @@ xfs_attr_rmtval_remove(
* the parent
*/
if (!done) {
- dac->flags |= XFS_DAC_DEFER_FINISH;
trace_xfs_attr_rmtval_remove_return(dac->dela_state, args->dp);
return -EAGAIN;
}
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 6e4c65d82db5..468358f44a8f 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -270,7 +270,6 @@ STATIC int
xfs_xattri_finish_update(
struct xfs_delattr_context *dac,
struct xfs_attrd_log_item *attrdp,
- struct xfs_buf **leaf_bp,
uint32_t op_flags)
{
struct xfs_da_args *args = dac->da_args;
@@ -280,7 +279,7 @@ xfs_xattri_finish_update(
switch (op) {
case XFS_ATTR_OP_FLAGS_SET:
- error = xfs_attr_set_iter(dac, leaf_bp);
+ error = xfs_attr_set_iter(dac);
break;
case XFS_ATTR_OP_FLAGS_REMOVE:
ASSERT(XFS_IFORK_Q(args->dp));
@@ -390,8 +389,7 @@ xfs_attr_finish_item(
*/
dac->da_args->trans = tp;
- error = xfs_xattri_finish_update(dac, done_item, &dac->leaf_bp,
- attr->xattri_op_flags);
+ error = xfs_xattri_finish_update(dac, done_item, attr->xattri_op_flags);
if (error != -EAGAIN)
kmem_free(attr);
@@ -550,8 +548,7 @@ xfs_attri_item_recover(
xfs_trans_ijoin(tp, ip, 0);
ret = xfs_xattri_finish_update(&attr->xattri_dac, done_item,
- &attr->xattri_dac.leaf_bp,
- attrp->alfi_op_flags);
+ attrp->alfi_op_flags);
if (ret == -EAGAIN) {
/* There's more work to do, so add it to this transaction */
xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_ATTR, &attr->xattri_list);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 09/15] xfs: Add log attribute error tag
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (7 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 08/15] xfs: Remove unused xfs_attr_*_args Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 10/15] xfs: Add larp debug option Allison Henderson
` (6 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
This patch adds an error tag that we can use to test log attribute
recovery and replay
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_errortag.h | 4 +++-
fs/xfs/xfs_attr_item.c | 7 +++++++
fs/xfs/xfs_error.c | 3 +++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
index a23a52e643ad..c15d2340220c 100644
--- a/fs/xfs/libxfs/xfs_errortag.h
+++ b/fs/xfs/libxfs/xfs_errortag.h
@@ -59,7 +59,8 @@
#define XFS_ERRTAG_REDUCE_MAX_IEXTENTS 36
#define XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT 37
#define XFS_ERRTAG_AG_RESV_FAIL 38
-#define XFS_ERRTAG_MAX 39
+#define XFS_ERRTAG_LARP 39
+#define XFS_ERRTAG_MAX 40
/*
* Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -103,5 +104,6 @@
#define XFS_RANDOM_REDUCE_MAX_IEXTENTS 1
#define XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT 1
#define XFS_RANDOM_AG_RESV_FAIL 1
+#define XFS_RANDOM_LARP 1
#endif /* __XFS_ERRORTAG_H_ */
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 468358f44a8f..71567ec42dfc 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -24,6 +24,7 @@
#include "xfs_trace.h"
#include "xfs_inode.h"
#include "xfs_trans_space.h"
+#include "xfs_errortag.h"
#include "xfs_error.h"
#include "xfs_log_priv.h"
#include "xfs_log_recover.h"
@@ -277,6 +278,11 @@ xfs_xattri_finish_update(
XFS_ATTR_OP_FLAGS_TYPE_MASK;
int error;
+ if (XFS_TEST_ERROR(false, args->dp->i_mount, XFS_ERRTAG_LARP)) {
+ error = -EIO;
+ goto out;
+ }
+
switch (op) {
case XFS_ATTR_OP_FLAGS_SET:
error = xfs_attr_set_iter(dac);
@@ -290,6 +296,7 @@ xfs_xattri_finish_update(
break;
}
+out:
/*
* Mark the transaction dirty, even on error. This ensures the
* transaction is aborted, which:
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 749fd18c4f32..666f4837b1e1 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -57,6 +57,7 @@ static unsigned int xfs_errortag_random_default[] = {
XFS_RANDOM_REDUCE_MAX_IEXTENTS,
XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT,
XFS_RANDOM_AG_RESV_FAIL,
+ XFS_RANDOM_LARP,
};
struct xfs_errortag_attr {
@@ -170,6 +171,7 @@ XFS_ERRORTAG_ATTR_RW(buf_ioerror, XFS_ERRTAG_BUF_IOERROR);
XFS_ERRORTAG_ATTR_RW(reduce_max_iextents, XFS_ERRTAG_REDUCE_MAX_IEXTENTS);
XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT);
XFS_ERRORTAG_ATTR_RW(ag_resv_fail, XFS_ERRTAG_AG_RESV_FAIL);
+XFS_ERRORTAG_ATTR_RW(larp, XFS_ERRTAG_LARP);
static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(noerror),
@@ -211,6 +213,7 @@ static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(reduce_max_iextents),
XFS_ERRORTAG_ATTR_LIST(bmap_alloc_minlen_extent),
XFS_ERRORTAG_ATTR_LIST(ag_resv_fail),
+ XFS_ERRORTAG_ATTR_LIST(larp),
NULL,
};
ATTRIBUTE_GROUPS(xfs_errortag);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 10/15] xfs: Add larp debug option
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (8 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 09/15] xfs: Add log attribute error tag Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 11/15] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
` (5 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
This patch adds a debug option to enable log attribute replay. Eventually
this can be removed when delayed attrs becomes permanent.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_attr.h | 4 ++++
fs/xfs/xfs_globals.c | 1 +
fs/xfs/xfs_sysctl.h | 1 +
fs/xfs/xfs_sysfs.c | 24 ++++++++++++++++++++++++
4 files changed, 30 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 5331551d5939..78884e826ca4 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -30,7 +30,11 @@ struct xfs_attr_list_context;
static inline bool xfs_has_larp(struct xfs_mount *mp)
{
+#ifdef DEBUG
+ return xfs_globals.larp;
+#else
return false;
+#endif
}
/*
diff --git a/fs/xfs/xfs_globals.c b/fs/xfs/xfs_globals.c
index f62fa652c2fd..4d0a98f920ca 100644
--- a/fs/xfs/xfs_globals.c
+++ b/fs/xfs/xfs_globals.c
@@ -41,5 +41,6 @@ struct xfs_globals xfs_globals = {
#endif
#ifdef DEBUG
.pwork_threads = -1, /* automatic thread detection */
+ .larp = false, /* log attribute replay */
#endif
};
diff --git a/fs/xfs/xfs_sysctl.h b/fs/xfs/xfs_sysctl.h
index 7692e76ead33..f78ad6b10ea5 100644
--- a/fs/xfs/xfs_sysctl.h
+++ b/fs/xfs/xfs_sysctl.h
@@ -83,6 +83,7 @@ extern xfs_param_t xfs_params;
struct xfs_globals {
#ifdef DEBUG
int pwork_threads; /* parallel workqueue threads */
+ bool larp; /* log attribute replay */
#endif
int log_recovery_delay; /* log recovery delay (secs) */
int mount_delay; /* mount setup delay (secs) */
diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
index 574b80c29fe1..f7faf6e70d7f 100644
--- a/fs/xfs/xfs_sysfs.c
+++ b/fs/xfs/xfs_sysfs.c
@@ -228,6 +228,29 @@ pwork_threads_show(
return sysfs_emit(buf, "%d\n", xfs_globals.pwork_threads);
}
XFS_SYSFS_ATTR_RW(pwork_threads);
+
+static ssize_t
+larp_store(
+ struct kobject *kobject,
+ const char *buf,
+ size_t count)
+{
+ ssize_t ret;
+
+ ret = kstrtobool(buf, &xfs_globals.larp);
+ if (ret < 0)
+ return ret;
+ return count;
+}
+
+STATIC ssize_t
+larp_show(
+ struct kobject *kobject,
+ char *buf)
+{
+ return snprintf(buf, PAGE_SIZE, "%d\n", xfs_globals.larp);
+}
+XFS_SYSFS_ATTR_RW(larp);
#endif /* DEBUG */
static struct attribute *xfs_dbg_attrs[] = {
@@ -237,6 +260,7 @@ static struct attribute *xfs_dbg_attrs[] = {
ATTR_LIST(always_cow),
#ifdef DEBUG
ATTR_LIST(pwork_threads),
+ ATTR_LIST(larp),
#endif
NULL,
};
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 11/15] xfs: Merge xfs_delattr_context into xfs_attr_item
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (9 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 10/15] xfs: Add larp debug option Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 12/15] xfs: Add helper function xfs_attr_leaf_addname Allison Henderson
` (4 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
This is a clean up patch that merges xfs_delattr_context into
xfs_attr_item. Now that the refactoring is complete and the delayed
operation infrastructure is in place, we can combine these to eliminate
the extra struct
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 162 +++++++++++++++++---------------
fs/xfs/libxfs/xfs_attr.h | 40 ++++----
fs/xfs/libxfs/xfs_attr_remote.c | 36 +++----
fs/xfs/libxfs/xfs_attr_remote.h | 6 +-
fs/xfs/xfs_attr_item.c | 42 ++++-----
5 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 3d7531817e74..1b1aa3079469 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -59,10 +59,9 @@ STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp);
*/
STATIC int xfs_attr_node_get(xfs_da_args_t *args);
STATIC void xfs_attr_restore_rmt_blk(struct xfs_da_args *args);
-STATIC int xfs_attr_node_addname(struct xfs_delattr_context *dac);
-STATIC int xfs_attr_node_addname_find_attr(struct xfs_delattr_context *dac);
-STATIC int xfs_attr_node_addname_clear_incomplete(
- struct xfs_delattr_context *dac);
+STATIC int xfs_attr_node_addname(struct xfs_attr_item *attr);
+STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_item *attr);
+STATIC int xfs_attr_node_addname_clear_incomplete(struct xfs_attr_item *attr);
STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,
struct xfs_da_state **state);
STATIC int xfs_attr_fillstate(xfs_da_state_t *state);
@@ -249,9 +248,9 @@ xfs_attr_is_shortform(
STATIC int
xfs_attr_sf_addname(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
struct xfs_inode *dp = args->dp;
int error = 0;
@@ -268,7 +267,7 @@ xfs_attr_sf_addname(
* It won't fit in the shortform, transform to a leaf block. GROT:
* another possible req'mt for a double-split btree op.
*/
- error = xfs_attr_shortform_to_leaf(args, &dac->leaf_bp);
+ error = xfs_attr_shortform_to_leaf(args, &attr->xattri_leaf_bp);
if (error)
return error;
@@ -277,7 +276,7 @@ xfs_attr_sf_addname(
* push cannot grab the half-baked leaf buffer and run into problems
* with the write verifier.
*/
- xfs_trans_bhold(args->trans, dac->leaf_bp);
+ xfs_trans_bhold(args->trans, attr->xattri_leaf_bp);
/*
* We're still in XFS_DAS_UNINIT state here. We've converted
@@ -297,16 +296,16 @@ xfs_attr_sf_addname(
*/
int
xfs_attr_set_iter(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
struct xfs_inode *dp = args->dp;
struct xfs_buf *bp = NULL;
int forkoff, error = 0;
struct xfs_mount *mp = args->dp->i_mount;
/* State machine switch */
- switch (dac->dela_state) {
+ switch (attr->xattri_dela_state) {
case XFS_DAS_UNINIT:
/*
* If the fork is shortform, attempt to add the attr. If there
@@ -316,14 +315,16 @@ xfs_attr_set_iter(
* release the hold once we return with a clean transaction.
*/
if (xfs_attr_is_shortform(dp))
- return xfs_attr_sf_addname(dac);
- if (dac->leaf_bp != NULL) {
- xfs_trans_bhold_release(args->trans, dac->leaf_bp);
- dac->leaf_bp = NULL;
+ return xfs_attr_sf_addname(attr);
+ if (attr->xattri_leaf_bp != NULL) {
+ xfs_trans_bhold_release(args->trans,
+ attr->xattri_leaf_bp);
+ attr->xattri_leaf_bp = NULL;
}
if (xfs_attr_is_leaf(dp)) {
- error = xfs_attr_leaf_try_add(args, dac->leaf_bp);
+ error = xfs_attr_leaf_try_add(args,
+ attr->xattri_leaf_bp);
if (error == -ENOSPC) {
error = xfs_attr3_leaf_to_node(args);
if (error)
@@ -343,19 +344,19 @@ xfs_attr_set_iter(
* handling code below
*/
trace_xfs_attr_set_iter_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
return -EAGAIN;
} else if (error) {
return error;
}
- dac->dela_state = XFS_DAS_FOUND_LBLK;
+ attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
} else {
- error = xfs_attr_node_addname_find_attr(dac);
+ error = xfs_attr_node_addname_find_attr(attr);
if (error)
return error;
- error = xfs_attr_node_addname(dac);
+ error = xfs_attr_node_addname(attr);
if (error)
return error;
@@ -367,9 +368,10 @@ xfs_attr_set_iter(
!(args->op_flags & XFS_DA_OP_RENAME))
return 0;
- dac->dela_state = XFS_DAS_FOUND_NBLK;
+ attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
}
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
+ trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
+ args->dp);
return -EAGAIN;
case XFS_DAS_FOUND_LBLK:
/*
@@ -380,10 +382,10 @@ xfs_attr_set_iter(
*/
/* Open coded xfs_attr_rmtval_set without trans handling */
- if ((dac->flags & XFS_DAC_LEAF_ADDNAME_INIT) == 0) {
- dac->flags |= XFS_DAC_LEAF_ADDNAME_INIT;
+ if ((attr->xattri_flags & XFS_DAC_LEAF_ADDNAME_INIT) == 0) {
+ attr->xattri_flags |= XFS_DAC_LEAF_ADDNAME_INIT;
if (args->rmtblkno > 0) {
- error = xfs_attr_rmtval_find_space(dac);
+ error = xfs_attr_rmtval_find_space(attr);
if (error)
return error;
}
@@ -393,11 +395,11 @@ xfs_attr_set_iter(
* Repeat allocating remote blocks for the attr value until
* blkcnt drops to zero.
*/
- if (dac->blkcnt > 0) {
- error = xfs_attr_rmtval_set_blk(dac);
+ if (attr->xattri_blkcnt > 0) {
+ error = xfs_attr_rmtval_set_blk(attr);
if (error)
return error;
- trace_xfs_attr_set_iter_return(dac->dela_state,
+ trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
args->dp);
return -EAGAIN;
}
@@ -433,8 +435,8 @@ xfs_attr_set_iter(
* Commit the flag value change and start the next trans
* in series.
*/
- dac->dela_state = XFS_DAS_FLIP_LFLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state,
+ attr->xattri_dela_state = XFS_DAS_FLIP_LFLAG;
+ trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
args->dp);
return -EAGAIN;
}
@@ -453,17 +455,18 @@ xfs_attr_set_iter(
fallthrough;
case XFS_DAS_RM_LBLK:
/* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */
- dac->dela_state = XFS_DAS_RM_LBLK;
+ attr->xattri_dela_state = XFS_DAS_RM_LBLK;
if (args->rmtblkno) {
- error = xfs_attr_rmtval_remove(dac);
+ error = xfs_attr_rmtval_remove(attr);
if (error == -EAGAIN)
trace_xfs_attr_set_iter_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
if (error)
return error;
- dac->dela_state = XFS_DAS_RD_LEAF;
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
+ attr->xattri_dela_state = XFS_DAS_RD_LEAF;
+ trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
+ args->dp);
return -EAGAIN;
}
@@ -494,7 +497,7 @@ xfs_attr_set_iter(
* state.
*/
if (args->rmtblkno > 0) {
- error = xfs_attr_rmtval_find_space(dac);
+ error = xfs_attr_rmtval_find_space(attr);
if (error)
return error;
}
@@ -507,14 +510,14 @@ xfs_attr_set_iter(
* after we create the attribute so that we don't overflow the
* maximum size of a transaction and/or hit a deadlock.
*/
- dac->dela_state = XFS_DAS_ALLOC_NODE;
+ attr->xattri_dela_state = XFS_DAS_ALLOC_NODE;
if (args->rmtblkno > 0) {
- if (dac->blkcnt > 0) {
- error = xfs_attr_rmtval_set_blk(dac);
+ if (attr->xattri_blkcnt > 0) {
+ error = xfs_attr_rmtval_set_blk(attr);
if (error)
return error;
trace_xfs_attr_set_iter_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
return -EAGAIN;
}
@@ -550,8 +553,8 @@ xfs_attr_set_iter(
* Commit the flag value change and start the next trans
* in series
*/
- dac->dela_state = XFS_DAS_FLIP_NFLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state,
+ attr->xattri_dela_state = XFS_DAS_FLIP_NFLAG;
+ trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
args->dp);
return -EAGAIN;
}
@@ -571,18 +574,19 @@ xfs_attr_set_iter(
fallthrough;
case XFS_DAS_RM_NBLK:
/* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */
- dac->dela_state = XFS_DAS_RM_NBLK;
+ attr->xattri_dela_state = XFS_DAS_RM_NBLK;
if (args->rmtblkno) {
- error = xfs_attr_rmtval_remove(dac);
+ error = xfs_attr_rmtval_remove(attr);
if (error == -EAGAIN)
trace_xfs_attr_set_iter_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
if (error)
return error;
- dac->dela_state = XFS_DAS_CLR_FLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
+ attr->xattri_dela_state = XFS_DAS_CLR_FLAG;
+ trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
+ args->dp);
return -EAGAIN;
}
@@ -592,7 +596,7 @@ xfs_attr_set_iter(
* The last state for node format. Look up the old attr and
* remove it.
*/
- error = xfs_attr_node_addname_clear_incomplete(dac);
+ error = xfs_attr_node_addname_clear_incomplete(attr);
break;
default:
ASSERT(0);
@@ -823,7 +827,7 @@ xfs_attr_item_init(
new = kmem_zalloc(sizeof(struct xfs_attr_item), KM_NOFS);
new->xattri_op_flags = op_flags;
- new->xattri_dac.da_args = args;
+ new->xattri_da_args = args;
*attr = new;
return 0;
@@ -1133,16 +1137,16 @@ xfs_attr_node_hasname(
STATIC int
xfs_attr_node_addname_find_attr(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
int retval;
/*
* Search to see if name already exists, and get back a pointer
* to where it should go.
*/
- retval = xfs_attr_node_hasname(args, &dac->da_state);
+ retval = xfs_attr_node_hasname(args, &attr->xattri_da_state);
if (retval != -ENOATTR && retval != -EEXIST)
goto error;
@@ -1170,8 +1174,8 @@ xfs_attr_node_addname_find_attr(
return 0;
error:
- if (dac->da_state)
- xfs_da_state_free(dac->da_state);
+ if (attr->xattri_da_state)
+ xfs_da_state_free(attr->xattri_da_state);
return retval;
}
@@ -1192,10 +1196,10 @@ xfs_attr_node_addname_find_attr(
*/
STATIC int
xfs_attr_node_addname(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
- struct xfs_da_state *state = dac->da_state;
+ struct xfs_da_args *args = attr->xattri_da_args;
+ struct xfs_da_state *state = attr->xattri_da_state;
struct xfs_da_state_blk *blk;
int error;
@@ -1226,7 +1230,7 @@ xfs_attr_node_addname(
* this point.
*/
trace_xfs_attr_node_addname_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
return -EAGAIN;
}
@@ -1255,9 +1259,9 @@ xfs_attr_node_addname(
STATIC int
xfs_attr_node_addname_clear_incomplete(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
struct xfs_da_state *state = NULL;
struct xfs_mount *mp = args->dp->i_mount;
int retval = 0;
@@ -1361,10 +1365,10 @@ xfs_attr_leaf_mark_incomplete(
*/
STATIC
int xfs_attr_node_removename_setup(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
- struct xfs_da_state **state = &dac->da_state;
+ struct xfs_da_args *args = attr->xattri_da_args;
+ struct xfs_da_state **state = &attr->xattri_da_state;
int error;
error = xfs_attr_node_hasname(args, state);
@@ -1423,16 +1427,16 @@ xfs_attr_node_removename(
*/
int
xfs_attr_remove_iter(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
- struct xfs_da_state *state = dac->da_state;
+ struct xfs_da_args *args = attr->xattri_da_args;
+ struct xfs_da_state *state = attr->xattri_da_state;
int retval, error = 0;
struct xfs_inode *dp = args->dp;
trace_xfs_attr_node_removename(args);
- switch (dac->dela_state) {
+ switch (attr->xattri_dela_state) {
case XFS_DAS_UNINIT:
if (!xfs_inode_hasattr(dp))
return -ENOATTR;
@@ -1451,16 +1455,16 @@ xfs_attr_remove_iter(
* Node format may require transaction rolls. Set up the
* state context and fall into the state machine.
*/
- if (!dac->da_state) {
- error = xfs_attr_node_removename_setup(dac);
+ if (!attr->xattri_da_state) {
+ error = xfs_attr_node_removename_setup(attr);
if (error)
return error;
- state = dac->da_state;
+ state = attr->xattri_da_state;
}
fallthrough;
case XFS_DAS_RMTBLK:
- dac->dela_state = XFS_DAS_RMTBLK;
+ attr->xattri_dela_state = XFS_DAS_RMTBLK;
/*
* If there is an out-of-line value, de-allocate the blocks.
@@ -1473,10 +1477,10 @@ xfs_attr_remove_iter(
* May return -EAGAIN. Roll and repeat until all remote
* blocks are removed.
*/
- error = xfs_attr_rmtval_remove(dac);
+ error = xfs_attr_rmtval_remove(attr);
if (error == -EAGAIN) {
trace_xfs_attr_remove_iter_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
return error;
} else if (error) {
goto out;
@@ -1491,8 +1495,10 @@ xfs_attr_remove_iter(
error = xfs_attr_refillstate(state);
if (error)
goto out;
- dac->dela_state = XFS_DAS_RM_NAME;
- trace_xfs_attr_remove_iter_return(dac->dela_state, args->dp);
+
+ attr->xattri_dela_state = XFS_DAS_RM_NAME;
+ trace_xfs_attr_remove_iter_return(
+ attr->xattri_dela_state, args->dp);
return -EAGAIN;
}
@@ -1502,7 +1508,7 @@ xfs_attr_remove_iter(
* If we came here fresh from a transaction roll, reattach all
* the buffers to the current transaction.
*/
- if (dac->dela_state == XFS_DAS_RM_NAME) {
+ if (attr->xattri_dela_state == XFS_DAS_RM_NAME) {
error = xfs_attr_refillstate(state);
if (error)
goto out;
@@ -1519,9 +1525,9 @@ xfs_attr_remove_iter(
if (error)
goto out;
- dac->dela_state = XFS_DAS_RM_SHRINK;
+ attr->xattri_dela_state = XFS_DAS_RM_SHRINK;
trace_xfs_attr_remove_iter_return(
- dac->dela_state, args->dp);
+ attr->xattri_dela_state, args->dp);
return -EAGAIN;
}
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 78884e826ca4..1ef58d34eb59 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -434,7 +434,7 @@ struct xfs_attr_list_context {
*/
/*
- * Enum values for xfs_delattr_context.da_state
+ * Enum values for xfs_attr_item.xattri_da_state
*
* These values are used by delayed attribute operations to keep track of where
* they were before they returned -EAGAIN. A return code of -EAGAIN signals the
@@ -459,39 +459,32 @@ enum xfs_delattr_state {
};
/*
- * Defines for xfs_delattr_context.flags
+ * Defines for xfs_attr_item.xattri_flags
*/
#define XFS_DAC_LEAF_ADDNAME_INIT 0x01 /* xfs_attr_leaf_addname init*/
/*
* Context used for keeping track of delayed attribute operations
*/
-struct xfs_delattr_context {
- struct xfs_da_args *da_args;
+struct xfs_attr_item {
+ struct xfs_da_args *xattri_da_args;
/*
* Used by xfs_attr_set to hold a leaf buffer across a transaction roll
*/
- struct xfs_buf *leaf_bp;
+ struct xfs_buf *xattri_leaf_bp;
/* Used in xfs_attr_rmtval_set_blk to roll through allocating blocks */
- struct xfs_bmbt_irec map;
- xfs_dablk_t lblkno;
- int blkcnt;
+ struct xfs_bmbt_irec xattri_map;
+ xfs_dablk_t xattri_lblkno;
+ int xattri_blkcnt;
/* Used in xfs_attr_node_removename to roll through removing blocks */
- struct xfs_da_state *da_state;
+ struct xfs_da_state *xattri_da_state;
/* Used to keep track of current state of delayed operation */
- unsigned int flags;
- enum xfs_delattr_state dela_state;
-};
-
-/*
- * List of attrs to commit later.
- */
-struct xfs_attr_item {
- struct xfs_delattr_context xattri_dac;
+ unsigned int xattri_flags;
+ enum xfs_delattr_state xattri_dela_state;
/*
* Indicates if the attr operation is a set or a remove
@@ -499,7 +492,10 @@ struct xfs_attr_item {
*/
unsigned int xattri_op_flags;
- /* used to log this item to an intent */
+ /*
+ * used to log this item to an intent containing a list of attrs to
+ * commit later
+ */
struct list_head xattri_list;
};
@@ -519,11 +515,9 @@ bool xfs_attr_is_leaf(struct xfs_inode *ip);
int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args);
-int xfs_attr_set_iter(struct xfs_delattr_context *dac);
-int xfs_attr_remove_iter(struct xfs_delattr_context *dac);
+int xfs_attr_set_iter(struct xfs_attr_item *attr);
+int xfs_attr_remove_iter(struct xfs_attr_item *attr);
bool xfs_attr_namecheck(const void *name, size_t length);
-void xfs_delattr_context_init(struct xfs_delattr_context *dac,
- struct xfs_da_args *args);
int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
int xfs_attr_set_deferred(struct xfs_da_args *args);
int xfs_attr_remove_deferred(struct xfs_da_args *args);
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index c806319134fb..4250159ecced 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -568,14 +568,14 @@ xfs_attr_rmtval_stale(
*/
int
xfs_attr_rmtval_find_space(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
- struct xfs_bmbt_irec *map = &dac->map;
+ struct xfs_da_args *args = attr->xattri_da_args;
+ struct xfs_bmbt_irec *map = &attr->xattri_map;
int error;
- dac->lblkno = 0;
- dac->blkcnt = 0;
+ attr->xattri_lblkno = 0;
+ attr->xattri_blkcnt = 0;
args->rmtblkcnt = 0;
args->rmtblkno = 0;
memset(map, 0, sizeof(struct xfs_bmbt_irec));
@@ -584,8 +584,8 @@ xfs_attr_rmtval_find_space(
if (error)
return error;
- dac->blkcnt = args->rmtblkcnt;
- dac->lblkno = args->rmtblkno;
+ attr->xattri_blkcnt = args->rmtblkcnt;
+ attr->xattri_lblkno = args->rmtblkno;
return 0;
}
@@ -598,17 +598,18 @@ xfs_attr_rmtval_find_space(
*/
int
xfs_attr_rmtval_set_blk(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
struct xfs_inode *dp = args->dp;
- struct xfs_bmbt_irec *map = &dac->map;
+ struct xfs_bmbt_irec *map = &attr->xattri_map;
int nmap;
int error;
nmap = 1;
- error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)dac->lblkno,
- dac->blkcnt, XFS_BMAPI_ATTRFORK, args->total,
+ error = xfs_bmapi_write(args->trans, dp,
+ (xfs_fileoff_t)attr->xattri_lblkno,
+ attr->xattri_blkcnt, XFS_BMAPI_ATTRFORK, args->total,
map, &nmap);
if (error)
return error;
@@ -618,8 +619,8 @@ xfs_attr_rmtval_set_blk(
(map->br_startblock != HOLESTARTBLOCK));
/* roll attribute extent map forwards */
- dac->lblkno += map->br_blockcount;
- dac->blkcnt -= map->br_blockcount;
+ attr->xattri_lblkno += map->br_blockcount;
+ attr->xattri_blkcnt -= map->br_blockcount;
return 0;
}
@@ -673,9 +674,9 @@ xfs_attr_rmtval_invalidate(
*/
int
xfs_attr_rmtval_remove(
- struct xfs_delattr_context *dac)
+ struct xfs_attr_item *attr)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
int error, done;
/*
@@ -695,7 +696,8 @@ xfs_attr_rmtval_remove(
* the parent
*/
if (!done) {
- trace_xfs_attr_rmtval_remove_return(dac->dela_state, args->dp);
+ trace_xfs_attr_rmtval_remove_return(attr->xattri_dela_state,
+ args->dp);
return -EAGAIN;
}
diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
index d72eff30ca18..62b398edec3f 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.h
+++ b/fs/xfs/libxfs/xfs_attr_remote.h
@@ -12,9 +12,9 @@ int xfs_attr_rmtval_get(struct xfs_da_args *args);
int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
xfs_buf_flags_t incore_flags);
int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
-int xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
+int xfs_attr_rmtval_remove(struct xfs_attr_item *attr);
int xfs_attr_rmt_find_hole(struct xfs_da_args *args);
int xfs_attr_rmtval_set_value(struct xfs_da_args *args);
-int xfs_attr_rmtval_set_blk(struct xfs_delattr_context *dac);
-int xfs_attr_rmtval_find_space(struct xfs_delattr_context *dac);
+int xfs_attr_rmtval_set_blk(struct xfs_attr_item *attr);
+int xfs_attr_rmtval_find_space(struct xfs_attr_item *attr);
#endif /* __XFS_ATTR_REMOTE_H__ */
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 71567ec42dfc..878f50babb23 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -269,11 +269,11 @@ xfs_attrd_item_release(
*/
STATIC int
xfs_xattri_finish_update(
- struct xfs_delattr_context *dac,
+ struct xfs_attr_item *attr,
struct xfs_attrd_log_item *attrdp,
uint32_t op_flags)
{
- struct xfs_da_args *args = dac->da_args;
+ struct xfs_da_args *args = attr->xattri_da_args;
unsigned int op = op_flags &
XFS_ATTR_OP_FLAGS_TYPE_MASK;
int error;
@@ -285,11 +285,11 @@ xfs_xattri_finish_update(
switch (op) {
case XFS_ATTR_OP_FLAGS_SET:
- error = xfs_attr_set_iter(dac);
+ error = xfs_attr_set_iter(attr);
break;
case XFS_ATTR_OP_FLAGS_REMOVE:
ASSERT(XFS_IFORK_Q(args->dp));
- error = xfs_attr_remove_iter(dac);
+ error = xfs_attr_remove_iter(attr);
break;
default:
error = -EFSCORRUPTED;
@@ -333,16 +333,16 @@ xfs_attr_log_item(
* structure with fields from this xfs_attr_item
*/
attrp = &attrip->attri_format;
- attrp->alfi_ino = attr->xattri_dac.da_args->dp->i_ino;
+ attrp->alfi_ino = attr->xattri_da_args->dp->i_ino;
attrp->alfi_op_flags = attr->xattri_op_flags;
- attrp->alfi_value_len = attr->xattri_dac.da_args->valuelen;
- attrp->alfi_name_len = attr->xattri_dac.da_args->namelen;
- attrp->alfi_attr_flags = attr->xattri_dac.da_args->attr_filter;
-
- attrip->attri_name = (void *)attr->xattri_dac.da_args->name;
- attrip->attri_value = attr->xattri_dac.da_args->value;
- attrip->attri_name_len = attr->xattri_dac.da_args->namelen;
- attrip->attri_value_len = attr->xattri_dac.da_args->valuelen;
+ attrp->alfi_value_len = attr->xattri_da_args->valuelen;
+ attrp->alfi_name_len = attr->xattri_da_args->namelen;
+ attrp->alfi_attr_flags = attr->xattri_da_args->attr_filter;
+
+ attrip->attri_name = (void *)attr->xattri_da_args->name;
+ attrip->attri_value = attr->xattri_da_args->value;
+ attrip->attri_name_len = attr->xattri_da_args->namelen;
+ attrip->attri_value_len = attr->xattri_da_args->valuelen;
}
/* Get an ATTRI. */
@@ -383,10 +383,8 @@ xfs_attr_finish_item(
struct xfs_attr_item *attr;
struct xfs_attrd_log_item *done_item = NULL;
int error;
- struct xfs_delattr_context *dac;
attr = container_of(item, struct xfs_attr_item, xattri_list);
- dac = &attr->xattri_dac;
if (done)
done_item = ATTRD_ITEM(done);
@@ -394,9 +392,10 @@ xfs_attr_finish_item(
* Always reset trans after EAGAIN cycle
* since the transaction is new
*/
- dac->da_args->trans = tp;
+ attr->xattri_da_args->trans = tp;
- error = xfs_xattri_finish_update(dac, done_item, attr->xattri_op_flags);
+ error = xfs_xattri_finish_update(attr, done_item,
+ attr->xattri_op_flags);
if (error != -EAGAIN)
kmem_free(attr);
@@ -518,7 +517,7 @@ xfs_attri_item_recover(
sizeof(struct xfs_da_args), KM_NOFS);
args = (struct xfs_da_args *)(attr + 1);
- attr->xattri_dac.da_args = args;
+ attr->xattri_da_args = args;
attr->xattri_op_flags = attrp->alfi_op_flags;
args->dp = ip;
@@ -554,8 +553,7 @@ xfs_attri_item_recover(
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, 0);
- ret = xfs_xattri_finish_update(&attr->xattri_dac, done_item,
- attrp->alfi_op_flags);
+ ret = xfs_xattri_finish_update(attr, done_item, attrp->alfi_op_flags);
if (ret == -EAGAIN) {
/* There's more work to do, so add it to this transaction */
xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_ATTR, &attr->xattri_list);
@@ -570,8 +568,8 @@ xfs_attri_item_recover(
error = xfs_defer_ops_capture_and_commit(tp, capture_list);
out_unlock:
- if (attr->xattri_dac.leaf_bp)
- xfs_buf_relse(attr->xattri_dac.leaf_bp);
+ if (attr->xattri_leaf_bp)
+ xfs_buf_relse(attr->xattri_leaf_bp);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
xfs_irele(ip);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 12/15] xfs: Add helper function xfs_attr_leaf_addname
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (10 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 11/15] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 13/15] xfs: Add helper function xfs_init_attr_trans Allison Henderson
` (3 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
This patch adds a helper function xfs_attr_leaf_addname. While this
does help to break down xfs_attr_set_iter, it does also hoist out some
of the state management. This patch has been moved to the end of the
clean up series for further discussion.
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 110 +++++++++++++++++++++------------------
fs/xfs/xfs_trace.h | 1 +
2 files changed, 61 insertions(+), 50 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 1b1aa3079469..7d6ad1d0e10b 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -287,6 +287,65 @@ xfs_attr_sf_addname(
return -EAGAIN;
}
+STATIC int
+xfs_attr_leaf_addname(
+ struct xfs_attr_item *attr)
+{
+ struct xfs_da_args *args = attr->xattri_da_args;
+ struct xfs_inode *dp = args->dp;
+ int error;
+
+ if (xfs_attr_is_leaf(dp)) {
+ error = xfs_attr_leaf_try_add(args, attr->xattri_leaf_bp);
+ if (error == -ENOSPC) {
+ error = xfs_attr3_leaf_to_node(args);
+ if (error)
+ return error;
+
+ /*
+ * Finish any deferred work items and roll the
+ * transaction once more. The goal here is to call
+ * node_addname with the inode and transaction in the
+ * same state (inode locked and joined, transaction
+ * clean) no matter how we got to this step.
+ *
+ * At this point, we are still in XFS_DAS_UNINIT, but
+ * when we come back, we'll be a node, so we'll fall
+ * down into the node handling code below
+ */
+ trace_xfs_attr_set_iter_return(
+ attr->xattri_dela_state, args->dp);
+ return -EAGAIN;
+ }
+
+ if (error)
+ return error;
+
+ attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
+ } else {
+ error = xfs_attr_node_addname_find_attr(attr);
+ if (error)
+ return error;
+
+ error = xfs_attr_node_addname(attr);
+ if (error)
+ return error;
+
+ /*
+ * If addname was successful, and we dont need to alloc or
+ * remove anymore blks, we're done.
+ */
+ if (!args->rmtblkno &&
+ !(args->op_flags & XFS_DA_OP_RENAME))
+ return 0;
+
+ attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
+ }
+
+ trace_xfs_attr_leaf_addname_return(attr->xattri_dela_state, args->dp);
+ return -EAGAIN;
+}
+
/*
* Set the attribute specified in @args.
* This routine is meant to function as a delayed operation, and may return
@@ -322,57 +381,8 @@ xfs_attr_set_iter(
attr->xattri_leaf_bp = NULL;
}
- if (xfs_attr_is_leaf(dp)) {
- error = xfs_attr_leaf_try_add(args,
- attr->xattri_leaf_bp);
- if (error == -ENOSPC) {
- error = xfs_attr3_leaf_to_node(args);
- if (error)
- return error;
-
- /*
- * Finish any deferred work items and roll the
- * transaction once more. The goal here is to
- * call node_addname with the inode and
- * transaction in the same state (inode locked
- * and joined, transaction clean) no matter how
- * we got to this step.
- *
- * At this point, we are still in
- * XFS_DAS_UNINIT, but when we come back, we'll
- * be a node, so we'll fall down into the node
- * handling code below
- */
- trace_xfs_attr_set_iter_return(
- attr->xattri_dela_state, args->dp);
- return -EAGAIN;
- } else if (error) {
- return error;
- }
-
- attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
- } else {
- error = xfs_attr_node_addname_find_attr(attr);
- if (error)
- return error;
+ return xfs_attr_leaf_addname(attr);
- error = xfs_attr_node_addname(attr);
- if (error)
- return error;
-
- /*
- * If addname was successful, and we dont need to alloc
- * or remove anymore blks, we're done.
- */
- if (!args->rmtblkno &&
- !(args->op_flags & XFS_DA_OP_RENAME))
- return 0;
-
- attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
- }
- trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
- args->dp);
- return -EAGAIN;
case XFS_DAS_FOUND_LBLK:
/*
* If there was an out-of-line value, allocate the blocks we
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 4a8076ef8cb4..aa80f02b4459 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -4132,6 +4132,7 @@ DEFINE_EVENT(xfs_das_state_class, name, \
TP_ARGS(das, ip))
DEFINE_DAS_STATE_EVENT(xfs_attr_sf_addname_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_set_iter_return);
+DEFINE_DAS_STATE_EVENT(xfs_attr_leaf_addname_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_node_addname_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_remove_iter_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_rmtval_remove_return);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 13/15] xfs: Add helper function xfs_init_attr_trans
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (11 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 12/15] xfs: Add helper function xfs_attr_leaf_addname Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 14/15] xfs: add leaf split error tag Allison Henderson
` (2 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
Quick helper function to collapse duplicate code to initialize
transactions for attributes
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
---
fs/xfs/libxfs/xfs_attr.c | 33 +++++++++++++++++++++++----------
fs/xfs/libxfs/xfs_attr.h | 2 ++
fs/xfs/xfs_attr_item.c | 12 ++----------
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 7d6ad1d0e10b..41404d35c76c 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -202,6 +202,28 @@ xfs_attr_calc_size(
return nblks;
}
+/* Initialize transaction reservation for attr operations */
+void
+xfs_init_attr_trans(
+ struct xfs_da_args *args,
+ struct xfs_trans_res *tres,
+ unsigned int *total)
+{
+ struct xfs_mount *mp = args->dp->i_mount;
+
+ if (args->value) {
+ tres->tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
+ M_RES(mp)->tr_attrsetrt.tr_logres *
+ args->total;
+ tres->tr_logcount = XFS_ATTRSET_LOG_COUNT;
+ tres->tr_logflags = XFS_TRANS_PERM_LOG_RES;
+ *total = args->total;
+ } else {
+ *tres = M_RES(mp)->tr_attrrm;
+ *total = XFS_ATTRRM_SPACE_RES(mp);
+ }
+}
+
STATIC int
xfs_attr_try_sf_addname(
struct xfs_inode *dp,
@@ -701,20 +723,10 @@ xfs_attr_set(
return error;
}
- tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
- M_RES(mp)->tr_attrsetrt.tr_logres *
- args->total;
- tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
- tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
- total = args->total;
-
if (!local)
rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen);
} else {
XFS_STATS_INC(mp, xs_attr_remove);
-
- tres = M_RES(mp)->tr_attrrm;
- total = XFS_ATTRRM_SPACE_RES(mp);
rmt_blks = xfs_attr3_rmt_blocks(mp, XFS_XATTR_SIZE_MAX);
}
@@ -728,6 +740,7 @@ xfs_attr_set(
* Root fork attributes can use reserved data blocks for this
* operation if necessary
*/
+ xfs_init_attr_trans(args, &tres, &total);
error = xfs_trans_alloc_inode(dp, &tres, total, 0, rsvd, &args->trans);
if (error)
goto drop_incompat;
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 1ef58d34eb59..f6c13d2bfbcd 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -519,6 +519,8 @@ int xfs_attr_set_iter(struct xfs_attr_item *attr);
int xfs_attr_remove_iter(struct xfs_attr_item *attr);
bool xfs_attr_namecheck(const void *name, size_t length);
int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
+void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres,
+ unsigned int *total);
int xfs_attr_set_deferred(struct xfs_da_args *args);
int xfs_attr_remove_deferred(struct xfs_da_args *args);
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 878f50babb23..5aa7a764d95e 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -532,17 +532,9 @@ xfs_attri_item_recover(
args->value = attrip->attri_value;
args->valuelen = attrp->alfi_value_len;
args->total = xfs_attr_calc_size(args, &local);
-
- tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
- M_RES(mp)->tr_attrsetrt.tr_logres *
- args->total;
- tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
- tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
- total = args->total;
- } else {
- tres = M_RES(mp)->tr_attrrm;
- total = XFS_ATTRRM_SPACE_RES(mp);
}
+
+ xfs_init_attr_trans(args, &tres, &total);
error = xfs_trans_alloc(mp, &tres, total, 0, XFS_TRANS_RESERVE, &tp);
if (error)
goto out;
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 14/15] xfs: add leaf split error tag
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (12 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 13/15] xfs: Add helper function xfs_init_attr_trans Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-02-28 19:51 ` [PATCH v28 15/15] xfs: add leaf to node " Allison Henderson
2022-03-01 2:29 ` [PATCH v28 00/15] xfs: Log Attribute Replay Darrick J. Wong
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
Add an error tag on xfs_da3_split to test log attribute recovery
and replay.
Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
fs/xfs/libxfs/xfs_da_btree.c | 4 ++++
fs/xfs/libxfs/xfs_errortag.h | 4 +++-
fs/xfs/xfs_error.c | 3 +++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 9dc1ecb9713d..aa74f3fdb571 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -22,6 +22,7 @@
#include "xfs_trace.h"
#include "xfs_buf_item.h"
#include "xfs_log.h"
+#include "xfs_errortag.h"
/*
* xfs_da_btree.c
@@ -482,6 +483,9 @@ xfs_da3_split(
trace_xfs_da_split(state->args);
+ if (XFS_TEST_ERROR(false, state->mp, XFS_ERRTAG_DA_LEAF_SPLIT))
+ return -EIO;
+
/*
* Walk back up the tree splitting/inserting/adjusting as necessary.
* If we need to insert and there isn't room, split the node, then
diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
index c15d2340220c..6d06a502bbdf 100644
--- a/fs/xfs/libxfs/xfs_errortag.h
+++ b/fs/xfs/libxfs/xfs_errortag.h
@@ -60,7 +60,8 @@
#define XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT 37
#define XFS_ERRTAG_AG_RESV_FAIL 38
#define XFS_ERRTAG_LARP 39
-#define XFS_ERRTAG_MAX 40
+#define XFS_ERRTAG_DA_LEAF_SPLIT 40
+#define XFS_ERRTAG_MAX 41
/*
* Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -105,5 +106,6 @@
#define XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT 1
#define XFS_RANDOM_AG_RESV_FAIL 1
#define XFS_RANDOM_LARP 1
+#define XFS_RANDOM_DA_LEAF_SPLIT 1
#endif /* __XFS_ERRORTAG_H_ */
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 666f4837b1e1..2aa5d4d2b30a 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -58,6 +58,7 @@ static unsigned int xfs_errortag_random_default[] = {
XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT,
XFS_RANDOM_AG_RESV_FAIL,
XFS_RANDOM_LARP,
+ XFS_RANDOM_DA_LEAF_SPLIT,
};
struct xfs_errortag_attr {
@@ -172,6 +173,7 @@ XFS_ERRORTAG_ATTR_RW(reduce_max_iextents, XFS_ERRTAG_REDUCE_MAX_IEXTENTS);
XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT);
XFS_ERRORTAG_ATTR_RW(ag_resv_fail, XFS_ERRTAG_AG_RESV_FAIL);
XFS_ERRORTAG_ATTR_RW(larp, XFS_ERRTAG_LARP);
+XFS_ERRORTAG_ATTR_RW(da_leaf_split, XFS_ERRTAG_DA_LEAF_SPLIT);
static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(noerror),
@@ -214,6 +216,7 @@ static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(bmap_alloc_minlen_extent),
XFS_ERRORTAG_ATTR_LIST(ag_resv_fail),
XFS_ERRORTAG_ATTR_LIST(larp),
+ XFS_ERRORTAG_ATTR_LIST(da_leaf_split),
NULL,
};
ATTRIBUTE_GROUPS(xfs_errortag);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v28 15/15] xfs: add leaf to node error tag
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (13 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 14/15] xfs: add leaf split error tag Allison Henderson
@ 2022-02-28 19:51 ` Allison Henderson
2022-03-01 2:29 ` [PATCH v28 00/15] xfs: Log Attribute Replay Darrick J. Wong
15 siblings, 0 replies; 22+ messages in thread
From: Allison Henderson @ 2022-02-28 19:51 UTC (permalink / raw)
To: linux-xfs
Add an error tag on xfs_attr3_leaf_to_node to test log attribute
recovery and replay.
Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
fs/xfs/libxfs/xfs_attr_leaf.c | 6 ++++++
fs/xfs/libxfs/xfs_errortag.h | 4 +++-
fs/xfs/xfs_error.c | 3 +++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 74b76b09509f..e90bfd9d7551 100644
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -28,6 +28,7 @@
#include "xfs_dir2.h"
#include "xfs_log.h"
#include "xfs_ag.h"
+#include "xfs_errortag.h"
/*
@@ -1189,6 +1190,11 @@ xfs_attr3_leaf_to_node(
trace_xfs_attr_leaf_to_node(args);
+ if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_ATTR_LEAF_TO_NODE)) {
+ error = -EIO;
+ goto out;
+ }
+
error = xfs_da_grow_inode(args, &blkno);
if (error)
goto out;
diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
index 6d06a502bbdf..5362908164b0 100644
--- a/fs/xfs/libxfs/xfs_errortag.h
+++ b/fs/xfs/libxfs/xfs_errortag.h
@@ -61,7 +61,8 @@
#define XFS_ERRTAG_AG_RESV_FAIL 38
#define XFS_ERRTAG_LARP 39
#define XFS_ERRTAG_DA_LEAF_SPLIT 40
-#define XFS_ERRTAG_MAX 41
+#define XFS_ERRTAG_ATTR_LEAF_TO_NODE 41
+#define XFS_ERRTAG_MAX 42
/*
* Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -107,5 +108,6 @@
#define XFS_RANDOM_AG_RESV_FAIL 1
#define XFS_RANDOM_LARP 1
#define XFS_RANDOM_DA_LEAF_SPLIT 1
+#define XFS_RANDOM_ATTR_LEAF_TO_NODE 1
#endif /* __XFS_ERRORTAG_H_ */
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 2aa5d4d2b30a..296faa41d81d 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -59,6 +59,7 @@ static unsigned int xfs_errortag_random_default[] = {
XFS_RANDOM_AG_RESV_FAIL,
XFS_RANDOM_LARP,
XFS_RANDOM_DA_LEAF_SPLIT,
+ XFS_RANDOM_ATTR_LEAF_TO_NODE,
};
struct xfs_errortag_attr {
@@ -174,6 +175,7 @@ XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTE
XFS_ERRORTAG_ATTR_RW(ag_resv_fail, XFS_ERRTAG_AG_RESV_FAIL);
XFS_ERRORTAG_ATTR_RW(larp, XFS_ERRTAG_LARP);
XFS_ERRORTAG_ATTR_RW(da_leaf_split, XFS_ERRTAG_DA_LEAF_SPLIT);
+XFS_ERRORTAG_ATTR_RW(attr_leaf_to_node, XFS_ERRTAG_ATTR_LEAF_TO_NODE);
static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(noerror),
@@ -217,6 +219,7 @@ static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(ag_resv_fail),
XFS_ERRORTAG_ATTR_LIST(larp),
XFS_ERRORTAG_ATTR_LIST(da_leaf_split),
+ XFS_ERRORTAG_ATTR_LIST(attr_leaf_to_node),
NULL,
};
ATTRIBUTE_GROUPS(xfs_errortag);
--
2.25.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v28 00/15] xfs: Log Attribute Replay
2022-02-28 19:51 [PATCH v28 00/15] xfs: Log Attribute Replay Allison Henderson
` (14 preceding siblings ...)
2022-02-28 19:51 ` [PATCH v28 15/15] xfs: add leaf to node " Allison Henderson
@ 2022-03-01 2:29 ` Darrick J. Wong
2022-03-01 20:39 ` Allison Henderson
15 siblings, 1 reply; 22+ messages in thread
From: Darrick J. Wong @ 2022-03-01 2:29 UTC (permalink / raw)
To: Allison Henderson; +Cc: linux-xfs
On Mon, Feb 28, 2022 at 12:51:32PM -0700, Allison Henderson wrote:
> Hi all,
>
> This set is a subset of a larger series parent pointers. Delayed attributes allow
> attribute operations (set and remove) to be logged and committed in the same
> way that other delayed operations do. This allows more complex operations (like
> parent pointers) to be broken up into multiple smaller transactions. To do
> this, the existing attr operations must be modified to operate as a delayed
> operation. This means that they cannot roll, commit, or finish transactions.
> Instead, they return -EAGAIN to allow the calling function to handle the
> transaction. In this series, we focus on only the delayed attribute portion.
> We will introduce parent pointers in a later set.
>
> The set as a whole is a bit much to digest at once, so I usually send out the
> smaller sub series to reduce reviewer burn out. But the entire extended series
> is visible through the included github links.
>
> Updates since v27:
> xfs: don't commit the first deferred transaction without intents
> Comment update
I applied this to 5.16-rc6, and turned on larp mode. generic/476
tripped over something, and this is what kasan had to say:
[ 835.381655] run fstests generic/476 at 2022-02-28 18:22:04
[ 838.008485] XFS (sdb): Mounting V5 Filesystem
[ 838.035529] XFS (sdb): Ending clean mount
[ 838.040528] XFS (sdb): Quotacheck needed: Please wait.
[ 838.050866] XFS (sdb): Quotacheck: Done.
[ 838.092369] XFS (sdb): EXPERIMENTAL logged extended attributes feature added. Use at your own risk!
[ 838.092938] general protection fault, probably for non-canonical address 0xe012f573e6000046: 0000 [#1] PREEMPT SMP KASAN
[ 838.099085] KASAN: maybe wild-memory-access in range [0x0097cb9f30000230-0x0097cb9f30000237]
[ 838.101148] CPU: 2 PID: 4403 Comm: fsstress Not tainted 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
[ 838.103757] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
[ 838.105811] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
FWIW, gdb says this address is:
0xffffffffa06e0739 is in xlog_cil_commit (fs/xfs/xfs_log_cil.c:237).
232
233 /*
234 * if we have no shadow buffer, or it is too small, we need to
235 * reallocate it.
236 */
237 if (!lip->li_lv_shadow ||
238 buf_size > lip->li_lv_shadow->lv_size) {
239 /*
240 * We free and allocate here as a realloc would copy
241 * unnecessary data. We don't use kvzalloc() for the
I don't know what this is about, but my guess is that we freed something
we weren't supposed to...?
(An overnight fstests run with v27 and larp=0 ran fine, though...)
--D
[ 838.107443] Code: 00 00 4c 89 f8 48 c1 e8 03 80 3c 28 00 0f 85 81 1c 00 00 4c 8b 83 80 00 00 00 4d 85 c0 74 25 49 8d 78 30 48 89 f8 48 c1 e8 03 <0f> b6 04 28 84 c0 74 08 3c 03 0f 8e 46 1c 00 00 45 39 70 30 0f 8d
[ 838.111216] RSP: 0018:ffffc900050af2c0 EFLAGS: 00010202
[ 838.112339] RAX: 0012f973e6000046 RBX: ffff888047078d20 RCX: 0000000000000070
[ 838.113761] RDX: 000000000000006f RSI: ffffc900050af378 RDI: 0097cb9f30000230
[ 838.115141] RBP: dffffc0000000000 R08: 0097cb9f30000200 R09: ffff888047078d67
[ 838.116471] R10: ffffed1008e0f1ac R11: ffffc900050aef88 R12: 0000000000000000
[ 838.117796] R13: ffffffffa07f4200 R14: 00000000000000d8 R15: ffff888047078da0
[ 838.119085] FS: 00007fb959518740(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000
[ 838.120506] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 838.121516] CR2: 00007fb959581070 CR3: 0000000043ba2005 CR4: 00000000001706a0
[ 838.122743] Call Trace:
[ 838.123214] <TASK>
[ 838.123651] ? __mutex_lock_slowpath+0x10/0x10
[ 838.124426] ? kasan_save_stack+0x1e/0x40
[ 838.125120] ? __kasan_slab_alloc+0x66/0x80
[ 838.125835] ? xlog_cil_empty+0x90/0x90 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.127287] ? xfs_trans_log_dquot+0xe8/0x170 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.128806] ? xfs_trans_apply_dquot_deltas+0x275/0xf40 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.130405] __xfs_trans_commit+0x52b/0xc00 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.131830] ? __kasan_slab_alloc+0x66/0x80
[ 838.132503] ? xfs_trans_free_items+0x220/0x220 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.133906] ? kmem_cache_alloc+0x2c9/0x400
[ 838.134534] ? xfs_trans_dup+0x512/0x830 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.135845] ? xfs_defer_trans_roll+0x126/0x360 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.137163] ? xfs_defer_finish_noroll+0x271/0x17e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.138482] xfs_trans_roll+0x118/0x290 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.139665] ? xfs_trans_alloc_empty+0xa0/0xa0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.140933] ? xfs_defer_save_resources+0x247/0x4d0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.142175] ? xfs_attri_init+0xef/0x120 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.143320] xfs_defer_trans_roll+0x126/0x360 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.144475] ? xfs_defer_trans_abort+0x3b0/0x3b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.145636] ? xfs_attr_log_item+0x54/0x4b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.146764] ? xfs_attr_log_item+0x4b0/0x4b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.147909] ? xfs_defer_create_intents+0x145/0x2c0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.149068] xfs_defer_finish_noroll+0x271/0x17e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.150606] ? xfs_mod_fdblocks+0x18d/0x3e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.151838] ? xfs_trans_reserve_quota_bydquots+0xef/0x1b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.153239] ? xfs_defer_cancel+0x110/0x110 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.154446] ? do_raw_spin_lock+0x125/0x270
[ 838.155008] ? rwlock_bug.part.0+0x90/0x90
[ 838.155564] __xfs_trans_commit+0x3f9/0xc00 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.156795] ? xfs_trans_free_items+0x220/0x220 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.158062] ? __kasan_kmalloc+0x81/0xa0
[ 838.158594] ? xfs_trans_ichgtime+0x190/0x190 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.159823] ? xfs_trans_ichgtime+0x49/0x190 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.161040] xfs_attr_set+0xc15/0x1110 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.162195] ? xfs_attr_set_iter+0xf30/0xf30 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.163412] ? is_bpf_text_address+0x1f/0x30
[ 838.163984] ? __kernel_text_address+0x62/0xb0
[ 838.164584] ? arch_stack_walk+0x98/0xf0
[ 838.165113] xfs_xattr_set+0xec/0x190 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.166280] ? xfs_trans_alloc_ichange+0x410/0x410 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.167587] ? kasan_save_stack+0x2e/0x40
[ 838.168119] ? kasan_save_stack+0x1e/0x40
[ 838.168662] __vfs_setxattr+0xe0/0x130
[ 838.169171] ? xattr_resolve_name+0x3f0/0x3f0
[ 838.169762] __vfs_setxattr_noperm+0xec/0x2d0
[ 838.170348] vfs_setxattr+0x116/0x2d0
[ 838.170845] ? __vfs_setxattr_locked+0x200/0x200
[ 838.171469] ? __might_fault+0x4d/0x70
[ 838.171984] setxattr+0x15c/0x270
[ 838.172451] ? vfs_setxattr+0x2d0/0x2d0
[ 838.172971] ? xfs_vn_getattr+0xad/0xea0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 838.174144] ? __check_object_size+0x113/0x4c0
[ 838.174731] ? kasan_quarantine_put+0x21/0x1b0
[ 838.175302] ? preempt_count_add+0x7f/0x150
[ 838.175852] ? __mnt_want_write+0x155/0x230
[ 838.176420] path_setxattr+0x141/0x170
[ 838.176889] ? setxattr+0x270/0x270
[ 838.177330] __x64_sys_setxattr+0xc0/0x160
[ 838.177847] ? syscall_exit_to_user_mode+0x1d/0x40
[ 838.178441] do_syscall_64+0x35/0x80
[ 838.178893] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 838.179523] RIP: 0033:0x7fb95963b10e
[ 838.179963] Code: 48 8b 0d 85 ad 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 bc 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 52 ad 0c 00 f7 d8 64 89 01 48
[ 838.182010] RSP: 002b:00007fff0d57c118 EFLAGS: 00000206 ORIG_RAX: 00000000000000bc
[ 838.182874] RAX: ffffffffffffffda RBX: 00007fff0d57c160 RCX: 00007fb95963b10e
[ 838.183687] RDX: 000055949a4d6670 RSI: 00007fff0d57c160 RDI: 000055949a4d6410
[ 838.184470] RBP: 000055949a4d6670 R08: 0000000000000000 R09: 00007fff0d57bfb0
[ 838.185248] R10: 000000000000002b R11: 0000000000000206 R12: 000000000000002b
[ 838.186036] R13: 000055949a4d669b R14: 000055949a4d669b R15: 0000559498b43b80
[ 838.186816] </TASK>
[ 838.187078] Modules linked in: xfs libcrc32c ip6t_REJECT nf_reject_ipv6 ipt_REJECT nf_reject_ipv4 xt_tcpudp ip_set_hash_ip ip_set_hash_net xt_set bfq ip_set_hash_mac ip_set nfnetlink ip6table_filter ip6_tables iptable_filter pvpanic_mmio pvpanic sch_fq_codel ip_tables x_tables overlay nfsv4 af_packet
[ 838.189804] Dumping ftrace buffer:
[ 838.190191] (ftrace buffer empty)
[ 838.191667] ---[ end trace 0000000000000000 ]---
[ 838.192204] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
[ 838.192978] Code: 00 00 4c 89 f8 48 c1 e8 03 80 3c 28 00 0f 85 81 1c 00 00 4c 8b 83 80 00 00 00 4d 85 c0 74 25 49 8d 78 30 48 89 f8 48 c1 e8 03 <0f> b6 04 28 84 c0 74 08 3c 03 0f 8e 46 1c 00 00 45 39 70 30 0f 8d
[ 838.195051] RSP: 0018:ffffc900050af2c0 EFLAGS: 00010202
[ 838.195652] RAX: 0012f973e6000046 RBX: ffff888047078d20 RCX: 0000000000000070
[ 838.196436] RDX: 000000000000006f RSI: ffffc900050af378 RDI: 0097cb9f30000230
[ 838.197265] RBP: dffffc0000000000 R08: 0097cb9f30000200 R09: ffff888047078d67
[ 838.198062] R10: ffffed1008e0f1ac R11: ffffc900050aef88 R12: 0000000000000000
[ 838.198842] R13: ffffffffa07f4200 R14: 00000000000000d8 R15: ffff888047078da0
[ 838.199626] FS: 00007fb959518740(0000) GS:ffff88802e700000(0000) knlGS:0000000000000000
[ 838.200509] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 838.201180] CR2: 00007f8f5400c038 CR3: 0000000043ba2003 CR4: 00000000001706a0
[ 853.182840] ==================================================================
[ 853.184795] BUG: KASAN: use-after-free in __mutex_lock.constprop.0+0x133b/0x13c0
[ 853.186684] Read of size 4 at addr ffff888048148034 by task 1:1/48
[ 853.188233]
[ 853.188709] CPU: 1 PID: 48 Comm: 1:1 Tainted: G D 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
[ 853.191490] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
[ 853.193669] Workqueue: xfs-conv/sdb xfs_end_io [xfs]
[ 853.195301] Call Trace:
[ 853.195993] <TASK>
[ 853.196614] dump_stack_lvl+0x34/0x44
[ 853.197605] print_address_description.constprop.0+0x1f/0x160
[ 853.199079] ? __mutex_lock.constprop.0+0x133b/0x13c0
[ 853.200387] kasan_report.cold+0x83/0xdf
[ 853.201452] ? __mutex_lock.constprop.0+0x133b/0x13c0
[ 853.202763] __mutex_lock.constprop.0+0x133b/0x13c0
[ 853.204033] ? xfs_trans_alloc_inode+0x118/0x2c0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.206551] ? xfs_iomap_write_unwritten+0x263/0x660 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.209136] ? xfs_end_io+0x1ed/0x300 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.211404] ? process_one_work+0x688/0x1080
[ 853.212582] ? kthread+0x29e/0x340
[ 853.213506] ? ret_from_fork+0x1f/0x30
[ 853.214500] ? mutex_trylock+0x340/0x340
[ 853.215545] ? xlog_space_left+0x55/0x2e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.217905] ? kasan_unpoison+0x23/0x50
[ 853.218926] ? __kasan_slab_alloc+0x66/0x80
[ 853.220026] mutex_lock+0xdf/0xf0
[ 853.220925] ? __mutex_lock_slowpath+0x10/0x10
[ 853.222084] ? __mutex_unlock_slowpath.constprop.0+0x5e0/0x5e0
[ 853.223571] ? preempt_count_add+0x7f/0x150
[ 853.224686] ? xfs_trans_mod_dquot+0xc5/0x740 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.227057] xfs_trans_dqresv+0x6a/0xe30 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.229214] ? xfs_mod_fdblocks+0x18d/0x3e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.231277] xfs_trans_reserve_quota_bydquots+0xef/0x1b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.233588] xfs_trans_reserve_quota_nblks+0x1e7/0x4f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.235711] ? xfs_qm_dqattach_locked+0x1c/0x3f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.237611] xfs_trans_alloc_inode+0x167/0x2c0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.239483] ? xfs_trans_roll+0x290/0x290 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.241156] xfs_iomap_write_unwritten+0x263/0x660 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.242882] ? xfs_buffered_write_iomap_begin+0x2070/0x2070 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.244699] ? psi_task_switch+0x186/0x4a0
[ 853.245429] ? sgl_alloc+0x10/0x10
[ 853.246021] xfs_end_ioend+0x3b2/0x5f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.247479] xfs_end_io+0x1ed/0x300 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.248817] ? do_raw_spin_lock+0x125/0x270
[ 853.249484] ? xfs_end_ioend+0x5f0/0x5f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
[ 853.250874] ? read_word_at_a_time+0xe/0x20
[ 853.251557] ? strscpy+0xa1/0x2a0
[ 853.252067] process_one_work+0x688/0x1080
[ 853.252689] worker_thread+0x5a3/0xf60
[ 853.253257] ? rescuer_thread+0xce0/0xce0
[ 853.253860] ? rescuer_thread+0xce0/0xce0
[ 853.254481] kthread+0x29e/0x340
[ 853.254959] ? kthread_complete_and_exit+0x20/0x20
[ 853.255647] ret_from_fork+0x1f/0x30
[ 853.256166] </TASK>
[ 853.256514]
[ 853.256767] Allocated by task 4401:
[ 853.257271] kasan_save_stack+0x1e/0x40
[ 853.257826] __kasan_slab_alloc+0x66/0x80
[ 853.258375] kmem_cache_alloc_node+0x107/0x420
[ 853.258988] copy_process+0x466/0x6180
[ 853.259515] kernel_clone+0xbd/0x860
[ 853.260011] __do_sys_clone+0xaf/0xf0
[ 853.260538] do_syscall_64+0x35/0x80
[ 853.261010] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 853.261662]
[ 853.261889] Freed by task 0:
[ 853.262276] kasan_save_stack+0x1e/0x40
[ 853.262795] kasan_set_track+0x21/0x30
[ 853.263286] kasan_set_free_info+0x20/0x30
[ 853.263826] __kasan_slab_free+0xfc/0x140
[ 853.264343] kmem_cache_free+0xfc/0x420
[ 853.264837] rcu_core+0x562/0x12e0
[ 853.265279] __do_softirq+0x1b4/0x5c7
[ 853.265758]
[ 853.265975] Last potentially related work creation:
[ 853.266582] kasan_save_stack+0x1e/0x40
[ 853.267081] __kasan_record_aux_stack+0x9f/0xb0
[ 853.267665] call_rcu+0x7a/0x740
[ 853.268068] wait_consider_task+0x28a4/0x3f70
[ 853.268606] do_wait+0x5fd/0x9a0
[ 853.269010] kernel_wait4+0xf3/0x1c0
[ 853.269456] __do_sys_wait4+0xe8/0x100
[ 853.269915] do_syscall_64+0x35/0x80
[ 853.270357] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 853.270954]
[ 853.271157] Second to last potentially related work creation:
[ 853.271809] kasan_save_stack+0x1e/0x40
[ 853.272253] __kasan_record_aux_stack+0x9f/0xb0
[ 853.272780] call_rcu+0x7a/0x740
[ 853.273162] wait_consider_task+0x28a4/0x3f70
[ 853.273672] do_wait+0x5fd/0x9a0
[ 853.274059] kernel_wait4+0xf3/0x1c0
[ 853.274499] __do_sys_wait4+0xe8/0x100
[ 853.274925] do_syscall_64+0x35/0x80
[ 853.275334] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 853.275896]
[ 853.276091] The buggy address belongs to the object at ffff888048148000
[ 853.276091] which belongs to the cache task_struct of size 8192
[ 853.277404] The buggy address is located 52 bytes inside of
[ 853.277404] 8192-byte region [ffff888048148000, ffff88804814a000)
[ 853.278635] The buggy address belongs to the page:
[ 853.279167] page:ffffea0001205200 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x48148
[ 853.280170] head:ffffea0001205200 order:3 compound_mapcount:0 compound_pincount:0
[ 853.280971] memcg:ffff888041943881
[ 853.281364] flags: 0x4fff80000010200(slab|head|node=1|zone=1|lastcpupid=0xfff)
[ 853.282145] raw: 04fff80000010200 0000000000000000 dead000000000001 ffff888004057cc0
[ 853.282979] raw: 0000000000000000 0000000000030003 00000001ffffffff ffff888041943881
[ 853.283803] page dumped because: kasan: bad access detected
[ 853.284408]
[ 853.284618] Memory state around the buggy address:
[ 853.285148] ffff888048147f00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
[ 853.285940] ffff888048147f80: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
[ 853.286715] >ffff888048148000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
[ 853.287485] ^
[ 853.288009] ffff888048148080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
[ 853.288784] ffff888048148100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
[ 853.289566] ==================================================================
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v28 00/15] xfs: Log Attribute Replay
2022-03-01 2:29 ` [PATCH v28 00/15] xfs: Log Attribute Replay Darrick J. Wong
@ 2022-03-01 20:39 ` Allison Henderson
2022-03-09 3:53 ` Darrick J. Wong
0 siblings, 1 reply; 22+ messages in thread
From: Allison Henderson @ 2022-03-01 20:39 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: linux-xfs
On 2/28/22 7:29 PM, Darrick J. Wong wrote:
> On Mon, Feb 28, 2022 at 12:51:32PM -0700, Allison Henderson wrote:
>> Hi all,
>>
>> This set is a subset of a larger series parent pointers. Delayed attributes allow
>> attribute operations (set and remove) to be logged and committed in the same
>> way that other delayed operations do. This allows more complex operations (like
>> parent pointers) to be broken up into multiple smaller transactions. To do
>> this, the existing attr operations must be modified to operate as a delayed
>> operation. This means that they cannot roll, commit, or finish transactions.
>> Instead, they return -EAGAIN to allow the calling function to handle the
>> transaction. In this series, we focus on only the delayed attribute portion.
>> We will introduce parent pointers in a later set.
>>
>> The set as a whole is a bit much to digest at once, so I usually send out the
>> smaller sub series to reduce reviewer burn out. But the entire extended series
>> is visible through the included github links.
>>
>> Updates since v27:
>> xfs: don't commit the first deferred transaction without intents
>> Comment update
>
> I applied this to 5.16-rc6, and turned on larp mode. generic/476
> tripped over something, and this is what kasan had to say:
>
> [ 835.381655] run fstests generic/476 at 2022-02-28 18:22:04
> [ 838.008485] XFS (sdb): Mounting V5 Filesystem
> [ 838.035529] XFS (sdb): Ending clean mount
> [ 838.040528] XFS (sdb): Quotacheck needed: Please wait.
> [ 838.050866] XFS (sdb): Quotacheck: Done.
> [ 838.092369] XFS (sdb): EXPERIMENTAL logged extended attributes feature added. Use at your own risk!
> [ 838.092938] general protection fault, probably for non-canonical address 0xe012f573e6000046: 0000 [#1] PREEMPT SMP KASAN
> [ 838.099085] KASAN: maybe wild-memory-access in range [0x0097cb9f30000230-0x0097cb9f30000237]
> [ 838.101148] CPU: 2 PID: 4403 Comm: fsstress Not tainted 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
> [ 838.103757] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> [ 838.105811] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
>
>
> FWIW, gdb says this address is:
>
> 0xffffffffa06e0739 is in xlog_cil_commit (fs/xfs/xfs_log_cil.c:237).
> 232
> 233 /*
> 234 * if we have no shadow buffer, or it is too small, we need to
> 235 * reallocate it.
> 236 */
> 237 if (!lip->li_lv_shadow ||
> 238 buf_size > lip->li_lv_shadow->lv_size) {
> 239 /*
> 240 * We free and allocate here as a realloc would copy
> 241 * unnecessary data. We don't use kvzalloc() for the
>
> I don't know what this is about, but my guess is that we freed something
> we weren't supposed to...?
>
> (An overnight fstests run with v27 and larp=0 ran fine, though...)
>
> --D
Hmm, ok, I will dig into this then. I dont see anything between v27 and
v28 that would have cause this though, so I'm thinking what ever it is
must by intermittent. I'll stick it in a loop and see if I can get a
recreate today. Thanks!
Allison
>
> [ 838.107443] Code: 00 00 4c 89 f8 48 c1 e8 03 80 3c 28 00 0f 85 81 1c 00 00 4c 8b 83 80 00 00 00 4d 85 c0 74 25 49 8d 78 30 48 89 f8 48 c1 e8 03 <0f> b6 04 28 84 c0 74 08 3c 03 0f 8e 46 1c 00 00 45 39 70 30 0f 8d
> [ 838.111216] RSP: 0018:ffffc900050af2c0 EFLAGS: 00010202
> [ 838.112339] RAX: 0012f973e6000046 RBX: ffff888047078d20 RCX: 0000000000000070
> [ 838.113761] RDX: 000000000000006f RSI: ffffc900050af378 RDI: 0097cb9f30000230
> [ 838.115141] RBP: dffffc0000000000 R08: 0097cb9f30000200 R09: ffff888047078d67
> [ 838.116471] R10: ffffed1008e0f1ac R11: ffffc900050aef88 R12: 0000000000000000
> [ 838.117796] R13: ffffffffa07f4200 R14: 00000000000000d8 R15: ffff888047078da0
> [ 838.119085] FS: 00007fb959518740(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000
> [ 838.120506] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 838.121516] CR2: 00007fb959581070 CR3: 0000000043ba2005 CR4: 00000000001706a0
> [ 838.122743] Call Trace:
> [ 838.123214] <TASK>
> [ 838.123651] ? __mutex_lock_slowpath+0x10/0x10
> [ 838.124426] ? kasan_save_stack+0x1e/0x40
> [ 838.125120] ? __kasan_slab_alloc+0x66/0x80
> [ 838.125835] ? xlog_cil_empty+0x90/0x90 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.127287] ? xfs_trans_log_dquot+0xe8/0x170 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.128806] ? xfs_trans_apply_dquot_deltas+0x275/0xf40 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.130405] __xfs_trans_commit+0x52b/0xc00 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.131830] ? __kasan_slab_alloc+0x66/0x80
> [ 838.132503] ? xfs_trans_free_items+0x220/0x220 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.133906] ? kmem_cache_alloc+0x2c9/0x400
> [ 838.134534] ? xfs_trans_dup+0x512/0x830 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.135845] ? xfs_defer_trans_roll+0x126/0x360 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.137163] ? xfs_defer_finish_noroll+0x271/0x17e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.138482] xfs_trans_roll+0x118/0x290 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.139665] ? xfs_trans_alloc_empty+0xa0/0xa0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.140933] ? xfs_defer_save_resources+0x247/0x4d0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.142175] ? xfs_attri_init+0xef/0x120 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.143320] xfs_defer_trans_roll+0x126/0x360 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.144475] ? xfs_defer_trans_abort+0x3b0/0x3b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.145636] ? xfs_attr_log_item+0x54/0x4b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.146764] ? xfs_attr_log_item+0x4b0/0x4b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.147909] ? xfs_defer_create_intents+0x145/0x2c0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.149068] xfs_defer_finish_noroll+0x271/0x17e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.150606] ? xfs_mod_fdblocks+0x18d/0x3e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.151838] ? xfs_trans_reserve_quota_bydquots+0xef/0x1b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.153239] ? xfs_defer_cancel+0x110/0x110 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.154446] ? do_raw_spin_lock+0x125/0x270
> [ 838.155008] ? rwlock_bug.part.0+0x90/0x90
> [ 838.155564] __xfs_trans_commit+0x3f9/0xc00 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.156795] ? xfs_trans_free_items+0x220/0x220 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.158062] ? __kasan_kmalloc+0x81/0xa0
> [ 838.158594] ? xfs_trans_ichgtime+0x190/0x190 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.159823] ? xfs_trans_ichgtime+0x49/0x190 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.161040] xfs_attr_set+0xc15/0x1110 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.162195] ? xfs_attr_set_iter+0xf30/0xf30 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.163412] ? is_bpf_text_address+0x1f/0x30
> [ 838.163984] ? __kernel_text_address+0x62/0xb0
> [ 838.164584] ? arch_stack_walk+0x98/0xf0
> [ 838.165113] xfs_xattr_set+0xec/0x190 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.166280] ? xfs_trans_alloc_ichange+0x410/0x410 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.167587] ? kasan_save_stack+0x2e/0x40
> [ 838.168119] ? kasan_save_stack+0x1e/0x40
> [ 838.168662] __vfs_setxattr+0xe0/0x130
> [ 838.169171] ? xattr_resolve_name+0x3f0/0x3f0
> [ 838.169762] __vfs_setxattr_noperm+0xec/0x2d0
> [ 838.170348] vfs_setxattr+0x116/0x2d0
> [ 838.170845] ? __vfs_setxattr_locked+0x200/0x200
> [ 838.171469] ? __might_fault+0x4d/0x70
> [ 838.171984] setxattr+0x15c/0x270
> [ 838.172451] ? vfs_setxattr+0x2d0/0x2d0
> [ 838.172971] ? xfs_vn_getattr+0xad/0xea0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 838.174144] ? __check_object_size+0x113/0x4c0
> [ 838.174731] ? kasan_quarantine_put+0x21/0x1b0
> [ 838.175302] ? preempt_count_add+0x7f/0x150
> [ 838.175852] ? __mnt_want_write+0x155/0x230
> [ 838.176420] path_setxattr+0x141/0x170
> [ 838.176889] ? setxattr+0x270/0x270
> [ 838.177330] __x64_sys_setxattr+0xc0/0x160
> [ 838.177847] ? syscall_exit_to_user_mode+0x1d/0x40
> [ 838.178441] do_syscall_64+0x35/0x80
> [ 838.178893] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 838.179523] RIP: 0033:0x7fb95963b10e
> [ 838.179963] Code: 48 8b 0d 85 ad 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 bc 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 52 ad 0c 00 f7 d8 64 89 01 48
> [ 838.182010] RSP: 002b:00007fff0d57c118 EFLAGS: 00000206 ORIG_RAX: 00000000000000bc
> [ 838.182874] RAX: ffffffffffffffda RBX: 00007fff0d57c160 RCX: 00007fb95963b10e
> [ 838.183687] RDX: 000055949a4d6670 RSI: 00007fff0d57c160 RDI: 000055949a4d6410
> [ 838.184470] RBP: 000055949a4d6670 R08: 0000000000000000 R09: 00007fff0d57bfb0
> [ 838.185248] R10: 000000000000002b R11: 0000000000000206 R12: 000000000000002b
> [ 838.186036] R13: 000055949a4d669b R14: 000055949a4d669b R15: 0000559498b43b80
> [ 838.186816] </TASK>
> [ 838.187078] Modules linked in: xfs libcrc32c ip6t_REJECT nf_reject_ipv6 ipt_REJECT nf_reject_ipv4 xt_tcpudp ip_set_hash_ip ip_set_hash_net xt_set bfq ip_set_hash_mac ip_set nfnetlink ip6table_filter ip6_tables iptable_filter pvpanic_mmio pvpanic sch_fq_codel ip_tables x_tables overlay nfsv4 af_packet
> [ 838.189804] Dumping ftrace buffer:
> [ 838.190191] (ftrace buffer empty)
> [ 838.191667] ---[ end trace 0000000000000000 ]---
> [ 838.192204] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
> [ 838.192978] Code: 00 00 4c 89 f8 48 c1 e8 03 80 3c 28 00 0f 85 81 1c 00 00 4c 8b 83 80 00 00 00 4d 85 c0 74 25 49 8d 78 30 48 89 f8 48 c1 e8 03 <0f> b6 04 28 84 c0 74 08 3c 03 0f 8e 46 1c 00 00 45 39 70 30 0f 8d
> [ 838.195051] RSP: 0018:ffffc900050af2c0 EFLAGS: 00010202
> [ 838.195652] RAX: 0012f973e6000046 RBX: ffff888047078d20 RCX: 0000000000000070
> [ 838.196436] RDX: 000000000000006f RSI: ffffc900050af378 RDI: 0097cb9f30000230
> [ 838.197265] RBP: dffffc0000000000 R08: 0097cb9f30000200 R09: ffff888047078d67
> [ 838.198062] R10: ffffed1008e0f1ac R11: ffffc900050aef88 R12: 0000000000000000
> [ 838.198842] R13: ffffffffa07f4200 R14: 00000000000000d8 R15: ffff888047078da0
> [ 838.199626] FS: 00007fb959518740(0000) GS:ffff88802e700000(0000) knlGS:0000000000000000
> [ 838.200509] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 838.201180] CR2: 00007f8f5400c038 CR3: 0000000043ba2003 CR4: 00000000001706a0
> [ 853.182840] ==================================================================
> [ 853.184795] BUG: KASAN: use-after-free in __mutex_lock.constprop.0+0x133b/0x13c0
> [ 853.186684] Read of size 4 at addr ffff888048148034 by task 1:1/48
> [ 853.188233]
> [ 853.188709] CPU: 1 PID: 48 Comm: 1:1 Tainted: G D 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
> [ 853.191490] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> [ 853.193669] Workqueue: xfs-conv/sdb xfs_end_io [xfs]
> [ 853.195301] Call Trace:
> [ 853.195993] <TASK>
> [ 853.196614] dump_stack_lvl+0x34/0x44
> [ 853.197605] print_address_description.constprop.0+0x1f/0x160
> [ 853.199079] ? __mutex_lock.constprop.0+0x133b/0x13c0
> [ 853.200387] kasan_report.cold+0x83/0xdf
> [ 853.201452] ? __mutex_lock.constprop.0+0x133b/0x13c0
> [ 853.202763] __mutex_lock.constprop.0+0x133b/0x13c0
> [ 853.204033] ? xfs_trans_alloc_inode+0x118/0x2c0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.206551] ? xfs_iomap_write_unwritten+0x263/0x660 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.209136] ? xfs_end_io+0x1ed/0x300 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.211404] ? process_one_work+0x688/0x1080
> [ 853.212582] ? kthread+0x29e/0x340
> [ 853.213506] ? ret_from_fork+0x1f/0x30
> [ 853.214500] ? mutex_trylock+0x340/0x340
> [ 853.215545] ? xlog_space_left+0x55/0x2e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.217905] ? kasan_unpoison+0x23/0x50
> [ 853.218926] ? __kasan_slab_alloc+0x66/0x80
> [ 853.220026] mutex_lock+0xdf/0xf0
> [ 853.220925] ? __mutex_lock_slowpath+0x10/0x10
> [ 853.222084] ? __mutex_unlock_slowpath.constprop.0+0x5e0/0x5e0
> [ 853.223571] ? preempt_count_add+0x7f/0x150
> [ 853.224686] ? xfs_trans_mod_dquot+0xc5/0x740 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.227057] xfs_trans_dqresv+0x6a/0xe30 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.229214] ? xfs_mod_fdblocks+0x18d/0x3e0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.231277] xfs_trans_reserve_quota_bydquots+0xef/0x1b0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.233588] xfs_trans_reserve_quota_nblks+0x1e7/0x4f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.235711] ? xfs_qm_dqattach_locked+0x1c/0x3f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.237611] xfs_trans_alloc_inode+0x167/0x2c0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.239483] ? xfs_trans_roll+0x290/0x290 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.241156] xfs_iomap_write_unwritten+0x263/0x660 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.242882] ? xfs_buffered_write_iomap_begin+0x2070/0x2070 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.244699] ? psi_task_switch+0x186/0x4a0
> [ 853.245429] ? sgl_alloc+0x10/0x10
> [ 853.246021] xfs_end_ioend+0x3b2/0x5f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.247479] xfs_end_io+0x1ed/0x300 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.248817] ? do_raw_spin_lock+0x125/0x270
> [ 853.249484] ? xfs_end_ioend+0x5f0/0x5f0 [xfs ff7a0bfdb9d791b76ca0bad2f24d8adae3cf8c9d]
> [ 853.250874] ? read_word_at_a_time+0xe/0x20
> [ 853.251557] ? strscpy+0xa1/0x2a0
> [ 853.252067] process_one_work+0x688/0x1080
> [ 853.252689] worker_thread+0x5a3/0xf60
> [ 853.253257] ? rescuer_thread+0xce0/0xce0
> [ 853.253860] ? rescuer_thread+0xce0/0xce0
> [ 853.254481] kthread+0x29e/0x340
> [ 853.254959] ? kthread_complete_and_exit+0x20/0x20
> [ 853.255647] ret_from_fork+0x1f/0x30
> [ 853.256166] </TASK>
> [ 853.256514]
> [ 853.256767] Allocated by task 4401:
> [ 853.257271] kasan_save_stack+0x1e/0x40
> [ 853.257826] __kasan_slab_alloc+0x66/0x80
> [ 853.258375] kmem_cache_alloc_node+0x107/0x420
> [ 853.258988] copy_process+0x466/0x6180
> [ 853.259515] kernel_clone+0xbd/0x860
> [ 853.260011] __do_sys_clone+0xaf/0xf0
> [ 853.260538] do_syscall_64+0x35/0x80
> [ 853.261010] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 853.261662]
> [ 853.261889] Freed by task 0:
> [ 853.262276] kasan_save_stack+0x1e/0x40
> [ 853.262795] kasan_set_track+0x21/0x30
> [ 853.263286] kasan_set_free_info+0x20/0x30
> [ 853.263826] __kasan_slab_free+0xfc/0x140
> [ 853.264343] kmem_cache_free+0xfc/0x420
> [ 853.264837] rcu_core+0x562/0x12e0
> [ 853.265279] __do_softirq+0x1b4/0x5c7
> [ 853.265758]
> [ 853.265975] Last potentially related work creation:
> [ 853.266582] kasan_save_stack+0x1e/0x40
> [ 853.267081] __kasan_record_aux_stack+0x9f/0xb0
> [ 853.267665] call_rcu+0x7a/0x740
> [ 853.268068] wait_consider_task+0x28a4/0x3f70
> [ 853.268606] do_wait+0x5fd/0x9a0
> [ 853.269010] kernel_wait4+0xf3/0x1c0
> [ 853.269456] __do_sys_wait4+0xe8/0x100
> [ 853.269915] do_syscall_64+0x35/0x80
> [ 853.270357] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 853.270954]
> [ 853.271157] Second to last potentially related work creation:
> [ 853.271809] kasan_save_stack+0x1e/0x40
> [ 853.272253] __kasan_record_aux_stack+0x9f/0xb0
> [ 853.272780] call_rcu+0x7a/0x740
> [ 853.273162] wait_consider_task+0x28a4/0x3f70
> [ 853.273672] do_wait+0x5fd/0x9a0
> [ 853.274059] kernel_wait4+0xf3/0x1c0
> [ 853.274499] __do_sys_wait4+0xe8/0x100
> [ 853.274925] do_syscall_64+0x35/0x80
> [ 853.275334] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 853.275896]
> [ 853.276091] The buggy address belongs to the object at ffff888048148000
> [ 853.276091] which belongs to the cache task_struct of size 8192
> [ 853.277404] The buggy address is located 52 bytes inside of
> [ 853.277404] 8192-byte region [ffff888048148000, ffff88804814a000)
> [ 853.278635] The buggy address belongs to the page:
> [ 853.279167] page:ffffea0001205200 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x48148
> [ 853.280170] head:ffffea0001205200 order:3 compound_mapcount:0 compound_pincount:0
> [ 853.280971] memcg:ffff888041943881
> [ 853.281364] flags: 0x4fff80000010200(slab|head|node=1|zone=1|lastcpupid=0xfff)
> [ 853.282145] raw: 04fff80000010200 0000000000000000 dead000000000001 ffff888004057cc0
> [ 853.282979] raw: 0000000000000000 0000000000030003 00000001ffffffff ffff888041943881
> [ 853.283803] page dumped because: kasan: bad access detected
> [ 853.284408]
> [ 853.284618] Memory state around the buggy address:
> [ 853.285148] ffff888048147f00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
> [ 853.285940] ffff888048147f80: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
> [ 853.286715] >ffff888048148000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
> [ 853.287485] ^
> [ 853.288009] ffff888048148080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
> [ 853.288784] ffff888048148100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
> [ 853.289566] ==================================================================
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v28 00/15] xfs: Log Attribute Replay
2022-03-01 20:39 ` Allison Henderson
@ 2022-03-09 3:53 ` Darrick J. Wong
2022-03-10 6:13 ` Alli
2022-03-10 6:55 ` Dave Chinner
0 siblings, 2 replies; 22+ messages in thread
From: Darrick J. Wong @ 2022-03-09 3:53 UTC (permalink / raw)
To: Allison Henderson; +Cc: linux-xfs
On Tue, Mar 01, 2022 at 01:39:36PM -0700, Allison Henderson wrote:
>
>
> On 2/28/22 7:29 PM, Darrick J. Wong wrote:
> > On Mon, Feb 28, 2022 at 12:51:32PM -0700, Allison Henderson wrote:
> > > Hi all,
> > >
> > > This set is a subset of a larger series parent pointers. Delayed attributes allow
> > > attribute operations (set and remove) to be logged and committed in the same
> > > way that other delayed operations do. This allows more complex operations (like
> > > parent pointers) to be broken up into multiple smaller transactions. To do
> > > this, the existing attr operations must be modified to operate as a delayed
> > > operation. This means that they cannot roll, commit, or finish transactions.
> > > Instead, they return -EAGAIN to allow the calling function to handle the
> > > transaction. In this series, we focus on only the delayed attribute portion.
> > > We will introduce parent pointers in a later set.
> > >
> > > The set as a whole is a bit much to digest at once, so I usually send out the
> > > smaller sub series to reduce reviewer burn out. But the entire extended series
> > > is visible through the included github links.
> > >
> > > Updates since v27:
> > > xfs: don't commit the first deferred transaction without intents
> > > Comment update
> >
> > I applied this to 5.16-rc6, and turned on larp mode. generic/476
> > tripped over something, and this is what kasan had to say:
> >
> > [ 835.381655] run fstests generic/476 at 2022-02-28 18:22:04
> > [ 838.008485] XFS (sdb): Mounting V5 Filesystem
> > [ 838.035529] XFS (sdb): Ending clean mount
> > [ 838.040528] XFS (sdb): Quotacheck needed: Please wait.
> > [ 838.050866] XFS (sdb): Quotacheck: Done.
> > [ 838.092369] XFS (sdb): EXPERIMENTAL logged extended attributes feature added. Use at your own risk!
> > [ 838.092938] general protection fault, probably for non-canonical address 0xe012f573e6000046: 0000 [#1] PREEMPT SMP KASAN
> > [ 838.099085] KASAN: maybe wild-memory-access in range [0x0097cb9f30000230-0x0097cb9f30000237]
> > [ 838.101148] CPU: 2 PID: 4403 Comm: fsstress Not tainted 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
> > [ 838.103757] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> > [ 838.105811] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
> >
> >
> > FWIW, gdb says this address is:
> >
> > 0xffffffffa06e0739 is in xlog_cil_commit (fs/xfs/xfs_log_cil.c:237).
> > 232
> > 233 /*
> > 234 * if we have no shadow buffer, or it is too small, we need to
> > 235 * reallocate it.
> > 236 */
> > 237 if (!lip->li_lv_shadow ||
> > 238 buf_size > lip->li_lv_shadow->lv_size) {
> > 239 /*
> > 240 * We free and allocate here as a realloc would copy
> > 241 * unnecessary data. We don't use kvzalloc() for the
> >
> > I don't know what this is about, but my guess is that we freed something
> > we weren't supposed to...?
> >
> > (An overnight fstests run with v27 and larp=0 ran fine, though...)
> >
> > --D
>
> Hmm, ok, I will dig into this then. I dont see anything between v27 and v28
> that would have cause this though, so I'm thinking what ever it is must by
> intermittent. I'll stick it in a loop and see if I can get a recreate
> today. Thanks!
I think I've figured out two of the problems here --
The biggest problem is that xfs_attri_init isn't fully initializing the
xattr log item structure, which is why the CIL would crash on my system
when it tried to resize what it thought was the lv_shadow buffer
attached to the log item. I changed it to kmem_cache_zalloc and the
problems went away; you might want to check if your kernel has some
debugging kconfig feature enabled that auto-zeroes everything.
The other KASAN report has to do with the log iovec code -- it assumes
that any buffer passed in has a size that is congruent with 4(?) bytes.
This isn't necessarily true for the xattr name (and in principle also
the value) buffer that we get from the VFS; if either is (say) 37 bytes
long, you'll get 37 bytes, and KASAN will expect you to stick to that.
I think with the way the slab works this isn't a real memory corruption
vector, but I wouldn't put it past slob or someone to actually pack
things in tightly.
Also, I'm not sure what's going on with the name/value buffers in the
relog function. I patched it to try to track the buffer references, but
maybe you have a better idea for why we allocate new name/value buffers
for a log item relog? I wasn't sure where those new buffers ever got
freed, so I <cough> ran it over with a backhoe, and it shows. :/
The following shabby patch helps us to pass generic/475 and generic/624
in LARP mode, though I have no idea if it's correct. You might want to
pay attention to the "XXX:" comments I added, since that's where I got
stuck.
--D
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 41404d35c76c..7a00a43610d5 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -678,6 +678,9 @@ xfs_attr_set(
{
struct xfs_inode *dp = args->dp;
struct xfs_mount *mp = dp->i_mount;
+ void *fakename = NULL, *fakeval = NULL;
+ const void *oldname = args->name;
+ void *oldval = args->value;
struct xfs_trans_res tres;
bool rsvd = (args->attr_filter & XFS_ATTR_ROOT);
int error, local;
@@ -692,6 +695,34 @@ xfs_attr_set(
if (error)
return error;
+ /*
+ * XXX: the log iovec code requires that every buffer it's given has a
+ * size that's an even multiple of four. If this isn't the case, create
+ * a shadow buffers so that we don't read past the end of the name and
+ * value buffers and trip KASAN.
+ */
+ if (xfs_has_larp(mp) && (args->namelen & 3)) {
+ fakename = kzalloc(roundup(args->namelen, 4),
+ GFP_KERNEL | GFP_NOFS);
+ if (!fakename)
+ return -ENOMEM;
+ memcpy(fakename, args->name, args->namelen);
+ args->name = fakename;
+ }
+
+ if (xfs_has_larp(mp) && (args->valuelen & 3)) {
+ fakeval = kzalloc(roundup(args->valuelen, 4),
+ GFP_KERNEL | GFP_NOFS);
+ if (!fakeval) {
+ if (fakename)
+ kvfree(fakename);
+ return -ENOMEM;
+ }
+ memcpy(fakeval, args->value, args->valuelen);
+ args->value = fakeval;
+ }
+
+ //trace_printk("start name 0x%px len 0x%x val 0x%px len 0x%x", args->name, args->namelen, args->value, args->valuelen);
args->geo = mp->m_attr_geo;
args->whichfork = XFS_ATTR_FORK;
args->hashval = xfs_da_hashname(args->name, args->namelen);
@@ -797,6 +828,13 @@ xfs_attr_set(
drop_incompat:
if (delayed)
xlog_drop_incompat_feat(mp->m_log);
+ //trace_printk("end name 0x%px val 0x%px", args->name, args->value);
+ if (fakename)
+ kvfree(fakename);
+ if (fakeval)
+ kvfree(fakeval);
+ args->value = oldval;
+ args->name = oldname;
return error;
out_trans_cancel:
@@ -852,6 +890,7 @@ xfs_attr_item_init(
new->xattri_op_flags = op_flags;
new->xattri_da_args = args;
+ //trace_printk("name 0x%px val 0x%px", args->name, args->value);
*attr = new;
return 0;
}
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 5aa7a764d95e..8e365583e265 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -43,6 +43,12 @@ STATIC void
xfs_attri_item_free(
struct xfs_attri_log_item *attrip)
{
+ if (attrip->attri_own_buffers) {
+ kvfree(attrip->attri_name);
+ if (attrip->attri_value)
+ kvfree(attrip->attri_value);
+ attrip->attri_own_buffers = false;
+ }
kmem_free(attrip->attri_item.li_lv_shadow);
kmem_free(attrip);
}
@@ -114,6 +120,8 @@ xfs_attri_item_format(
if (attrip->attri_value_len > 0)
attrip->attri_format.alfi_size++;
+ //trace_printk("fmt 0x%px name 0x%px val 0x%px", &attrip->attri_format, attrip->attri_name, attrip->attri_value);
+
xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_ATTRI_FORMAT,
&attrip->attri_format,
sizeof(struct xfs_attri_log_format));
@@ -158,19 +166,39 @@ xfs_attri_item_release(
STATIC struct xfs_attri_log_item *
xfs_attri_init(
struct xfs_mount *mp,
- int buffer_size)
+ unsigned int namelen,
+ unsigned int valuelen)
{
struct xfs_attri_log_item *attrip;
+ unsigned int buffer_size;
- if (buffer_size) {
- attrip = kmem_alloc(sizeof(struct xfs_attri_log_item) +
- buffer_size, KM_NOFS);
- if (attrip == NULL)
+ attrip = kmem_cache_zalloc(xfs_attri_cache, GFP_NOFS | __GFP_NOFAIL);
+
+ if (valuelen)
+ ASSERT(namelen != 0);
+
+ if (namelen) {
+ buffer_size = roundup(namelen, 4);
+ attrip->attri_name = kzalloc(buffer_size,
+ GFP_KERNEL | GFP_NOFS | __GFP_RETRY_MAYFAIL);
+ if (!attrip->attri_name) {
+ kmem_cache_free(xfs_attri_cache, attrip);
+ return NULL;
+ }
+ attrip->attri_own_buffers = true;
+ }
+
+ if (valuelen) {
+ buffer_size = roundup(valuelen, 4);
+ attrip->attri_value = kzalloc(buffer_size,
+ GFP_KERNEL | GFP_NOFS |__GFP_RETRY_MAYFAIL);
+ if (!attrip->attri_value) {
+ if (attrip->attri_name)
+ kvfree(attrip->attri_name);
+ kmem_cache_free(xfs_attri_cache, attrip);
return NULL;
- } else {
- attrip = kmem_cache_alloc(xfs_attri_cache,
- GFP_NOFS | __GFP_NOFAIL);
+ }
}
xfs_log_item_init(mp, &attrip->attri_item, XFS_LI_ATTRI,
@@ -343,6 +371,8 @@ xfs_attr_log_item(
attrip->attri_value = attr->xattri_da_args->value;
attrip->attri_name_len = attr->xattri_da_args->namelen;
attrip->attri_value_len = attr->xattri_da_args->valuelen;
+
+ //trace_printk("lip 0x%px fmt 0x%px name 0x%px val 0x%px", &attrip->attri_item, &attrip->attri_format, attrip->attri_name, attrip->attri_value);
}
/* Get an ATTRI. */
@@ -362,7 +392,7 @@ xfs_attr_create_intent(
if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
return NULL;
- attrip = xfs_attri_init(mp, 0);
+ attrip = xfs_attri_init(mp, 0, 0);
if (attrip == NULL)
return NULL;
@@ -434,6 +464,13 @@ xfs_attri_item_committed(
* committed so these fields are no longer accessed. Clear them out of
* caution since we're about to free the xfs_attr_item.
*/
+ //trace_printk("fmt 0x%px name 0x%px val 0x%px", &attrip->attri_format, attrip->attri_name, attrip->attri_value);
+ if (attrip->attri_own_buffers) {
+ kvfree(attrip->attri_name);
+ if (attrip->attri_value)
+ kvfree(attrip->attri_value);
+ attrip->attri_own_buffers = false;
+ }
attrip->attri_name = NULL;
attrip->attri_value = NULL;
@@ -582,17 +619,15 @@ xfs_attri_item_relog(
struct xfs_attri_log_item *new_attrip;
struct xfs_attri_log_format *new_attrp;
struct xfs_attri_log_format *old_attrp;
- int buffer_size;
old_attrip = ATTRI_ITEM(intent);
old_attrp = &old_attrip->attri_format;
- buffer_size = old_attrp->alfi_value_len + old_attrp->alfi_name_len;
tp->t_flags |= XFS_TRANS_DIRTY;
attrdp = xfs_trans_get_attrd(tp, old_attrip);
set_bit(XFS_LI_DIRTY, &attrdp->attrd_item.li_flags);
- new_attrip = xfs_attri_init(tp->t_mountp, buffer_size);
+ new_attrip = xfs_attri_init(tp->t_mountp, 0, 0);
new_attrp = &new_attrip->attri_format;
new_attrp->alfi_ino = old_attrp->alfi_ino;
@@ -602,19 +637,30 @@ xfs_attri_item_relog(
new_attrp->alfi_attr_flags = old_attrp->alfi_attr_flags;
new_attrip->attri_name_len = old_attrip->attri_name_len;
- new_attrip->attri_name = ((char *)new_attrip) +
- sizeof(struct xfs_attri_log_item);
- memcpy(new_attrip->attri_name, old_attrip->attri_name,
- new_attrip->attri_name_len);
+ new_attrip->attri_name = old_attrip->attri_name;
new_attrip->attri_value_len = old_attrip->attri_value_len;
- if (new_attrip->attri_value_len > 0) {
- new_attrip->attri_value = new_attrip->attri_name +
- new_attrip->attri_name_len;
+ if (new_attrip->attri_value_len > 0)
+ new_attrip->attri_value = old_attrip->attri_value;
- memcpy(new_attrip->attri_value, old_attrip->attri_value,
- new_attrip->attri_value_len);
- }
+ /*
+ * XXX Err... so who owns the name/value buffer references, anyway?
+ * Is it safe to drop them during ->iop_commmitted? Do we ever want to
+ * relog a log item after _committed, in which case we no longer have
+ * the buffer attached to the new log item.
+ *
+ * If we don't need the name and value after the first commit of the
+ * attrip then it's ok to drop the references in _committed... but that
+ * doesn't make sense, since most of the tx rolling is to prepare the
+ * xattr structure to receive the name and value.
+ *
+ * OTOH -- _committed is called to write things into the AIL. By that
+ * time we are well past formatting things into buffers, right?
+ *
+ * <zzzz tired, brain dead>
+ */
+ new_attrip->attri_own_buffers = old_attrip->attri_own_buffers;
+ old_attrip->attri_own_buffers = false;
xfs_trans_add_item(tp, &new_attrip->attri_item);
set_bit(XFS_LI_DIRTY, &new_attrip->attri_item.li_flags);
@@ -633,10 +679,7 @@ xlog_recover_attri_commit_pass2(
struct xfs_mount *mp = log->l_mp;
struct xfs_attri_log_item *attrip;
struct xfs_attri_log_format *attri_formatp;
- char *name = NULL;
- char *value = NULL;
int region = 0;
- int buffer_size;
attri_formatp = item->ri_buf[region].i_addr;
@@ -646,11 +689,9 @@ xlog_recover_attri_commit_pass2(
return -EFSCORRUPTED;
}
- buffer_size = attri_formatp->alfi_name_len +
- attri_formatp->alfi_value_len;
-
/* memory alloc failure will cause replay to abort */
- attrip = xfs_attri_init(mp, buffer_size);
+ attrip = xfs_attri_init(mp, attri_formatp->alfi_name_len,
+ attri_formatp->alfi_value_len);
if (attrip == NULL)
return -ENOMEM;
@@ -662,11 +703,10 @@ xlog_recover_attri_commit_pass2(
attrip->attri_name_len = attri_formatp->alfi_name_len;
attrip->attri_value_len = attri_formatp->alfi_value_len;
region++;
- name = ((char *)attrip) + sizeof(struct xfs_attri_log_item);
- memcpy(name, item->ri_buf[region].i_addr, attrip->attri_name_len);
- attrip->attri_name = name;
+ memcpy(attrip->attri_name, item->ri_buf[region].i_addr,
+ attrip->attri_name_len);
- if (!xfs_attr_namecheck(name, attrip->attri_name_len)) {
+ if (!xfs_attr_namecheck(attrip->attri_name, attrip->attri_name_len)) {
XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
error = -EFSCORRUPTED;
goto out;
@@ -674,11 +714,8 @@ xlog_recover_attri_commit_pass2(
if (attrip->attri_value_len > 0) {
region++;
- value = ((char *)attrip) + sizeof(struct xfs_attri_log_item) +
- attrip->attri_name_len;
- memcpy(value, item->ri_buf[region].i_addr,
+ memcpy(attrip->attri_value, item->ri_buf[region].i_addr,
attrip->attri_value_len);
- attrip->attri_value = value;
}
/*
@@ -706,7 +743,7 @@ xfs_trans_get_attrd(struct xfs_trans *tp,
ASSERT(tp != NULL);
- attrdp = kmem_cache_alloc(xfs_attrd_cache, GFP_NOFS | __GFP_NOFAIL);
+ attrdp = kmem_cache_zalloc(xfs_attrd_cache, GFP_NOFS | __GFP_NOFAIL);
xfs_log_item_init(tp->t_mountp, &attrdp->attrd_item, XFS_LI_ATTRD,
&xfs_attrd_item_ops);
diff --git a/fs/xfs/xfs_attr_item.h b/fs/xfs/xfs_attr_item.h
index c3b779f82adb..2b690b1d3228 100644
--- a/fs/xfs/xfs_attr_item.h
+++ b/fs/xfs/xfs_attr_item.h
@@ -31,6 +31,9 @@ struct xfs_attri_log_item {
void *attri_name;
void *attri_value;
struct xfs_attri_log_format attri_format;
+
+ /* Do we actually own attri_name/value? */
+ bool attri_own_buffers;
};
/*
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v28 00/15] xfs: Log Attribute Replay
2022-03-09 3:53 ` Darrick J. Wong
@ 2022-03-10 6:13 ` Alli
2022-03-10 6:55 ` Dave Chinner
1 sibling, 0 replies; 22+ messages in thread
From: Alli @ 2022-03-10 6:13 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: linux-xfs
On Tue, 2022-03-08 at 19:53 -0800, Darrick J. Wong wrote:
> On Tue, Mar 01, 2022 at 01:39:36PM -0700, Allison Henderson wrote:
> >
> > On 2/28/22 7:29 PM, Darrick J. Wong wrote:
> > > On Mon, Feb 28, 2022 at 12:51:32PM -0700, Allison Henderson
> > > wrote:
> > > > Hi all,
> > > >
> > > > This set is a subset of a larger series parent pointers.
> > > > Delayed attributes allow
> > > > attribute operations (set and remove) to be logged and
> > > > committed in the same
> > > > way that other delayed operations do. This allows more complex
> > > > operations (like
> > > > parent pointers) to be broken up into multiple smaller
> > > > transactions. To do
> > > > this, the existing attr operations must be modified to operate
> > > > as a delayed
> > > > operation. This means that they cannot roll, commit, or finish
> > > > transactions.
> > > > Instead, they return -EAGAIN to allow the calling function to
> > > > handle the
> > > > transaction. In this series, we focus on only the delayed
> > > > attribute portion.
> > > > We will introduce parent pointers in a later set.
> > > >
> > > > The set as a whole is a bit much to digest at once, so I
> > > > usually send out the
> > > > smaller sub series to reduce reviewer burn out. But the entire
> > > > extended series
> > > > is visible through the included github links.
> > > >
> > > > Updates since v27:
> > > > xfs: don't commit the first deferred transaction without
> > > > intents
> > > > Comment update
> > >
> > > I applied this to 5.16-rc6, and turned on larp mode. generic/476
> > > tripped over something, and this is what kasan had to say:
> > >
> > > [ 835.381655] run fstests generic/476 at 2022-02-28 18:22:04
> > > [ 838.008485] XFS (sdb): Mounting V5 Filesystem
> > > [ 838.035529] XFS (sdb): Ending clean mount
> > > [ 838.040528] XFS (sdb): Quotacheck needed: Please wait.
> > > [ 838.050866] XFS (sdb): Quotacheck: Done.
> > > [ 838.092369] XFS (sdb): EXPERIMENTAL logged extended attributes
> > > feature added. Use at your own risk!
> > > [ 838.092938] general protection fault, probably for non-
> > > canonical address 0xe012f573e6000046: 0000 [#1] PREEMPT SMP KASAN
> > > [ 838.099085] KASAN: maybe wild-memory-access in range
> > > [0x0097cb9f30000230-0x0097cb9f30000237]
> > > [ 838.101148] CPU: 2 PID: 4403 Comm: fsstress Not tainted
> > > 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
> > > [ 838.103757] Hardware name: QEMU Standard PC (Q35 + ICH9,
> > > 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> > > [ 838.105811] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
> > >
> > >
> > > FWIW, gdb says this address is:
> > >
> > > 0xffffffffa06e0739 is in xlog_cil_commit
> > > (fs/xfs/xfs_log_cil.c:237).
> > > 232
> > > 233 /*
> > > 234 * if we have no shadow buffer, or it is
> > > too small, we need to
> > > 235 * reallocate it.
> > > 236 */
> > > 237 if (!lip->li_lv_shadow ||
> > > 238 buf_size > lip->li_lv_shadow-
> > > >lv_size) {
> > > 239 /*
> > > 240 * We free and allocate here as a
> > > realloc would copy
> > > 241 * unnecessary data. We don't use
> > > kvzalloc() for the
> > >
> > > I don't know what this is about, but my guess is that we freed
> > > something
> > > we weren't supposed to...?
> > >
> > > (An overnight fstests run with v27 and larp=0 ran fine,
> > > though...)
> > >
> > > --D
> >
> > Hmm, ok, I will dig into this then. I dont see anything between
> > v27 and v28
> > that would have cause this though, so I'm thinking what ever it is
> > must by
> > intermittent. I'll stick it in a loop and see if I can get a
> > recreate
> > today. Thanks!
>
> I think I've figured out two of the problems here --
>
> The biggest problem is that xfs_attri_init isn't fully initializing
> the
> xattr log item structure, which is why the CIL would crash on my
> system
> when it tried to resize what it thought was the lv_shadow buffer
> attached to the log item. I changed it to kmem_cache_zalloc and the
> problems went away; you might want to check if your kernel has some
> debugging kconfig feature enabled that auto-zeroes everything.
>
Ah, ok. When ever you get a moment, would you mind shooting me a copy
of your kernel config? That might be an easy way to bring together
some of the differences between our testing environments.
> The other KASAN report has to do with the log iovec code -- it
> assumes
> that any buffer passed in has a size that is congruent with 4(?)
> bytes.
> This isn't necessarily true for the xattr name (and in principle also
> the value) buffer that we get from the VFS; if either is (say) 37
> bytes
> long, you'll get 37 bytes, and KASAN will expect you to stick to
> that.
> I think with the way the slab works this isn't a real memory
> corruption
> vector, but I wouldn't put it past slob or someone to actually pack
> things in tightly.
>
> Also, I'm not sure what's going on with the name/value buffers in the
> relog function. I patched it to try to track the buffer references,
> but
> maybe you have a better idea for why we allocate new name/value
> buffers
> for a log item relog? I wasn't sure where those new buffers ever got
> freed, so I <cough> ran it over with a backhoe, and it shows. :/
>
> The following shabby patch helps us to pass generic/475 and
> generic/624
> in LARP mode, though I have no idea if it's correct. You might want
> to
> pay attention to the "XXX:" comments I added, since that's where I
> got
> stuck.
>
> --D
>
Ok, I'll dig through what you have here. Most of what youre saying
makes sense, though you shouldnt have to go through all this leg work
with the iovec sizes. That's supposed to be handled in
xfs_attri_item_format. What ever arbitrary sized buffers are in the
xfs_attri_log_item are supposed to be adjusted there.
In most cases, the name/val buffers are owned by the calling function,
and in fact usually point back to the name/val pointers in the
xfs_da_args. So in that case, the larp code doesnt own that. The idea
is that the calling function just passes the args struct into the
xfs_attr_(set/remove)_deferred which will then create a new
xfs_attr_item, and stores a refrence to the xfs_da_args there. Once
the calling routine finishes up the transaction, it is the callers
responsibility clean up where ever the name/value pair comes from.
When the calling function invokes the defer finish routines, the defer
ops code creates the intent (via the xfs_defer_op_type) which calls
xfs_attr_create_intent. THis initializes and populates the
xfs_attri_log_item with the name/value pointers in the xfs_attr_item
Later the iop code creates the vectors using the xfs_attri_item_size
(referenced through the xfs_item_ops). Once created, it then uses the
xfs_attri_item_format callback to appropriately populate those vectors.
So, it's complex, but mostly I'm just trying to adhere to what the
interfaces expect
NOW.... during a replay or relog this changes slightly. These routines
need to recreate the log items, but unlike the calling function in the
above example, they dont span the transaction from creation to
completion. THey just recreate one item and exit. SO they cant just
use a xfs_da_args on the stack, nor will they be around to free
anything they allocate. In this case, we simply allocate extra space
off the end of the xfs_attri_log_item, store the name/val buffers
there, and adjust the name/val pointers to point to this
location. This is really the only reason why xfs_attri_init has an
extra buffsize parameter at all. So in this case, the name/val buffers
are released at the same time as the item through xfs_attri_item_free.
At least thats how it's supposed to work. Clearly something isnt
following the theory, so I'll go through what you have here and maybe
shoot you back another patch. Thanks for all your help here :-)
Allison
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 41404d35c76c..7a00a43610d5 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -678,6 +678,9 @@ xfs_attr_set(
> {
> struct xfs_inode *dp = args->dp;
> struct xfs_mount *mp = dp->i_mount;
> + void *fakename = NULL, *fakeval = NULL;
> + const void *oldname = args->name;
> + void *oldval = args->value;
> struct xfs_trans_res tres;
> bool rsvd = (args->attr_filter &
> XFS_ATTR_ROOT);
> int error, local;
> @@ -692,6 +695,34 @@ xfs_attr_set(
> if (error)
> return error;
>
> + /*
> + * XXX: the log iovec code requires that every buffer it's
> given has a
> + * size that's an even multiple of four. If this isn't the
> case, create
> + * a shadow buffers so that we don't read past the end of the
> name and
> + * value buffers and trip KASAN.
> + */
> + if (xfs_has_larp(mp) && (args->namelen & 3)) {
> + fakename = kzalloc(roundup(args->namelen, 4),
> + GFP_KERNEL | GFP_NOFS);
> + if (!fakename)
> + return -ENOMEM;
> + memcpy(fakename, args->name, args->namelen);
> + args->name = fakename;
> + }
> +
> + if (xfs_has_larp(mp) && (args->valuelen & 3)) {
> + fakeval = kzalloc(roundup(args->valuelen, 4),
> + GFP_KERNEL | GFP_NOFS);
> + if (!fakeval) {
> + if (fakename)
> + kvfree(fakename);
> + return -ENOMEM;
> + }
> + memcpy(fakeval, args->value, args->valuelen);
> + args->value = fakeval;
> + }
> +
> + //trace_printk("start name 0x%px len 0x%x val 0x%px len 0x%x",
> args->name, args->namelen, args->value, args->valuelen);
> args->geo = mp->m_attr_geo;
> args->whichfork = XFS_ATTR_FORK;
> args->hashval = xfs_da_hashname(args->name, args->namelen);
> @@ -797,6 +828,13 @@ xfs_attr_set(
> drop_incompat:
> if (delayed)
> xlog_drop_incompat_feat(mp->m_log);
> + //trace_printk("end name 0x%px val 0x%px", args->name, args-
> >value);
> + if (fakename)
> + kvfree(fakename);
> + if (fakeval)
> + kvfree(fakeval);
> + args->value = oldval;
> + args->name = oldname;
> return error;
>
> out_trans_cancel:
> @@ -852,6 +890,7 @@ xfs_attr_item_init(
> new->xattri_op_flags = op_flags;
> new->xattri_da_args = args;
>
> + //trace_printk("name 0x%px val 0x%px", args->name, args-
> >value);
> *attr = new;
> return 0;
> }
> diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
> index 5aa7a764d95e..8e365583e265 100644
> --- a/fs/xfs/xfs_attr_item.c
> +++ b/fs/xfs/xfs_attr_item.c
> @@ -43,6 +43,12 @@ STATIC void
> xfs_attri_item_free(
> struct xfs_attri_log_item *attrip)
> {
> + if (attrip->attri_own_buffers) {
> + kvfree(attrip->attri_name);
> + if (attrip->attri_value)
> + kvfree(attrip->attri_value);
> + attrip->attri_own_buffers = false;
> + }
> kmem_free(attrip->attri_item.li_lv_shadow);
> kmem_free(attrip);
> }
> @@ -114,6 +120,8 @@ xfs_attri_item_format(
> if (attrip->attri_value_len > 0)
> attrip->attri_format.alfi_size++;
>
> + //trace_printk("fmt 0x%px name 0x%px val 0x%px", &attrip-
> >attri_format, attrip->attri_name, attrip->attri_value);
> +
> xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_ATTRI_FORMAT,
> &attrip->attri_format,
> sizeof(struct xfs_attri_log_format));
> @@ -158,19 +166,39 @@ xfs_attri_item_release(
> STATIC struct xfs_attri_log_item *
> xfs_attri_init(
> struct xfs_mount *mp,
> - int buffer_size)
> + unsigned int namelen,
> + unsigned int valuelen)
>
> {
> struct xfs_attri_log_item *attrip;
> + unsigned int buffer_size;
>
> - if (buffer_size) {
> - attrip = kmem_alloc(sizeof(struct xfs_attri_log_item) +
> - buffer_size, KM_NOFS);
> - if (attrip == NULL)
> + attrip = kmem_cache_zalloc(xfs_attri_cache, GFP_NOFS |
> __GFP_NOFAIL);
> +
> + if (valuelen)
> + ASSERT(namelen != 0);
> +
> + if (namelen) {
> + buffer_size = roundup(namelen, 4);
> + attrip->attri_name = kzalloc(buffer_size,
> + GFP_KERNEL | GFP_NOFS |
> __GFP_RETRY_MAYFAIL);
> + if (!attrip->attri_name) {
> + kmem_cache_free(xfs_attri_cache, attrip);
> + return NULL;
> + }
> + attrip->attri_own_buffers = true;
> + }
> +
> + if (valuelen) {
> + buffer_size = roundup(valuelen, 4);
> + attrip->attri_value = kzalloc(buffer_size,
> + GFP_KERNEL | GFP_NOFS
> |__GFP_RETRY_MAYFAIL);
> + if (!attrip->attri_value) {
> + if (attrip->attri_name)
> + kvfree(attrip->attri_name);
> + kmem_cache_free(xfs_attri_cache, attrip);
> return NULL;
> - } else {
> - attrip = kmem_cache_alloc(xfs_attri_cache,
> - GFP_NOFS | __GFP_NOFAIL);
> + }
> }
>
> xfs_log_item_init(mp, &attrip->attri_item, XFS_LI_ATTRI,
> @@ -343,6 +371,8 @@ xfs_attr_log_item(
> attrip->attri_value = attr->xattri_da_args->value;
> attrip->attri_name_len = attr->xattri_da_args->namelen;
> attrip->attri_value_len = attr->xattri_da_args->valuelen;
> +
> + //trace_printk("lip 0x%px fmt 0x%px name 0x%px val 0x%px",
> &attrip->attri_item, &attrip->attri_format, attrip->attri_name,
> attrip->attri_value);
> }
>
> /* Get an ATTRI. */
> @@ -362,7 +392,7 @@ xfs_attr_create_intent(
> if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
> return NULL;
>
> - attrip = xfs_attri_init(mp, 0);
> + attrip = xfs_attri_init(mp, 0, 0);
> if (attrip == NULL)
> return NULL;
>
> @@ -434,6 +464,13 @@ xfs_attri_item_committed(
> * committed so these fields are no longer accessed. Clear them
> out of
> * caution since we're about to free the xfs_attr_item.
> */
> + //trace_printk("fmt 0x%px name 0x%px val 0x%px", &attrip-
> >attri_format, attrip->attri_name, attrip->attri_value);
> + if (attrip->attri_own_buffers) {
> + kvfree(attrip->attri_name);
> + if (attrip->attri_value)
> + kvfree(attrip->attri_value);
> + attrip->attri_own_buffers = false;
> + }
> attrip->attri_name = NULL;
> attrip->attri_value = NULL;
>
> @@ -582,17 +619,15 @@ xfs_attri_item_relog(
> struct xfs_attri_log_item *new_attrip;
> struct xfs_attri_log_format *new_attrp;
> struct xfs_attri_log_format *old_attrp;
> - int buffer_size;
>
> old_attrip = ATTRI_ITEM(intent);
> old_attrp = &old_attrip->attri_format;
> - buffer_size = old_attrp->alfi_value_len + old_attrp-
> >alfi_name_len;
>
> tp->t_flags |= XFS_TRANS_DIRTY;
> attrdp = xfs_trans_get_attrd(tp, old_attrip);
> set_bit(XFS_LI_DIRTY, &attrdp->attrd_item.li_flags);
>
> - new_attrip = xfs_attri_init(tp->t_mountp, buffer_size);
> + new_attrip = xfs_attri_init(tp->t_mountp, 0, 0);
> new_attrp = &new_attrip->attri_format;
>
> new_attrp->alfi_ino = old_attrp->alfi_ino;
> @@ -602,19 +637,30 @@ xfs_attri_item_relog(
> new_attrp->alfi_attr_flags = old_attrp->alfi_attr_flags;
>
> new_attrip->attri_name_len = old_attrip->attri_name_len;
> - new_attrip->attri_name = ((char *)new_attrip) +
> - sizeof(struct xfs_attri_log_item);
> - memcpy(new_attrip->attri_name, old_attrip->attri_name,
> - new_attrip->attri_name_len);
> + new_attrip->attri_name = old_attrip->attri_name;
>
> new_attrip->attri_value_len = old_attrip->attri_value_len;
> - if (new_attrip->attri_value_len > 0) {
> - new_attrip->attri_value = new_attrip->attri_name +
> - new_attrip->attri_name_len;
> + if (new_attrip->attri_value_len > 0)
> + new_attrip->attri_value = old_attrip->attri_value;
>
> - memcpy(new_attrip->attri_value, old_attrip-
> >attri_value,
> - new_attrip->attri_value_len);
> - }
> + /*
> + * XXX Err... so who owns the name/value buffer references,
> anyway?
> + * Is it safe to drop them during ->iop_commmitted? Do we ever
> want to
> + * relog a log item after _committed, in which case we no
> longer have
> + * the buffer attached to the new log item.
> + *
> + * If we don't need the name and value after the first commit
> of the
> + * attrip then it's ok to drop the references in _committed...
> but that
> + * doesn't make sense, since most of the tx rolling is to
> prepare the
> + * xattr structure to receive the name and value.
> + *
> + * OTOH -- _committed is called to write things into the
> AIL. By that
> + * time we are well past formatting things into buffers, right?
> + *
> + * <zzzz tired, brain dead>
> + */
> + new_attrip->attri_own_buffers = old_attrip->attri_own_buffers;
> + old_attrip->attri_own_buffers = false;
>
> xfs_trans_add_item(tp, &new_attrip->attri_item);
> set_bit(XFS_LI_DIRTY, &new_attrip->attri_item.li_flags);
> @@ -633,10 +679,7 @@ xlog_recover_attri_commit_pass2(
> struct xfs_mount *mp = log->l_mp;
> struct xfs_attri_log_item *attrip;
> struct xfs_attri_log_format *attri_formatp;
> - char *name = NULL;
> - char *value = NULL;
> int region = 0;
> - int buffer_size;
>
> attri_formatp = item->ri_buf[region].i_addr;
>
> @@ -646,11 +689,9 @@ xlog_recover_attri_commit_pass2(
> return -EFSCORRUPTED;
> }
>
> - buffer_size = attri_formatp->alfi_name_len +
> - attri_formatp->alfi_value_len;
> -
> /* memory alloc failure will cause replay to abort */
> - attrip = xfs_attri_init(mp, buffer_size);
> + attrip = xfs_attri_init(mp, attri_formatp->alfi_name_len,
> + attri_formatp->alfi_value_len);
> if (attrip == NULL)
> return -ENOMEM;
>
> @@ -662,11 +703,10 @@ xlog_recover_attri_commit_pass2(
> attrip->attri_name_len = attri_formatp->alfi_name_len;
> attrip->attri_value_len = attri_formatp->alfi_value_len;
> region++;
> - name = ((char *)attrip) + sizeof(struct xfs_attri_log_item);
> - memcpy(name, item->ri_buf[region].i_addr, attrip-
> >attri_name_len);
> - attrip->attri_name = name;
> + memcpy(attrip->attri_name, item->ri_buf[region].i_addr,
> + attrip->attri_name_len);
>
> - if (!xfs_attr_namecheck(name, attrip->attri_name_len)) {
> + if (!xfs_attr_namecheck(attrip->attri_name, attrip-
> >attri_name_len)) {
> XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
> error = -EFSCORRUPTED;
> goto out;
> @@ -674,11 +714,8 @@ xlog_recover_attri_commit_pass2(
>
> if (attrip->attri_value_len > 0) {
> region++;
> - value = ((char *)attrip) + sizeof(struct
> xfs_attri_log_item) +
> - attrip->attri_name_len;
> - memcpy(value, item->ri_buf[region].i_addr,
> + memcpy(attrip->attri_value, item-
> >ri_buf[region].i_addr,
> attrip->attri_value_len);
> - attrip->attri_value = value;
> }
>
> /*
> @@ -706,7 +743,7 @@ xfs_trans_get_attrd(struct xfs_trans
> *tp,
>
> ASSERT(tp != NULL);
>
> - attrdp = kmem_cache_alloc(xfs_attrd_cache, GFP_NOFS |
> __GFP_NOFAIL);
> + attrdp = kmem_cache_zalloc(xfs_attrd_cache, GFP_NOFS |
> __GFP_NOFAIL);
>
> xfs_log_item_init(tp->t_mountp, &attrdp->attrd_item,
> XFS_LI_ATTRD,
> &xfs_attrd_item_ops);
> diff --git a/fs/xfs/xfs_attr_item.h b/fs/xfs/xfs_attr_item.h
> index c3b779f82adb..2b690b1d3228 100644
> --- a/fs/xfs/xfs_attr_item.h
> +++ b/fs/xfs/xfs_attr_item.h
> @@ -31,6 +31,9 @@ struct xfs_attri_log_item {
> void *attri_name;
> void *attri_value;
> struct xfs_attri_log_format attri_format;
> +
> + /* Do we actually own attri_name/value? */
> + bool attri_own_buffers;
> };
>
> /*
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v28 00/15] xfs: Log Attribute Replay
2022-03-09 3:53 ` Darrick J. Wong
2022-03-10 6:13 ` Alli
@ 2022-03-10 6:55 ` Dave Chinner
2022-03-10 7:35 ` Dave Chinner
1 sibling, 1 reply; 22+ messages in thread
From: Dave Chinner @ 2022-03-10 6:55 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Allison Henderson, linux-xfs
On Tue, Mar 08, 2022 at 07:53:51PM -0800, Darrick J. Wong wrote:
> On Tue, Mar 01, 2022 at 01:39:36PM -0700, Allison Henderson wrote:
> >
> >
> > On 2/28/22 7:29 PM, Darrick J. Wong wrote:
> > > On Mon, Feb 28, 2022 at 12:51:32PM -0700, Allison Henderson wrote:
> > > > Hi all,
> > > >
> > > > This set is a subset of a larger series parent pointers. Delayed attributes allow
> > > > attribute operations (set and remove) to be logged and committed in the same
> > > > way that other delayed operations do. This allows more complex operations (like
> > > > parent pointers) to be broken up into multiple smaller transactions. To do
> > > > this, the existing attr operations must be modified to operate as a delayed
> > > > operation. This means that they cannot roll, commit, or finish transactions.
> > > > Instead, they return -EAGAIN to allow the calling function to handle the
> > > > transaction. In this series, we focus on only the delayed attribute portion.
> > > > We will introduce parent pointers in a later set.
> > > >
> > > > The set as a whole is a bit much to digest at once, so I usually send out the
> > > > smaller sub series to reduce reviewer burn out. But the entire extended series
> > > > is visible through the included github links.
> > > >
> > > > Updates since v27:
> > > > xfs: don't commit the first deferred transaction without intents
> > > > Comment update
> > >
> > > I applied this to 5.16-rc6, and turned on larp mode. generic/476
> > > tripped over something, and this is what kasan had to say:
> > >
> > > [ 835.381655] run fstests generic/476 at 2022-02-28 18:22:04
> > > [ 838.008485] XFS (sdb): Mounting V5 Filesystem
> > > [ 838.035529] XFS (sdb): Ending clean mount
> > > [ 838.040528] XFS (sdb): Quotacheck needed: Please wait.
> > > [ 838.050866] XFS (sdb): Quotacheck: Done.
> > > [ 838.092369] XFS (sdb): EXPERIMENTAL logged extended attributes feature added. Use at your own risk!
> > > [ 838.092938] general protection fault, probably for non-canonical address 0xe012f573e6000046: 0000 [#1] PREEMPT SMP KASAN
> > > [ 838.099085] KASAN: maybe wild-memory-access in range [0x0097cb9f30000230-0x0097cb9f30000237]
> > > [ 838.101148] CPU: 2 PID: 4403 Comm: fsstress Not tainted 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
> > > [ 838.103757] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> > > [ 838.105811] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
> > >
> > >
> > > FWIW, gdb says this address is:
> > >
> > > 0xffffffffa06e0739 is in xlog_cil_commit (fs/xfs/xfs_log_cil.c:237).
> > > 232
> > > 233 /*
> > > 234 * if we have no shadow buffer, or it is too small, we need to
> > > 235 * reallocate it.
> > > 236 */
> > > 237 if (!lip->li_lv_shadow ||
> > > 238 buf_size > lip->li_lv_shadow->lv_size) {
> > > 239 /*
> > > 240 * We free and allocate here as a realloc would copy
> > > 241 * unnecessary data. We don't use kvzalloc() for the
> > >
> > > I don't know what this is about, but my guess is that we freed something
> > > we weren't supposed to...?
> > >
> > > (An overnight fstests run with v27 and larp=0 ran fine, though...)
> > >
> > > --D
> >
> > Hmm, ok, I will dig into this then. I dont see anything between v27 and v28
> > that would have cause this though, so I'm thinking what ever it is must by
> > intermittent. I'll stick it in a loop and see if I can get a recreate
> > today. Thanks!
>
> I think I've figured out two of the problems here --
>
> The biggest problem is that xfs_attri_init isn't fully initializing the
> xattr log item structure, which is why the CIL would crash on my system
> when it tried to resize what it thought was the lv_shadow buffer
> attached to the log item. I changed it to kmem_cache_zalloc and the
> problems went away; you might want to check if your kernel has some
> debugging kconfig feature enabled that auto-zeroes everything.
>
> The other KASAN report has to do with the log iovec code -- it assumes
> that any buffer passed in has a size that is congruent with 4(?) bytes.
> This isn't necessarily true for the xattr name (and in principle also
> the value) buffer that we get from the VFS; if either is (say) 37 bytes
> long, you'll get 37 bytes, and KASAN will expect you to stick to that.
> I think with the way the slab works this isn't a real memory corruption
> vector, but I wouldn't put it past slob or someone to actually pack
> things in tightly.
This seems ... familiar. ISTR I fixed this issue and send out
patches to address it some time ago.
Ah, yes, I did - for v24 of the LARP patchset.
https://lore.kernel.org/linux-xfs/20210901073039.844617-1-david@fromorbit.com/
Patch 3 fixed the log iovec rounding constraint:
https://lore.kernel.org/linux-xfs/20210901073039.844617-1-david@fromorbit.com/
and patch 4 fixed the iovec sizing problems for attribute intents:
https://lore.kernel.org/linux-xfs/20210901073039.844617-1-david@fromorbit.com/
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v28 00/15] xfs: Log Attribute Replay
2022-03-10 6:55 ` Dave Chinner
@ 2022-03-10 7:35 ` Dave Chinner
0 siblings, 0 replies; 22+ messages in thread
From: Dave Chinner @ 2022-03-10 7:35 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Allison Henderson, linux-xfs
On Thu, Mar 10, 2022 at 05:55:25PM +1100, Dave Chinner wrote:
> On Tue, Mar 08, 2022 at 07:53:51PM -0800, Darrick J. Wong wrote:
> > On Tue, Mar 01, 2022 at 01:39:36PM -0700, Allison Henderson wrote:
> > >
> > >
> > > On 2/28/22 7:29 PM, Darrick J. Wong wrote:
> > > > On Mon, Feb 28, 2022 at 12:51:32PM -0700, Allison Henderson wrote:
> > > > > Hi all,
> > > > >
> > > > > This set is a subset of a larger series parent pointers. Delayed attributes allow
> > > > > attribute operations (set and remove) to be logged and committed in the same
> > > > > way that other delayed operations do. This allows more complex operations (like
> > > > > parent pointers) to be broken up into multiple smaller transactions. To do
> > > > > this, the existing attr operations must be modified to operate as a delayed
> > > > > operation. This means that they cannot roll, commit, or finish transactions.
> > > > > Instead, they return -EAGAIN to allow the calling function to handle the
> > > > > transaction. In this series, we focus on only the delayed attribute portion.
> > > > > We will introduce parent pointers in a later set.
> > > > >
> > > > > The set as a whole is a bit much to digest at once, so I usually send out the
> > > > > smaller sub series to reduce reviewer burn out. But the entire extended series
> > > > > is visible through the included github links.
> > > > >
> > > > > Updates since v27:
> > > > > xfs: don't commit the first deferred transaction without intents
> > > > > Comment update
> > > >
> > > > I applied this to 5.16-rc6, and turned on larp mode. generic/476
> > > > tripped over something, and this is what kasan had to say:
> > > >
> > > > [ 835.381655] run fstests generic/476 at 2022-02-28 18:22:04
> > > > [ 838.008485] XFS (sdb): Mounting V5 Filesystem
> > > > [ 838.035529] XFS (sdb): Ending clean mount
> > > > [ 838.040528] XFS (sdb): Quotacheck needed: Please wait.
> > > > [ 838.050866] XFS (sdb): Quotacheck: Done.
> > > > [ 838.092369] XFS (sdb): EXPERIMENTAL logged extended attributes feature added. Use at your own risk!
> > > > [ 838.092938] general protection fault, probably for non-canonical address 0xe012f573e6000046: 0000 [#1] PREEMPT SMP KASAN
> > > > [ 838.099085] KASAN: maybe wild-memory-access in range [0x0097cb9f30000230-0x0097cb9f30000237]
> > > > [ 838.101148] CPU: 2 PID: 4403 Comm: fsstress Not tainted 5.17.0-rc5-djwx #rc5 63f7e400b85b2245f2d4d3033e82ec8bc95c49fd
> > > > [ 838.103757] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> > > > [ 838.105811] RIP: 0010:xlog_cil_commit+0x2f9/0x2800 [xfs]
> > > >
> > > >
> > > > FWIW, gdb says this address is:
> > > >
> > > > 0xffffffffa06e0739 is in xlog_cil_commit (fs/xfs/xfs_log_cil.c:237).
> > > > 232
> > > > 233 /*
> > > > 234 * if we have no shadow buffer, or it is too small, we need to
> > > > 235 * reallocate it.
> > > > 236 */
> > > > 237 if (!lip->li_lv_shadow ||
> > > > 238 buf_size > lip->li_lv_shadow->lv_size) {
> > > > 239 /*
> > > > 240 * We free and allocate here as a realloc would copy
> > > > 241 * unnecessary data. We don't use kvzalloc() for the
> > > >
> > > > I don't know what this is about, but my guess is that we freed something
> > > > we weren't supposed to...?
> > > >
> > > > (An overnight fstests run with v27 and larp=0 ran fine, though...)
> > > >
> > > > --D
> > >
> > > Hmm, ok, I will dig into this then. I dont see anything between v27 and v28
> > > that would have cause this though, so I'm thinking what ever it is must by
> > > intermittent. I'll stick it in a loop and see if I can get a recreate
> > > today. Thanks!
> >
> > I think I've figured out two of the problems here --
> >
> > The biggest problem is that xfs_attri_init isn't fully initializing the
> > xattr log item structure, which is why the CIL would crash on my system
> > when it tried to resize what it thought was the lv_shadow buffer
> > attached to the log item. I changed it to kmem_cache_zalloc and the
> > problems went away; you might want to check if your kernel has some
> > debugging kconfig feature enabled that auto-zeroes everything.
> >
> > The other KASAN report has to do with the log iovec code -- it assumes
> > that any buffer passed in has a size that is congruent with 4(?) bytes.
> > This isn't necessarily true for the xattr name (and in principle also
> > the value) buffer that we get from the VFS; if either is (say) 37 bytes
> > long, you'll get 37 bytes, and KASAN will expect you to stick to that.
> > I think with the way the slab works this isn't a real memory corruption
> > vector, but I wouldn't put it past slob or someone to actually pack
> > things in tightly.
>
> This seems ... familiar. ISTR I fixed this issue and send out
> patches to address it some time ago.
>
> Ah, yes, I did - for v24 of the LARP patchset.
>
> https://lore.kernel.org/linux-xfs/20210901073039.844617-1-david@fromorbit.com/
>
> Patch 3 fixed the log iovec rounding constraint:
>
> https://lore.kernel.org/linux-xfs/20210901073039.844617-1-david@fromorbit.com/
>
> and patch 4 fixed the iovec sizing problems for attribute intents:
>
> https://lore.kernel.org/linux-xfs/20210901073039.844617-1-david@fromorbit.com/
And in starting a forward port of the intent whiteout series that
contains these fixes, I realised that these atches are also
dependent on the xlog-write-rework series I just reposted a day ago.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 22+ messages in thread