Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Added shadow page handling, IO and MSR bitmap allocation, and started
[palacios.git] / palacios / build / Makefile
index 40593da..a80ec28 100644 (file)
@@ -3,7 +3,7 @@
 #  Northwestern University 
 # (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
 # (c) 2008, Peter Dinda <pdinda@northwestern.edu> 
-# (c) 2008, Lei Xia <xiaxlei@gmail.com>
+# (c) 2008, Lei Xia <lxia@northwestern.edu>
 # (c) 2008, The V3VEE Project <http://www.v3vee.org> 
 #
 # Based on GeekOS Makefile:
@@ -17,7 +17,6 @@
 # Required software to build GeekOS:
 # - GNU Make (http://www.gnu.org/software/make)
 # - gcc 2.95.2 generating code for target (i386/ELF) and host platforms
-# - nasm (http://nasm.sourceforge.net)
 # - Perl5, AWK (any version), egrep
 #
 # Cygwin (http://cygwin.com) may be used to build GeekOS.
@@ -54,24 +53,34 @@ VPATH := $(PROJECT_ROOT)/src
 # 
 
 ifeq ($(LEAN_AND_MEAN),1) 
-DEBUG=0
-DEBUG_SECTIONS=
+DEBUG := 0
+DEBUG_SECTIONS :=
 else
-DEBUG=1
-DEBUG_SECTIONS= 
+DEBUG := 1
+DEBUG_SECTIONS := 
 endif
 
 
 ifeq ($(DEBUG_ALL),1)
-  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC -DDEBUG_RAMDISK -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
+  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
+# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_IDE
 endif
 
