diff options
| -rw-r--r-- | executor/common_kvm_amd64_syzos.h | 5 | ||||
| -rw-r--r-- | executor/common_kvm_syzos.h | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/executor/common_kvm_amd64_syzos.h b/executor/common_kvm_amd64_syzos.h index baabbef7e..df1f63ad5 100644 --- a/executor/common_kvm_amd64_syzos.h +++ b/executor/common_kvm_amd64_syzos.h @@ -1151,7 +1151,10 @@ guest_handle_nested_load_code(struct api_call_nested_load_code* cmd, uint64 cpu_ } } -GUEST_CODE static noinline void +// Clang's LTO may ignore noinline and attempt to inline this function into both callers, +// which results in duplicate declaration of after_vmentry_label. +// Applying __optnone should prevent this behavior. +GUEST_CODE static noinline __optnone void guest_handle_nested_vmentry_intel(uint64 vm_id, uint64 cpu_id, bool is_launch) { uint64 vmx_error_code = 0; diff --git a/executor/common_kvm_syzos.h b/executor/common_kvm_syzos.h index 5fe513ab1..923284efe 100644 --- a/executor/common_kvm_syzos.h +++ b/executor/common_kvm_syzos.h @@ -35,10 +35,19 @@ #define __addrspace_guest #endif +// Disable optimizations for a particular function. +#if defined(__clang__) +#define __optnone __attribute__((optnone)) +#elif defined(__GNUC__) +#define __optnone __attribute__((optimize("O0"))) +#else +#define __optnone +#endif + // Host will map the code in this section into the guest address space. #define GUEST_CODE __attribute__((section("guest"))) __no_stack_protector __addrspace_guest // Start/end of the guest section. extern char *__start_guest, *__stop_guest; -#endif // EXECUTOR_COMMON_KVM_SYZOS_H
\ No newline at end of file +#endif // EXECUTOR_COMMON_KVM_SYZOS_H |