christoph/fail-targets
1
Fork 0
Code Releases Activity

Update Makefile to current generic-experiment options

Browse Source
This commit is contained in:
Christian Dietrich
2020-12-15 10:11:41 +01:00
parent 8ae363d559
commit 4e38acc05e
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@ -1,3 +1,13 @@
FAIL_DIR ?= ~/fail
FAIL_BIN ?= ${FAIL_DIR}/build/bin
BOCHS_RUNNER ?= python ${FAIL_DIR}/tools/bochs-experiment-runner/bochs-experiment-runner.py
FAIL_SERVER ?= ${FAIL_BIN}/generic-experiment-server
FAIL_TRACE ?= ${FAIL_BIN}/fail-generic-tracing
FAIL_INJECT ?= ${FAIL_BIN}/fail-generic-experiment
FAIL_IMPORT ?= ${FAIL_BIN}/import-trace
FAIL_PRUNE ?= ${FAIL_BIN}/prune-trace
all: main/system.iso all: main/system.iso
@ -28,12 +38,13 @@ startup.o: startup.s
trace-%: %/system.elf %/system.iso trace-%: %/system.elf %/system.iso
bochs-experiment-runner.py -e $< -i $(shell dirname $<)/system.iso -1 \ ${BOCHS_RUNNER} -e $< -i $(shell dirname $<)/system.iso -1 \
-V vgabios.bin -b BIOS-bochs-latest \ -V vgabios.bin -b BIOS-bochs-latest \
-f fail-x86-tracing -- \ -f ${FAIL_TRACE} -- \
-Wf,--start-symbol=os_main \ -Wf,--start-symbol=os_main \
-Wf,--save-symbol=os_main \ -Wf,--save-symbol=os_main \
-Wf,--end-symbol=stop_trace \ -Wf,--end-symbol=stop_trace \
-Wf,--check-bounds \
-Wf,--state-file=$(shell dirname $<)/state \ -Wf,--state-file=$(shell dirname $<)/state \
-Wf,--trace-file=$(shell dirname $<)/trace.pb -Wf,--elf-file=$< -q -Wf,--trace-file=$(shell dirname $<)/trace.pb -Wf,--elf-file=$< -q
@echo "****************************************************************\n\ @echo "****************************************************************\n\
@ -48,14 +59,14 @@ trace-%: %/system.elf %/system.iso
import-%: %/trace.pb import-%: %/trace.pb
import-trace -t $< -i mem -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b mem ${FAIL_IMPORT} -t $< -i mem -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b mem
import-trace -t $< -i regs -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b regs --flags ${FAIL_IMPORT} -t $< -i regs -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b regs --flags
import-trace -t $< -i regs -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b ip --no-gp --ip ${FAIL_IMPORT} -t $< -i regs -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b ip --no-gp --ip
import-trace -t $< -i ElfImporter --objdump objdump -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b ip ${FAIL_IMPORT} -t $< -i ElfImporter --objdump objdump -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b ip
import-trace -t $< -i ElfImporter --objdump objdump -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b mem ${FAIL_IMPORT} -t $< -i ElfImporter --objdump objdump -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b mem
import-trace -t $< -i ElfImporter --objdump objdump -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b regs ${FAIL_IMPORT} -t $< -i ElfImporter --objdump objdump -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b regs
prune-trace -v $(shell dirname $<) -b %% --overwrite ${FAIL_PRUNE} -v $(shell dirname $<) -b %% --overwrite
@echo "****************************************************************\n\ @echo "****************************************************************\n\
* The golden run sits now within the MySQL database. If you are interested,\n\ * The golden run sits now within the MySQL database. If you are interested,\n\
@ -69,20 +80,21 @@ import-%: %/trace.pb
****************************************************************" ****************************************************************"
server-%: server-%:
generic-experiment-server -v $(subst server-,,$@) -b % ${FAIL_SERVER} -v $(subst server-,,$@) -b %
client-%: client-%:
bochs-experiment-runner.py -e $(subst client-,,$@)/system.elf \ ${BOCHS_RUNNER} -e $(subst client-,,$@)/system.elf \
-j $(shell getconf _NPROCESSORS_ONLN) \ -j $(shell getconf _NPROCESSORS_ONLN) \
-i $(subst client-,,$@)/system.iso \ -i $(subst client-,,$@)/system.iso \
-V vgabios.bin -b BIOS-bochs-latest \ -V vgabios.bin -b BIOS-bochs-latest \
-f generic-experiment-client -- \ -f ${FAIL_INJECT} -- \
-Wf,--state-dir=$(subst client-,,$@)/state \ -Wf,--state-dir=$(subst client-,,$@)/state \
-Wf,--trap -Wf,--timeout=10 \ -Wf,--trap -Wf,--timeout=10 \
-Wf,--ok-marker=stop_trace \ -Wf,--ok-marker=stop_trace \
-Wf,--fail-marker=fail_marker \ -Wf,--fail-marker=fail_marker \
-Wf,--catch-write-textsegment \ -Wf,--catch-write-textsegment \
-Wf,--catch-write-outerspace 2>/dev/null | grep -C 4 'INJECT' -Wf,--catch-outerspace \
2>/dev/null | grep -B 2 -A 8 'INJECT'
@echo "****************************************************************\n\ @echo "****************************************************************\n\
* Congratiulations! You've run your first FAIL* injection campaign.\n\ * Congratiulations! You've run your first FAIL* injection campaign.\n\