Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53b78538 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

staging/lustre/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.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3271
Lustre-change: http://review.whamcloud.com/6261


Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarJohn Hammond <johnlockwoodhammond@gmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 498dde79

drivers/staging/lustre/lustre/lov/lov_ea.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -57,22 +57,21 @@ struct lovea_unpack_args { 
static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,

static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,

				 __u16 stripe_count)

				 __u16 stripe_count)

{

{



	if (stripe_count == 0 || stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {

	if (stripe_count == 0 || stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {

		CERROR("bad stripe count %d\n", stripe_count);

		CERROR("bad stripe count %d\n", stripe_count);

		lov_dump_lmm(D_WARNING, lmm);

		lov_dump_lmm_common(D_WARNING, lmm);

		return -EINVAL;

		return -EINVAL;

	}

	}





	if (lmm_oi_id(&lmm->lmm_oi) == 0) {

	if (lmm_oi_id(&lmm->lmm_oi) == 0) {

		CERROR("zero object id\n");

		CERROR("zero object id\n");

		lov_dump_lmm(D_WARNING, lmm);

		lov_dump_lmm_common(D_WARNING, lmm);

		return -EINVAL;

		return -EINVAL;

	}

	}





	if (lmm->lmm_pattern != cpu_to_le32(LOV_PATTERN_RAID0)) {

	if (lmm->lmm_pattern != cpu_to_le32(LOV_PATTERN_RAID0)) {

		CERROR("bad striping pattern\n");

		CERROR("bad striping pattern\n");

		lov_dump_lmm(D_WARNING, lmm);

		lov_dump_lmm_common(D_WARNING, lmm);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -80,7 +79,7 @@ static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes, 
	    (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {

	    (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {

		CERROR("bad stripe size %u\n",

		CERROR("bad stripe size %u\n",

		       le32_to_cpu(lmm->lmm_stripe_size));

		       le32_to_cpu(lmm->lmm_stripe_size));

		lov_dump_lmm(D_WARNING, lmm);

		lov_dump_lmm_common(D_WARNING, lmm);

		return -EINVAL;

		return -EINVAL;

	}

	}

	return 0;

	return 0;
@@ -202,7 +201,7 @@ static int lsm_lmm_verify_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes, 
	if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V1)) {

	if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V1)) {

		CERROR("LOV EA V1 too small: %d, need %d\n",

		CERROR("LOV EA V1 too small: %d, need %d\n",

		       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V1));

		       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V1));

		lov_dump_lmm_v1(D_WARNING, lmm);

		lov_dump_lmm_common(D_WARNING, lmm);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -272,7 +271,7 @@ static int lsm_lmm_verify_v3(struct lov_mds_md *lmmv1, int lmm_bytes, 
	if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V3)) {

	if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V3)) {

		CERROR("LOV EA V3 too small: %d, need %d\n",

		CERROR("LOV EA V3 too small: %d, need %d\n",

		       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V3));

		       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V3));

		lov_dump_lmm_v3(D_WARNING, lmm);

		lov_dump_lmm_common(D_WARNING, lmm);

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/staging/lustre/lustre/lov/lov_internal.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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_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_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);

void lov_dump_lmm(int level, void *lmm);





/* lov_ea.c */

/* lov_ea.c */

drivers/staging/lustre/lustre/lov/lov_pack.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 




#include "lov_internal.h"

#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 lov_mds_md *lmm = lmmp;

	struct ost_id	oi;

	struct ost_id	oi;
@@ -74,6 +74,7 @@ static void lov_dump_lmm_objects(int level, struct lov_ost_data *lod, 
	if (stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {

	if (stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {

		CDEBUG(level, "bad stripe_count %u > max_stripe_count %u\n",

		CDEBUG(level, "bad stripe_count %u > max_stripe_count %u\n",

		       stripe_count, LOV_V1_INSANE_STRIPE_COUNT);

		       stripe_count, LOV_V1_INSANE_STRIPE_COUNT);

		return;

	}

	}





	for (i = 0; i < stripe_count; ++i, ++lod) {

	for (i = 0; i < stripe_count; ++i, ++lod) {