Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-18 01:20:05 +0200
committerAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-18 01:20:05 +0200
commit4c318bed347f7f04a4c5afd1ae5562c13b2962ca (patch)
tree272395f949f14986be09a3e10e37df2ccfc39ffb
parent9a1c1d3a1a77329aab68e261b80b45a14b1e13c8 (diff)
- xfs: expose errortag knobs via sysfs (bsc#1114427).
- Refresh patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch.
-rw-r--r--patches.fixes/xfs-expose-errortag-knobs-via-sysfs.patch244
-rw-r--r--patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch6
-rw-r--r--series.conf1
3 files changed, 248 insertions, 3 deletions
diff --git a/patches.fixes/xfs-expose-errortag-knobs-via-sysfs.patch b/patches.fixes/xfs-expose-errortag-knobs-via-sysfs.patch
new file mode 100644
index 0000000000..0b86e0b326
--- /dev/null
+++ b/patches.fixes/xfs-expose-errortag-knobs-via-sysfs.patch
@@ -0,0 +1,244 @@
+From c684010115221978b17968dbddc8e31a09da85e7 Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <darrick.wong@oracle.com>
+Date: Tue, 20 Jun 2017 17:54:47 -0700
+Subject: [PATCH] xfs: expose errortag knobs via sysfs
+Git-commit: c684010115221978b17968dbddc8e31a09da85e7
+Patch-mainline: v4.13-rc1
+References: bsc#1114427
+
+Creates a /sys/fs/xfs/$dev/errortag/ directory to control the errortag
+values directly. This enables us to control the randomness values,
+rather than having to accept the defaults.
+
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Reviewed-by: Brian Foster <bfoster@redhat.com>
+Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
+Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+
+---
+ fs/xfs/xfs_error.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ fs/xfs/xfs_error.h | 1 +
+ fs/xfs/xfs_mount.h | 1 +
+ 3 files changed, 157 insertions(+), 1 deletion(-)
+
+diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
+index 52f75bc1abac..e2278af6aed1 100644
+--- a/fs/xfs/xfs_error.c
++++ b/fs/xfs/xfs_error.c
+@@ -22,6 +22,7 @@
+ #include "xfs_trans_resv.h"
+ #include "xfs_mount.h"
+ #include "xfs_error.h"
++#include "xfs_sysfs.h"
+
+ #ifdef DEBUG
+
+@@ -56,6 +57,145 @@ static unsigned int xfs_errortag_random_default[] = {
+ XFS_RANDOM_AG_RESV_CRITICAL,
+ };
+
++struct xfs_errortag_attr {
++ struct attribute attr;
++ unsigned int tag;
++};
++
++static inline struct xfs_errortag_attr *
++to_attr(struct attribute *attr)
++{
++ return container_of(attr, struct xfs_errortag_attr, attr);
++}
++
++static inline struct xfs_mount *
++to_mp(struct kobject *kobject)
++{
++ struct xfs_kobj *kobj = to_kobj(kobject);
++
++ return container_of(kobj, struct xfs_mount, m_errortag_kobj);
++}
++
++STATIC ssize_t
++xfs_errortag_attr_store(
++ struct kobject *kobject,
++ struct attribute *attr,
++ const char *buf,
++ size_t count)
++{
++ struct xfs_mount *mp = to_mp(kobject);
++ struct xfs_errortag_attr *xfs_attr = to_attr(attr);
++ int ret;
++ unsigned int val;
++
++ if (strcmp(buf, "default") == 0) {
++ val = xfs_errortag_random_default[xfs_attr->tag];
++ } else {
++ ret = kstrtouint(buf, 0, &val);
++ if (ret)
++ return ret;
++ }
++
++ ret = xfs_errortag_set(mp, xfs_attr->tag, val);
++ if (ret)
++ return ret;
++ return count;
++}
++
++STATIC ssize_t
++xfs_errortag_attr_show(
++ struct kobject *kobject,
++ struct attribute *attr,
++ char *buf)
++{
++ struct xfs_mount *mp = to_mp(kobject);
++ struct xfs_errortag_attr *xfs_attr = to_attr(attr);
++
++ return snprintf(buf, PAGE_SIZE, "%u\n",
++ xfs_errortag_get(mp, xfs_attr->tag));
++}
++
++static const struct sysfs_ops xfs_errortag_sysfs_ops = {
++ .show = xfs_errortag_attr_show,
++ .store = xfs_errortag_attr_store,
++};
++
++#define XFS_ERRORTAG_ATTR_RW(_name, _tag) \
++static struct xfs_errortag_attr xfs_errortag_attr_##_name = { \
++ .attr = {.name = __stringify(_name), \
++ .mode = VERIFY_OCTAL_PERMISSIONS(S_IWUSR | S_IRUGO) }, \
++ .tag = (_tag), \
++}
++
++#define XFS_ERRORTAG_ATTR_LIST(_name) &xfs_errortag_attr_##_name.attr
++
++XFS_ERRORTAG_ATTR_RW(noerror, XFS_ERRTAG_NOERROR);
++XFS_ERRORTAG_ATTR_RW(iflush1, XFS_ERRTAG_IFLUSH_1);
++XFS_ERRORTAG_ATTR_RW(iflush2, XFS_ERRTAG_IFLUSH_2);
++XFS_ERRORTAG_ATTR_RW(iflush3, XFS_ERRTAG_IFLUSH_3);
++XFS_ERRORTAG_ATTR_RW(iflush4, XFS_ERRTAG_IFLUSH_4);
++XFS_ERRORTAG_ATTR_RW(iflush5, XFS_ERRTAG_IFLUSH_5);
++XFS_ERRORTAG_ATTR_RW(iflush6, XFS_ERRTAG_IFLUSH_6);
++XFS_ERRORTAG_ATTR_RW(dareadbuf, XFS_ERRTAG_DA_READ_BUF);
++XFS_ERRORTAG_ATTR_RW(btree_chk_lblk, XFS_ERRTAG_BTREE_CHECK_LBLOCK);
++XFS_ERRORTAG_ATTR_RW(btree_chk_sblk, XFS_ERRTAG_BTREE_CHECK_SBLOCK);
++XFS_ERRORTAG_ATTR_RW(readagf, XFS_ERRTAG_ALLOC_READ_AGF);
++XFS_ERRORTAG_ATTR_RW(readagi, XFS_ERRTAG_IALLOC_READ_AGI);
++XFS_ERRORTAG_ATTR_RW(itobp, XFS_ERRTAG_ITOBP_INOTOBP);
++XFS_ERRORTAG_ATTR_RW(iunlink, XFS_ERRTAG_IUNLINK);
++XFS_ERRORTAG_ATTR_RW(iunlinkrm, XFS_ERRTAG_IUNLINK_REMOVE);
++XFS_ERRORTAG_ATTR_RW(dirinovalid, XFS_ERRTAG_DIR_INO_VALIDATE);
++XFS_ERRORTAG_ATTR_RW(bulkstat, XFS_ERRTAG_BULKSTAT_READ_CHUNK);
++XFS_ERRORTAG_ATTR_RW(logiodone, XFS_ERRTAG_IODONE_IOERR);
++XFS_ERRORTAG_ATTR_RW(stratread, XFS_ERRTAG_STRATREAD_IOERR);
++XFS_ERRORTAG_ATTR_RW(stratcmpl, XFS_ERRTAG_STRATCMPL_IOERR);
++XFS_ERRORTAG_ATTR_RW(diowrite, XFS_ERRTAG_DIOWRITE_IOERR);
++XFS_ERRORTAG_ATTR_RW(bmapifmt, XFS_ERRTAG_BMAPIFORMAT);
++XFS_ERRORTAG_ATTR_RW(free_extent, XFS_ERRTAG_FREE_EXTENT);
++XFS_ERRORTAG_ATTR_RW(rmap_finish_one, XFS_ERRTAG_RMAP_FINISH_ONE);
++XFS_ERRORTAG_ATTR_RW(refcount_continue_update, XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE);
++XFS_ERRORTAG_ATTR_RW(refcount_finish_one, XFS_ERRTAG_REFCOUNT_FINISH_ONE);
++XFS_ERRORTAG_ATTR_RW(bmap_finish_one, XFS_ERRTAG_BMAP_FINISH_ONE);
++XFS_ERRORTAG_ATTR_RW(ag_resv_critical, XFS_ERRTAG_AG_RESV_CRITICAL);
++
++static struct attribute *xfs_errortag_attrs[] = {
++ XFS_ERRORTAG_ATTR_LIST(noerror),
++ XFS_ERRORTAG_ATTR_LIST(iflush1),
++ XFS_ERRORTAG_ATTR_LIST(iflush2),
++ XFS_ERRORTAG_ATTR_LIST(iflush3),
++ XFS_ERRORTAG_ATTR_LIST(iflush4),
++ XFS_ERRORTAG_ATTR_LIST(iflush5),
++ XFS_ERRORTAG_ATTR_LIST(iflush6),
++ XFS_ERRORTAG_ATTR_LIST(dareadbuf),
++ XFS_ERRORTAG_ATTR_LIST(btree_chk_lblk),
++ XFS_ERRORTAG_ATTR_LIST(btree_chk_sblk),
++ XFS_ERRORTAG_ATTR_LIST(readagf),
++ XFS_ERRORTAG_ATTR_LIST(readagi),
++ XFS_ERRORTAG_ATTR_LIST(itobp),
++ XFS_ERRORTAG_ATTR_LIST(iunlink),
++ XFS_ERRORTAG_ATTR_LIST(iunlinkrm),
++ XFS_ERRORTAG_ATTR_LIST(dirinovalid),
++ XFS_ERRORTAG_ATTR_LIST(bulkstat),
++ XFS_ERRORTAG_ATTR_LIST(logiodone),
++ XFS_ERRORTAG_ATTR_LIST(stratread),
++ XFS_ERRORTAG_ATTR_LIST(stratcmpl),
++ XFS_ERRORTAG_ATTR_LIST(diowrite),
++ XFS_ERRORTAG_ATTR_LIST(bmapifmt),
++ XFS_ERRORTAG_ATTR_LIST(free_extent),
++ XFS_ERRORTAG_ATTR_LIST(rmap_finish_one),
++ XFS_ERRORTAG_ATTR_LIST(refcount_continue_update),
++ XFS_ERRORTAG_ATTR_LIST(refcount_finish_one),
++ XFS_ERRORTAG_ATTR_LIST(bmap_finish_one),
++ XFS_ERRORTAG_ATTR_LIST(ag_resv_critical),
++ NULL,
++};
++
++struct kobj_type xfs_errortag_ktype = {
++ .release = xfs_sysfs_release,
++ .sysfs_ops = &xfs_errortag_sysfs_ops,
++ .default_attrs = xfs_errortag_attrs,
++};
++
+ int
+ xfs_errortag_init(
+ struct xfs_mount *mp)
+@@ -64,13 +204,16 @@ xfs_errortag_init(
+ KM_SLEEP | KM_MAYFAIL);
+ if (!mp->m_errortag)
+ return -ENOMEM;
+- return 0;
++
++ return xfs_sysfs_init(&mp->m_errortag_kobj, &xfs_errortag_ktype,
++ &mp->m_kobj, "errortag");
+ }
+
+ void
+ xfs_errortag_del(
+ struct xfs_mount *mp)
+ {
++ xfs_sysfs_del(&mp->m_errortag_kobj);
+ kmem_free(mp->m_errortag);
+ }
+
+@@ -95,6 +238,17 @@ xfs_errortag_test(
+ return true;
+ }
+
++int
++xfs_errortag_get(
++ struct xfs_mount *mp,
++ unsigned int error_tag)
++{
++ if (error_tag >= XFS_ERRTAG_MAX)
++ return -EINVAL;
++
++ return mp->m_errortag[error_tag];
++}
++
+ int
+ xfs_errortag_set(
+ struct xfs_mount *mp,
+diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
+index b4316d39e1ca..8915bdeb6128 100644
+--- a/fs/xfs/xfs_error.h
++++ b/fs/xfs/xfs_error.h
+@@ -138,6 +138,7 @@ extern bool xfs_errortag_test(struct xfs_mount *mp, const char *expression,
+ #define XFS_TEST_ERROR(expr, mp, tag, rf) \
+ ((expr) || xfs_errortag_test((mp), #expr, __FILE__, __LINE__, (tag)))
+
++extern int xfs_errortag_get(struct xfs_mount *mp, unsigned int error_tag);
+ extern int xfs_errortag_set(struct xfs_mount *mp, unsigned int error_tag,
+ unsigned int tag_value);
+ extern int xfs_errortag_add(struct xfs_mount *mp, unsigned int error_tag);
+diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
+index e002ac52a4e6..931e9fc21a1c 100644
+--- a/fs/xfs/xfs_mount.h
++++ b/fs/xfs/xfs_mount.h
+@@ -204,6 +204,7 @@ typedef struct xfs_mount {
+ * error triggers. 1 = always, 2 = half the time, etc.
+ */
+ unsigned int *m_errortag;
++ struct xfs_kobj m_errortag_kobj;
+
+ /*
+ * DEBUG mode instrumentation to test and/or trigger delayed allocation
+--
+2.16.4
+
diff --git a/patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch b/patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch
index 2299b68e7d..0ebf252f9a 100644
--- a/patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch
+++ b/patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch
@@ -203,7 +203,7 @@ Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
/*
--- a/fs/xfs/libxfs/xfs_rmap.c
+++ b/fs/xfs/libxfs/xfs_rmap.c
-@@ -2086,8 +2086,7 @@
+@@ -2087,8 +2087,7 @@
startoff, blockcount, state);
if (XFS_TEST_ERROR(false, mp,
@@ -223,8 +223,8 @@ Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+#define XFS_TEST_ERROR(expr, mp, tag) \
((expr) || xfs_errortag_test((mp), #expr, __FILE__, __LINE__, (tag)))
- extern int xfs_errortag_set(struct xfs_mount *mp, unsigned int error_tag,
-@@ -145,7 +145,7 @@
+ extern int xfs_errortag_get(struct xfs_mount *mp, unsigned int error_tag);
+@@ -146,7 +146,7 @@
#else
#define xfs_errortag_init(mp) (0)
#define xfs_errortag_del(mp)
diff --git a/series.conf b/series.conf
index 4a292b4cdc..94c5654964 100644
--- a/series.conf
+++ b/series.conf
@@ -3566,6 +3566,7 @@
patches.fixes/xfs-check-if-an-inode-is-cached-and-allocated.patch
patches.fixes/xfs-reflink-find-shared-should-take-a-transaction.patch
patches.fixes/xfs-make-errortag-a-per-mountpoint-structure.patch
+ patches.fixes/xfs-expose-errortag-knobs-via-sysfs.patch
patches.fixes/xfs-remove-unneeded-parameter-from-XFS_TEST_ERROR.patch
patches.fixes/xfs-rewrite-xfs_dq_get_next_id-using-xfs_iext_lookup.patch
patches.fixes/vfs-Add-page_cache_seek_hole_data-helper.patch