LU-3271 lov: only dump header in lsm_lmm_verify

If lsm_lmm_verify_*() find an error in the lov_mds_md header
structure, don't dump the full stripe information, since this
can be totally bogus (e.g. if stripe_count == -1 or similar).
Instead, just dump the header information for debugging.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Idf8c8bc35b156181aff9f0c5f0ea1f73c89e33d1
Reviewed-on: http://review.whamcloud.com/6261
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: John Hammond <johnlockwoodhammond@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index a2a9c13..af18014 100644 (file)
--- a/lustre/lov/lov_ea.c
+++ b/lustre/lov/lov_ea.c
@@ -61,33 +61,32 @@ struct lovea_unpack_args {
 static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,
                                  __u16 stripe_count)
 {
-
-        if (stripe_count == 0 || stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {
-                CERROR("bad stripe count %d\n", stripe_count);
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
+       if (stripe_count == 0 || stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {
+               CERROR("bad stripe count %d\n", stripe_count);
+               lov_dump_lmm_common(D_WARNING, lmm);
+               return -EINVAL;
+       }
 
        if (lmm_oi_id(&lmm->lmm_oi) == 0) {
                CERROR("zero object id\n");
-               lov_dump_lmm(D_WARNING, lmm);
+               lov_dump_lmm_common(D_WARNING, lmm);
                return -EINVAL;
        }
 
-        if (lmm->lmm_pattern != cpu_to_le32(LOV_PATTERN_RAID0)) {
-                CERROR("bad striping pattern\n");
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
+       if (lmm->lmm_pattern != cpu_to_le32(LOV_PATTERN_RAID0)) {
+               CERROR("bad striping pattern\n");
+               lov_dump_lmm_common(D_WARNING, lmm);
+               return -EINVAL;
+       }
 
-        if (lmm->lmm_stripe_size == 0 ||
-             (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {
-                CERROR("bad stripe size %u\n",
-                       le32_to_cpu(lmm->lmm_stripe_size));
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
-        return 0;
+       if (lmm->lmm_stripe_size == 0 ||
+           (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {
+               CERROR("bad stripe size %u\n",
+                      le32_to_cpu(lmm->lmm_stripe_size));
+               lov_dump_lmm_common(D_WARNING, lmm);
+               return -EINVAL;
+       }
+       return 0;
 }
 
 struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size)
@@ -195,22 +194,22 @@ static void lov_tgt_maxbytes(struct lov_tgt_desc *tgt, __u64 *stripe_maxbytes)
 static int lsm_lmm_verify_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes,
                              __u16 *stripe_count)
 {
-        if (lmm_bytes < sizeof(*lmm)) {
-                CERROR("lov_mds_md_v1 too small: %d, need at least %d\n",
-                       lmm_bytes, (int)sizeof(*lmm));
-                return -EINVAL;
-        }
+       if (lmm_bytes < sizeof(*lmm)) {
+               CERROR("lov_mds_md_v1 too small: %d, need at least %d\n",
+                      lmm_bytes, (int)sizeof(*lmm));
+               return -EINVAL;
+       }
 
-        *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
+       *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
 
-        if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V1)) {
-                CERROR("LOV EA V1 too small: %d, need %d\n",
-                       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V1));
-                lov_dump_lmm_v1(D_WARNING, lmm);
-                return -EINVAL;
-        }
+       if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V1)) {
+               CERROR("LOV EA V1 too small: %d, need %d\n",
+                      lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V1));
+               lov_dump_lmm_common(D_WARNING, lmm);
+               return -EINVAL;
+       }
 
-        return lsm_lmm_verify_common(lmm, lmm_bytes, *stripe_count);
+       return lsm_lmm_verify_common(lmm, lmm_bytes, *stripe_count);
 }
 
 int lsm_unpackmd_v1(struct lov_obd *lov, struct lov_stripe_md *lsm,
@@ -261,27 +260,27 @@ const struct lsm_operations lsm_v1_ops = {
 static int lsm_lmm_verify_v3(struct lov_mds_md *lmmv1, int lmm_bytes,
                              __u16 *stripe_count)
 {
-        struct lov_mds_md_v3 *lmm;
+       struct lov_mds_md_v3 *lmm;
 
-        lmm = (struct lov_mds_md_v3 *)lmmv1;
+       lmm = (struct lov_mds_md_v3 *)lmmv1;
 
-        if (lmm_bytes < sizeof(*lmm)) {
-                CERROR("lov_mds_md_v3 too small: %d, need at least %d\n",
-                       lmm_bytes, (int)sizeof(*lmm));
-                return -EINVAL;
-        }
+       if (lmm_bytes < sizeof(*lmm)) {
+               CERROR("lov_mds_md_v3 too small: %d, need at least %d\n",
+                      lmm_bytes, (int)sizeof(*lmm));
+               return -EINVAL;
+       }
 
-        *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
+       *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
 
-        if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V3)) {
-                CERROR("LOV EA V3 too small: %d, need %d\n",
-                       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V3));
-                lov_dump_lmm_v3(D_WARNING, lmm);
-                return -EINVAL;
-        }
+       if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V3)) {
+               CERROR("LOV EA V3 too small: %d, need %d\n",
+                      lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V3));
+               lov_dump_lmm_common(D_WARNING, lmm);
+               return -EINVAL;
+       }
 
-        return lsm_lmm_verify_common((struct lov_mds_md_v1 *)lmm, lmm_bytes,
-                                     *stripe_count);
+       return lsm_lmm_verify_common((struct lov_mds_md_v1 *)lmm, lmm_bytes,
+                                    *stripe_count);
 }
 
 int lsm_unpackmd_v3(struct lov_obd *lov, struct lov_stripe_md *lsm,

diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h
index 7fd880d..d9ac87c 100644 (file)
--- a/lustre/lov/lov_internal.h
+++ b/lustre/lov/lov_internal.h
@@ -271,6 +271,7 @@ int lov_free_memmd(struct lov_stripe_md **lsmp);
 
 void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm);
 void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm);
+void lov_dump_lmm_common(int level, void *lmmp);
 void lov_dump_lmm(int level, void *lmm);
 
 /* lov_ea.c */

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index f2da472..47e0127 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -54,7 +54,7 @@
 
 #include "lov_internal.h"
 
-static void lov_dump_lmm_common(int level, void *lmmp)
+void lov_dump_lmm_common(int level, void *lmmp)
 {
        struct lov_mds_md *lmm = lmmp;
        struct ost_id   oi;
@@ -77,6 +77,7 @@ static void lov_dump_lmm_objects(int level, struct lov_ost_data *lod,
        if (stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {
                CDEBUG(level, "bad stripe_count %u > max_stripe_count %u\n",
                       stripe_count, LOV_V1_INSANE_STRIPE_COUNT);
+               return;
        }
 
        for (i = 0; i < stripe_count; ++i, ++lod) {