aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWen Jin <wenx.jin@intel.com>2016-03-22 11:21:48 +0800
committerAndi Kleen <ak@linux.intel.com>2016-04-11 15:32:38 -0700
commit3344e067bcf3679bf25797fdf0689b7dd76465dd (patch)
treef65a0bf87892fbe77a453d0a9a3a6ee8a0018c13
parent859ed51f7dc37275a3609d4e4bb60463a578919e (diff)
downloadmce-test-3344e067bcf3679bf25797fdf0689b7dd76465dd.tar.gz
Remove unused codes about simple_process
Remove simple_process and related codes. Signed-off-by: Wen Jin <wenx.jin@intel.com> Signed-off-by: Chen, Gong <gong.chen@linux.intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--cases/function/kvm/README12
-rw-r--r--cases/function/kvm/guest/guest_run_simple.sh42
-rwxr-xr-xcases/function/kvm/host/host_run.sh2
-rw-r--r--tools/Makefile3
-rw-r--r--tools/simple_process/Makefile9
-rw-r--r--tools/simple_process/simple_process.c15
6 files changed, 5 insertions, 78 deletions
diff --git a/cases/function/kvm/README b/cases/function/kvm/README
index 938bbbc..eca2fc0 100644
--- a/cases/function/kvm/README
+++ b/cases/function/kvm/README
@@ -42,12 +42,10 @@ KVM RAS Test Suite has following dependencies on kernel and other tools:
source (2.6.32+, $KERNEL_SRC/Documentation/vm/page-types.c or
3.3+ $KERNEL_SRC/tools/vm/page-types.c).
-* simple_process:
- A process constantly access the allocated memeory.
- Located under mce-test/tools/simple_process/.
-
* victim
- Play a role like *simple_process* but more powerful.
+ Play a role as "victim" in error injection but has more powerful function,
+ such as virtual address translated into physical address.
+ Located under mce-test/tools/victim/.
* qemu-img:
QEMU disk image utility.
@@ -106,7 +104,7 @@ Host virtual address is 7fbfe9ea7
Host physical address is 0x8092a7000
calling mce-inject /root/mce-test/cases/function/kvm/host/mce_inject_data
Guest physical klog address is 0x6e0a7
-localhost.localdomain login: MCE 0x6e0a7: Killing simple_process:3230 due to hardware memory corruption
+localhost.localdomain login: MCE 0x6e0a7: Killing victim:2273 due to hardware memory corruption
MCE 0x6e0a7: recovery action for dirty LRU page: Recovered
PASS: Inject error into guest!
PASS: Guest System alive!
@@ -125,7 +123,7 @@ MCE 0x806324: dirty LRU page recovery: Recovered
GUEST system dmesg:
...
[Hardware Error]: Machine check events logged
-MCE 0x75925: Killing simple_process:2273 early due to hardware memory corruption
+MCE 0x75925: Killing victim:2273 early due to hardware memory corruption
MCE 0x75925: dirty LRU page recovery : Recovered
...
diff --git a/cases/function/kvm/guest/guest_run_simple.sh b/cases/function/kvm/guest/guest_run_simple.sh
deleted file mode 100644
index fe72819..0000000
--- a/cases/function/kvm/guest/guest_run_simple.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Test script for SRAO error injection
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; version
-# 2.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should find a copy of v2 of the GNU General Public License somewhere
-# on your Linux system; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Copyright (C) 2010, Intel Corp.
-# Author: Jiajia Zheng <jiajia.zheng@intel.com>
-#
-
-killall simple_process
-cat /dev/null > /var/log/mcelog
-sleep 1
-
-cd GUEST_DIR/simple_process
-gcc -o simple_process simple_process.c
-cd ../page-types
-gcc -o page-types page-types.c
-cd ..
-
-./simple_process/simple_process > /dev/null &
-sleep 1
-
-./page-types/page-types -p `pidof simple_process` -LN -b anon > guest_page
-if [ -s guest_page ]; then
- ADDR_KLOG=`awk 'NR > 3 {print "0x"$2}' guest_page | sed -n -e '1p'`
- ADDR=`echo $ADDR_KLOG"000"`
- echo "guest physical address is $ADDR" > guest_tmp
-fi
-
diff --git a/cases/function/kvm/host/host_run.sh b/cases/function/kvm/host/host_run.sh
index 3f87aca..cb648b3 100755
--- a/cases/function/kvm/host/host_run.sh
+++ b/cases/function/kvm/host/host_run.sh
@@ -144,9 +144,7 @@ do
esac
done
-#script_simple=guest_run_simple.sh
script_victim=guest_run_victim.sh
-#guest_script_simple=$GUEST_DIR/$script_simple
guest_script_victim=$GUEST_DIR/$script_victim
guest_tmp=$GUEST_DIR/guest_tmp
guest_page=$GUEST_DIR/guest_page
diff --git a/tools/Makefile b/tools/Makefile
index 0b4030e..dac2eea 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,17 +1,14 @@
all:
- $(MAKE) -C simple_process
$(MAKE) -C ltp-pan
$(MAKE) -C page-types
$(MAKE) -C victim
install:
- $(MAKE) -C simple_process install
$(MAKE) -C ltp-pan install
$(MAKE) -C page-types install
$(MAKE) -C victim install
clean:
- $(MAKE) -C simple_process clean
$(MAKE) -C ltp-pan clean
$(MAKE) -C page-types clean
$(MAKE) -C victim clean
diff --git a/tools/simple_process/Makefile b/tools/simple_process/Makefile
deleted file mode 100644
index 8a0ee28..0000000
--- a/tools/simple_process/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CFLAGS := -g -Wall
-
-simple_process: simple_process.o
-
-install: simple_process
- cp -f simple_process ../../bin
-
-clean:
- rm -f simple_process *.o
diff --git a/tools/simple_process/simple_process.c b/tools/simple_process/simple_process.c
deleted file mode 100644
index 66f945f..0000000
--- a/tools/simple_process/simple_process.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-int main(void)
-{
- void *p = malloc(0x100000);
-
- printf("allocating 1M bytes of memory\n");
- while (1) {
- memset(p, 0, 0x100000);
- }
- return 0;
-}