Merge pull request #108 from kryptoslogic/linux

Added support for Linux hosts

Author: raphaelning

.gitignore

@@ -1,2 +1,6 @@
 # macOS
 .DS_Store
+
+# Linux
+*.o
+*.cmd

.travis.yml

@@ -13,6 +13,20 @@ matrix:
         - cd platforms/darwin
         - xcodebuild -configuration Debug -sdk macosx10.14
 
+    - name: "haxm-linux"
+      os: linux
+      dist: trusty
+      sudo: false
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get install -y linux-headers-`uname -r`
+        - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nasm/nasm_2.13.02-0.1_amd64.deb
+        - sudo apt-get install -y dpkg
+        - sudo dpkg -i nasm_2.13.02-0.1_amd64.deb
+      script:
+        - cd platforms/linux
+        - make -j$(nproc)
+
   exclude: # TODO: Currently TravisCI does not support full VS/EWDK on Windows
     - name: "haxm-windows"
       os: windows

README.md

@@ -13,6 +13,7 @@ release, you can get it [here][github-haxm-latest-release].
 ## Usage
 
 Detailed instructions for building and testing HAXM can be found at:
+* [Manual for Linux](docs/manual-linux.md)
 * [Manual for macOS](docs/manual-macos.md)
 * [Manual for Windows](docs/manual-windows.md)
 

core/cpu.c

@@ -520,7 +520,7 @@ uint32_t load_vmcs(struct vcpu_t *vcpu, preempt_flag *flags)
     /* when wake up from sleep, we need the barrier, as vm operation
      * are not serialized instructions.
      */
-    smp_mb();
+    hax_smp_mb();
 
     cpu_data = current_cpu_data();
 

core/ept.c

@@ -328,7 +328,7 @@ static void invept_smpfunc(struct invept_bundle *bundle)
 {
     struct per_cpu_data *cpu_data;
 
-    smp_mb();
+    hax_smp_mb();
     cpu_data = current_cpu_data();
     cpu_data->invept_res = VMX_SUCCEED;
 
@@ -373,7 +373,7 @@ void invept(hax_vm_t *hax_vm, uint type)
 
     bundle.type = type;
     bundle.desc = &desc;
-    smp_call_function(&cpu_online_map, (void (*)(void *))invept_smpfunc,
+    hax_smp_call_function(&cpu_online_map, (void (*)(void *))invept_smpfunc,
                       &bundle);
 
     /*

core/hax.c

@@ -61,12 +61,12 @@ struct hax_t *hax;
 extern hax_atomic_t vmx_cpu_num, vmx_enabled_num;
 static void hax_enable_vmx(void)
 {
-    smp_call_function(&cpu_online_map, cpu_init_vmx, NULL);
+    hax_smp_call_function(&cpu_online_map, cpu_init_vmx, NULL);
 }
 
 static void hax_disable_vmx(void)
 {
-    smp_call_function(&cpu_online_map, cpu_exit_vmx, NULL);
+    hax_smp_call_function(&cpu_online_map, cpu_exit_vmx, NULL);
 }
 
 static void free_cpu_vmxon_region(void)
@@ -410,7 +410,7 @@ static void hax_pmu_init(void)
     int ref_cpu_id = -1;
 
     // Execute cpu_pmu_init() on each logical processor of the host CPU
-    smp_call_function(&cpu_online_map, cpu_pmu_init, NULL);
+    hax_smp_call_function(&cpu_online_map, cpu_pmu_init, NULL);
 
     // Find the common APM version supported by all host logical processors
     // TODO: Theoretically we should do the same for other APM parameters

core/ia32.c

@@ -70,7 +70,7 @@ void ia32_wrmsr(uint32_t reg, uint64_t val)
 #endif
 }
 
-uint64_t rdtsc(void)
+uint64_t ia32_rdtsc(void)
 {
 #ifdef HAX_ARCH_X86_32
     struct qword_val val = { 0 };

core/ia32_ops.asm

@@ -161,7 +161,7 @@ function __nmi, 0
     int 2h
     ret
 
-function __fls, 1
+function asm_fls, 1
     xor reg_ret_32, reg_ret_32
     bsr reg_ret_32, reg_arg1_32
     ret

core/include/cpu.h

@@ -108,12 +108,12 @@ struct per_cpu_data {
 
     /*
      * These fields are used to record the result of certain VMX instructions
-     * when they are used in a function wrapped by smp_call_function(). This is
+     * when they are used in a function wrapped by hax_smp_call_function(). This is
      * because it is not safe to call hax_error(), etc. (whose underlying
      * implementation may use a lock) from the wrapped function to log a
      * failure; doing so may cause a deadlock and thus a host reboot, especially
      * on macOS, where mp_rendezvous_no_intrs() (the legacy Darwin API used by
-     * HAXM to implement smp_call_function()) is known to be prone to deadlocks:
+     * HAXM to implement hax_smp_call_function()) is known to be prone to deadlocks:
      * https://lists.apple.com/archives/darwin-kernel/2006/Dec/msg00006.html
      */
     vmx_result_t    vmxon_res;

core/include/emulate_ops.h

@@ -39,7 +39,7 @@
                     (0 * FASTOP_ALIGN))
 
 /* Instruction handlers */
-typedef void(__cdecl em_handler_t)(void);
+typedef void(ASMCALL em_handler_t)(void);
 em_handler_t em_not;
 em_handler_t em_neg;
 em_handler_t em_inc;
@@ -72,7 +72,7 @@ em_handler_t em_bextr;
 em_handler_t em_andn;
 
 /* Dispatch handlers */
-void __cdecl fastop_dispatch(void *handler, uint64_t *dst,
+void ASMCALL fastop_dispatch(void *handler, uint64_t *dst,
                              uint64_t *src1, uint64_t *src2, uint64_t *flags);
 
 #endif /* HAX_CORE_EMULATE_OPS_H_ */