+
 ifeq ($(DEBUG_SHADOW_PAGING),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING
 else 
 ifeq ($(DEBUG_SHADOW_PAGING),0) 
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_SHADOW_PAGING
 endif
+
+endif
+ifeq ($(DEBUG_NESTED_PAGING),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NESTED_PAGING
+else 
+ifeq ($(DEBUG_NESTED_PAGING),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NESTED_PAGING
+endif
 endif
 
 ifeq ($(DEBUG_CTRL_REGS),1)
@@ -146,19 +155,11 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_EMULATOR
 endif
 endif
 
-ifeq ($(DEBUG_RAMDISK),1)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK
+ifeq ($(DEBUG_IDE),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IDE
 else 
-ifeq ($(DEBUG_RAMDISK),0) 
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK
-endif
-endif
-
-ifeq ($(TRACE_RAMDISK),1)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTRACE_RAMDISK
-else
-ifeq ($(TRACE_RAMDSK),0)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UTRACE_RAMDISK
+ifeq ($(DEBUG_IDE),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IDE
 endif
 endif
 
@@ -178,6 +179,22 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_HALT
 endif
 endif
 
+ifeq ($(DEBUG_APIC),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_APIC
+else 
+ifeq ($(DEBUG_APIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_APIC
+endif
+endif
+
+ifeq ($(DEBUG_PCI),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PCI
+else 
+ifeq ($(DEBUG_PCI),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PCI
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -186,6 +203,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_DEV_MGR
 endif
 endif
 
+ifeq ($(DEBUG_NE2K),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NE2K
+else 
+ifeq ($(DEBUG_NE2K),0)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NE2K
+endif
+endif
+
 #DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
 
 ifeq ($(DEBUG),1)
@@ -195,25 +220,6 @@ else
 endif
 
 
-#
-# DECODER is the decoder that will be used 
-# currently we only support xed
-#
-DECODER=XED
-
-DECODER_FLAGS=
-DECODER_SRCS=
-DECODER_LIBS=
-
-ifeq ($(DECODER),XED)
-DECODER_SRCS := vmm_xed.c
-DECODER_FLAGS :=  -L../lib/xed
-DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed.a
-else
-# This is an error
-endif
-
-
 
 
 
@@ -235,6 +241,16 @@ endif
 
 
 
+ifeq ($(INSTRUMENT_VMM),1)
+  EXTRA_C_OPTS:= -DINSTRUMENT_VMM
+  INSTRUMENT_OPT := -finstrument-functions
+  OBJ_FILES := palacios/vmm_instrument.o
+else
+  INSTRUMENT_OPT := 
+endif
+
+CFLAGS = -fno-stack-protector
+
 
 # ----------------------------------------------------------------------
 # Configuration -
@@ -247,59 +263,106 @@ endif
 # List of targets to build by default.
 # These targets encompass everything needed to boot
 # and run GeekOS.
-ALL_TARGETS := vmm vm_kernel
-
-
-
-
-
-
-VMM_ASM_SRCS :=  svm_lowlevel.asm vmm_lowlevel.asm\
-#                      vmx_lowlevel.asm
-
-VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
-
-
-VMM_C_SRCS :=   vm_guest.c \
-               svm.c svm_handler.c vmm.c vmm_util.c vmm_ctrl_regs.c \
-               vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.c \
-               vmm_intr.c vmm_time.c \
-               vmm_shadow_paging.c vm_guest_mem.c  \
-                vm_dev.c vmm_dev_mgr.c vmm_decoder.c \
-                svm_halt.c svm_pause.c svm_wbinvd.c \
-               vmm_config.c vmm_hashtable.c \
-               vmm_string.c vmm_emulator.c vmm_queue.c\
-               vmm_host_events.c \
-                $(DECODER_SRCS)
-#              vmx.c vmcs_gen.c vmcs.c
-
-VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
-
-VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
-
-
-
-XED_C_SRCS := v3-xed-compat.c
-
-XED_C_OBJS := $(XED_C_SRCS:%.c=xed/%.o)
-
-XED_GAS_SRCS := v3-udiv-compat.s
-
-XED_GAS_OBJS := $(XED_GAS_SRCS:%.s=xed/%.o)
-
-XED_OBJS := $(XED_C_OBJS) $(XED_GAS_OBJS)
-
-
-
-DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c
-
-DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
-
-DEVICE_OBJS := $(DEVICE_C_OBJS)
-
-V3LIBS := $(DECODER_LIBS)
-
-
+ALL_TARGETS := vmm force_payload
+
+
+VMM_OBJS := \
+       palacios/vm_guest.o \
+       palacios/svm.o \
+       palacios/svm_handler.o \
+       palacios/vmm.o \
+       palacios/vmm_util.o \
+       palacios/vmm_ctrl_regs.o \
+       palacios/vmcb.o \
+       palacios/vmm_mem.o \
+       palacios/vmm_paging.o \
+       palacios/vmm_io.o \
+       palacios/vmm_debug.o \
+       palacios/svm_io.o \
+       palacios/vmm_intr.o \
+       palacios/vmm_excp.o \
+       palacios/vmm_time.o \
+       palacios/vmm_shadow_paging.o \
+       palacios/vm_guest_mem.o \
+       palacios/vmm_dev_mgr.o \
+       palacios/vmm_decoder.o \
+       palacios/svm_halt.o \
+       palacios/svm_pause.o \
+       palacios/svm_wbinvd.o \
+       palacios/vmm_config.o \
+       palacios/vmm_hashtable.o \
+       palacios/vmm_string.o \
+       palacios/vmm_emulator.o \
+       palacios/vmm_sprintf.o \
+       palacios/vmm_queue.o \
+       palacios/vmm_host_events.o \
+       palacios/svm_lowlevel.o \
+       palacios/vmm_msr.o \
+       palacios/svm_msr.o \
+       palacios/vmm_socket.o \
+       palacios/vmm_xed.o \
+       palacios/vmm_rbtree.o \
+       palacios/vmm_profiler.o \
+       palacios/vmm_direct_paging.o \
+       palacios/vmm_ringbuffer.o \
+       palacios/vmm_hypercall.o \
+       palacios/vmm_lock.o \
+       palacios/vmx.o \
+       palacios/vmcs.o \
+       palacios/vmx_handler.o \
+       palacios/vmx_lowlevel.o \
+       palacios/vmxassist.o \
+       palacios/vmx_io.o \
+       palacios/vmx_msr.o \
+       $(OBJ_FILES)
+
+
+# Extra C flags for the VMM objects
+$(VMM_OBJS) :: EXTRA_CFLAGS = \
+       $(JRLDEBUG) $(CFLAGS) -DVMXASSIST_PATH="\"../build/vmxassist\"" \
+
+
+
+XED_OBJS := \
+       xed/v3-xed-compat.o \
+       xed/v3-udiv-compat.o \
+
+$(XED_OBJS) :: EXTRA_CFLAGS = \
+       $(JRLDEBUG) $(CFLAGS)\
+
+DEVICES_OBJS := \
+       devices/generic.o \
+       devices/keyboard.o \
+       devices/nvram.o \
+       devices/timer.o \
+       devices/simple_pic.o \
+       devices/8259a.o \
+       devices/8254.o \
+       devices/serial.o \
+       devices/bochs_debug.o \
+       devices/os_debug.o \
+       devices/apic.o  \
+       devices/io_apic.o \
+       devices/pci.o \
+       devices/para_net.o \
+       devices/ide.o \
+       devices/ram_cd.o \
+       devices/ram_hd.o \
+       devices/i440fx.o \
+       devices/piix3.o \
+       devices/net_cd.o \
+       devices/net_hd.o \
+       devices/lnx_virtio_blk.o \
+       devices/lnx_virtio_balloon.o \
+       devices/sym_swap.o \
+
+#      devices/ne2k.o  \
+#      devices/cdrom.o \
+#      devices/ramdisk.o \
+#      devices/vnic.o \
+
+$(DEVICES_OBJS) :: EXTRA_CFLAGS = \
+       $(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -308,16 +371,28 @@ V3LIBS := $(DECODER_LIBS)
 #   This section defines programs that are used to build GeekOS.
 # ----------------------------------------------------------------------
 
-
+ifeq ($(ARCH),64)
+V3_ARCH := __V3_64BIT__
+else 
 V3_ARCH := __V3_32BIT__
-#V3_ARCH := __V3_64BIT__
+endif
+
+
+ifeq ($(CRAY_XT),1)
+EXTRA_C_OPTS := $(EXTRA_C_OPTS) -DCRAY_XT
+endif
+
 
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
 #TARGET_CC_PREFIX :=  i386-elf-
 
 # Target C compiler.  gcc 2.95.2 or later should work.
+ifeq ($(ARCH),64)
+TARGET_CC := $(TARGET_CC_PREFIX)gcc -m64
+else 
 TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32
+endif
 #TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
 
 
@@ -340,7 +415,15 @@ TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
 #NASM := /opt/vmm-tools/bin/nasm
 
+CPP := cpp
+
+
+ifeq ($(ARCH),64)
+AS = as --64
+else 
 AS = as --32
+endif
+
 
 # Tool to build PFAT filesystem images.
 BUILDFAT := tools/builtFat.exe
@@ -367,18 +450,24 @@ FD_SECTORS_PER_TRACK := $(PERL) $(PROJECT_ROOT)/scripts/numsecs_per_track
 # ----------------------------------------------------------------------
 
 # Flags used for all C source files
-#GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC #-fvisibility=hidden
-GENERAL_OPTS :=  -O -Wall  $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC -Werror#-fvisibility=hidden
-CC_GENERAL_OPTS := $(GENERAL_OPTS) 
-
-# Flags used for VMM C source files
-CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include -D__V3VEE__ -D$(V3_ARCH) $(DECODER_FLAGS) $(JRLDEBUG)
-
-# Flags used for VMM C ASM files
-NASM_VMM_OPTS := -I$(PROJECT_ROOT)/src/palacios/ -f elf $(EXTRA_NASM_OPTS)
-
-
 
+CC_GENERAL_OPTS = \
+       -O \
+       -Wall \
+       -g \
+       -D__V3VEE__ \
+       -D$(V3_ARCH) \
+       $(EXTRA_C_OPTS) \
+       $(VMM_FLAGS) \
+       -I$(PROJECT_ROOT)/include \
+       -Werror \
+       -fPIC \
+       -mno-red-zone \
+       -Wp,-MD,$(@D)/.$(@F).d \
+       -Wp,-MT,$@ \
+
+#-fPIC \
+#-fvisibility=hidden
 
 
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
@@ -389,26 +478,53 @@ OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
 #   Describes how to compile the source files.
 # ----------------------------------------------------------------------
 
-
-
-palacios/%.o : palacios/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o palacios/$*.o
-
-palacios/%.o : palacios/%.asm
-       $(NASM) $(NASM_VMM_OPTS) $< -o palacios/$*.o
-
-devices/%.o : devices/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o devices/$*.o
-
-devices/%.o : devices/%.asm
-       $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o
-
-
-xed/%.o : xed/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o xed/$*.o
-
-xed/%.o : xed/%.s
-       $(AS) $< -o xed/$*.o
+# Compilation of kernel C source files
+# Usage:
+#      $(call build,TAG,commandline)
+#
+# If V=1 on the command line or the environment, then the actual
+# command executed will be echoed to the terminal.  Otherwise
+# only the tag and the output file will be printed to make
+# any warnings stand out from the compile messages.
+#
+build = \
+       @if [ -z "$V" ]; then \
+               echo '    [$1]  $@'; \
+               $2; \
+       else \
+               echo '$2'; \
+               $2; \
+       fi
+
+
+
+CC_COMPILE = \
+       $(call build,CC,$(TARGET_CC) \
+               $(CC_GENERAL_OPTS) \
+               $(EXTRA_CFLAGS) \
+               -c \
+               $< \
+               -o $@ \
+               $(INSTRUMENT_OPT) \
+       )
+
+AS_COMPILE = \
+       $(call build,AS,$(TARGET_CC) \
+               $(CC_GENERAL_OPTS) \
+               $(EXTRA_CFLAGS) \
+               -c \
+               $< \
+               -o $@ \
+               $(INSTRUMENT_OPT) \
+       )
+
+
+%.o: %.c
+       $(CC_COMPILE)
+%.o: %.S
+       $(AS_COMPILE)
+%.o: %.s
+       $(AS_COMPILE)
 
 
 # ----------------------------------------------------------------------
@@ -439,14 +555,11 @@ rombios_link:
 vgabios_link:
        ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
+vmxassist_link:
+       ln -s -f ../src/vmboot/vmxassist/vmxassist.bin vmxassist
 
-force_rombios: rombios_link
-       (cd ../src/vmboot/rombios; make clean; make)
 
-force_vgabios: vgabios_link
-       (cd ../src/vmboot/vgabios; make clean; make)
-
-force_payload: force_rombios force_vgabios
+force_payload: rombios_link vgabios_link vmxassist_link
        ../scripts/make_payload.pl payload_layout.txt vm_kernel
 
 inter1: force_payload
@@ -465,15 +578,13 @@ palacios/vmm.bin : palacios/vmm.lib
 
 
 # The kernel executable and symbol map.
-palacios/vmm.lib: $(VMM_OBJS) $(DEVICE_OBJS) $(XED_OBJS) vm_kernel
-#      $(TARGET_LD) -o palacios/vmm.lib  \
-#              $(DECODER_FLAGS) \
-#               $(VMM_OBJS) $(DEVICE_OBJS) $(XED_OBJS) $(V3LIBS) -b binary vm_kernel
-#      $(TARGET_NM) palacios/vmm.lib > palacios/vmm.syms
-       $(TARGET_AR) rcs libv3vee.a  \
-                $(VMM_OBJS) $(DEVICE_OBJS) $(XED_OBJS)
-
+palacios/vmm.lib: libv3vee.a
+libv3vee.a: \
+       $(VMM_OBJS) \
+       $(DEVICES_OBJS) \
+       $(XED_OBJS) \
 
+       $(call build,AR,$(TARGET_AR) rcs $@ $^)
 
 force:
 
@@ -483,26 +594,11 @@ force:
 
 # Clean build directories of generated files
 clean :
-       for d in palacios devices; do \
-               (cd $$d && rm -f *); \
+       for d in palacios devices xed; do \
+               (cd $$d && rm -f * .*.d); \
        done
+       rm -f libv3vee.a
 
 
-# Build header file dependencies, so source files are recompiled when
-# header files they depend on are modified.
-depend : $(GENERATED_LIBC_SRCS)
-
-       $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) \
-               $(VMM_C_SRCS:%.c=$(PROJECT_ROOT)/src/palacios/%.c) \
-               | $(PERL) -n -e 's,^(\S),palacios/$$1,;print' \
-               >> depend.mak
-       $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) \
-               $(DEVICE_C_SRCS:%.c=$(PROJECT_ROOT)/src/devices/%.c) \
-               | $(PERL) -n -e 's,^(\S),devices/$$1,;print' \
-               >> depend.mak
-
-# By default, there are no header file dependencies.
-depend.mak :
-       touch $@
-
-include depend.mak
+# Include all of the generated dependency files if they exist
+-include */.*.o.d