aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Dezhu <dezhux.zhang@intel.com>2019-03-27 13:32:05 -0700
committerAndi Kleen <ak@linux.intel.com>2019-03-27 13:49:40 -0700
commit533f091f0eedbe6ee0fbcc4358a7a789f710100b (patch)
tree9b52bb2ce4d80864bdf5d39bde76c58cc84d166c
parentffd5c0d397a7d645e252c2474a50ec2390bd15e7 (diff)
downloadmce-test-533f091f0eedbe6ee0fbcc4358a7a789f710100b.tar.gz
mce-test: Unload possible EDAC drivers to avoid interference.
EDAC drivers sometimes claim to handle memory errors. When this happens, those errors do not appear in mcelog. We already have tests to check for the sb_edac driver. Add a check for the Skylake driver (skx_edac). Signed-off-by: Zhang Dezhu <dezhux.zhang@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rwxr-xr-xcases/function/core_recovery/srar_recovery.sh3
-rwxr-xr-xcases/function/kvm/host/host_run.sh3
-rwxr-xr-xcases/function/pfa/run_pfa.sh3
3 files changed, 9 insertions, 0 deletions
diff --git a/cases/function/core_recovery/srar_recovery.sh b/cases/function/core_recovery/srar_recovery.sh
index 44d1f81..7fbcecc 100755
--- a/cases/function/core_recovery/srar_recovery.sh
+++ b/cases/function/core_recovery/srar_recovery.sh
@@ -64,6 +64,9 @@ if [ $? -eq 0 ]; then
else
cat /proc/modules | grep -q sb_edac
[ $? -eq 0 ] && EDAC_TYPE="sb_edac"
+elif
+ cat /proc/modules | grep -q skx_edac
+ [ $? -eq 0 ] && EDAC_TYPE="skx_edac"
fi
rmmod $EDAC_TYPE >/dev/null 2>&1
diff --git a/cases/function/kvm/host/host_run.sh b/cases/function/kvm/host/host_run.sh
index cb648b3..d58ab68 100755
--- a/cases/function/kvm/host/host_run.sh
+++ b/cases/function/kvm/host/host_run.sh
@@ -79,6 +79,9 @@ rm_edac()
else
cat /proc/modules | grep -q sb_edac
[ $? -eq 0 ] && EDAC_TYPE="sb_edac"
+ elif
+ cat /proc/modules | grep -q skx_edac
+ [ $? -eq 0 ] && EDAC_TYPE="skx_edac"
fi
rmmod $EDAC_TYPE >/dev/null 2>&1
}
diff --git a/cases/function/pfa/run_pfa.sh b/cases/function/pfa/run_pfa.sh
index e1e9347..2dcdc1f 100755
--- a/cases/function/pfa/run_pfa.sh
+++ b/cases/function/pfa/run_pfa.sh
@@ -64,6 +64,9 @@ main()
else
cat /proc/modules | grep -q sb_edac
[ $? -eq 0 ] && EDAC_TYPE="sb_edac"
+ elif
+ cat /proc/modules | grep -q skx_edac
+ [ $? -eq 0 ] && EDAC_TYPE="skx_edac"
fi
rmmod $EDAC_TYPE >/dev/null 2>&1