github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

add flag to control vmexit sample in HV bootargs

Browse Source 
for vmexit data sampling could affect HV performace profiling,
so set it disabled by default.

add a flag in HV bootargs to control vmexit data sampling.

Tracked-On: #5232
Signed-off-by: Minggui Cao <minggui.cao@intel.com>
This commit is contained in:
Minggui Cao 2020-08-25 16:19:23 +08:00 committed by wenlingz
parent ea2650918b
commit 25fff0c21a
4 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hypervisor/common/hv_main.c
View File

@ -14,6 +14,7 @@
#include <sprintf.h> #include <sprintf.h>
#include <trace.h> #include <trace.h>
#include <logmsg.h> #include <logmsg.h>
#include <shell.h>
void vcpu_thread(struct thread_object *obj) void vcpu_thread(struct thread_object *obj)
{ {
@ -47,31 +48,33 @@ void vcpu_thread(struct thread_object *obj)
profiling_vmenter_handler(vcpu); profiling_vmenter_handler(vcpu);
#ifdef HV_DEBUG #ifdef HV_DEBUG
vmexit_end = rdtsc(); if (is_vmexit_sample_enabled()) {
if (vmexit_begin != 0UL) { vmexit_end = rdtsc();
uint64_t delta = vmexit_end - vmexit_begin; if (vmexit_begin != 0UL) {
uint32_t us = (uint32_t)ticks_to_us(delta); uint64_t delta = vmexit_end - vmexit_begin;
uint16_t fls = (uint16_t)(fls32(us) + 1); /* to avoid us = 0 case, then fls=0xFFFF */ uint32_t us = (uint32_t)ticks_to_us(delta);
uint16_t index = 0; uint16_t fls = (uint16_t)(fls32(us) + 1); /* to avoid us = 0 case, then fls=0xFFFF */
uint16_t index = 0;
if (fls >= MAX_VMEXIT_LEVEL) { if (fls >= MAX_VMEXIT_LEVEL) {
index = MAX_VMEXIT_LEVEL - 1; index = MAX_VMEXIT_LEVEL - 1;
} else if (fls > 0) { //if fls == 0, it means the us = 0 } else if (fls > 0) { //if fls == 0, it means the us = 0
index = fls - 1; index = fls - 1;
} }
get_cpu_var(vmexit_cnt)[basic_exit_reason][index]++; get_cpu_var(vmexit_cnt)[basic_exit_reason][index]++;
get_cpu_var(vmexit_time)[basic_exit_reason][0] += delta; get_cpu_var(vmexit_time)[basic_exit_reason][0] += delta;
vcpu->vmexit_cnt[basic_exit_reason][index]++; vcpu->vmexit_cnt[basic_exit_reason][index]++;
vcpu->vmexit_time[basic_exit_reason][0] += delta; vcpu->vmexit_time[basic_exit_reason][0] += delta;
if (us > get_cpu_var(vmexit_time)[basic_exit_reason][1]) { if (us > get_cpu_var(vmexit_time)[basic_exit_reason][1]) {
get_cpu_var(vmexit_time)[basic_exit_reason][1] = us; get_cpu_var(vmexit_time)[basic_exit_reason][1] = us;
} }
if (us > vcpu->vmexit_time[basic_exit_reason][1]) { if (us > vcpu->vmexit_time[basic_exit_reason][1]) {
vcpu->vmexit_time[basic_exit_reason][1] = us; vcpu->vmexit_time[basic_exit_reason][1] = us;
}
} }
} }
#endif #endif
@ -87,9 +90,11 @@ void vcpu_thread(struct thread_object *obj)
TRACE_2L(TRACE_VM_EXIT, basic_exit_reason, vcpu_get_rip(vcpu)); TRACE_2L(TRACE_VM_EXIT, basic_exit_reason, vcpu_get_rip(vcpu));
#ifdef HV_DEBUG #ifdef HV_DEBUG
vmexit_begin = rdtsc(); if (is_vmexit_sample_enabled()) {
get_cpu_var(vmexit_cnt)[basic_exit_reason][TOTAL_ARRAY_LEVEL - 1]++; vmexit_begin = rdtsc();
vcpu->vmexit_cnt[basic_exit_reason][TOTAL_ARRAY_LEVEL - 1]++; get_cpu_var(vmexit_cnt)[basic_exit_reason][TOTAL_ARRAY_LEVEL - 1]++;
vcpu->vmexit_cnt[basic_exit_reason][TOTAL_ARRAY_LEVEL - 1]++;
}
#endif #endif
vcpu->arch.nrexits++; vcpu->arch.nrexits++;

6
hypervisor/debug/dbg_cmd.c
View File

@ -10,6 +10,7 @@
#include <uart16550.h> #include <uart16550.h>
#include <dbg_cmd.h> #include <dbg_cmd.h>
#include <vm_config.h> #include <vm_config.h>
#include <shell.h>
#define MAX_PORT 0x10000 /* port 0 - 64K */ #define MAX_PORT 0x10000 /* port 0 - 64K */
#define DEFAULT_UART_PORT 0x3F8 #define DEFAULT_UART_PORT 0x3F8
@ -20,6 +21,7 @@ static const char * const cmd_list[] = {
"uart=disabled", /* to disable uart */ "uart=disabled", /* to disable uart */
"uart=port@", /* like uart=port@0x3F8 */ "uart=port@", /* like uart=port@0x3F8 */
"uart=bdf@", /*like: uart=bdf@0:18.2, it is for ttyS2 */ "uart=bdf@", /*like: uart=bdf@0:18.2, it is for ttyS2 */
"vmexit=enable"
}; };
enum IDX_CMD_DBG { enum IDX_CMD_DBG {
@ -27,6 +29,7 @@ enum IDX_CMD_DBG {
IDX_PORT_UART, IDX_PORT_UART,
IDX_PCI_UART, IDX_PCI_UART,
IDX_SET_VMEXIT,
IDX_MAX_CMD, IDX_MAX_CMD,
}; };
@ -104,6 +107,9 @@ bool handle_dbg_cmd(const char *cmd, int32_t len)
} else if (i == IDX_PCI_UART) { } else if (i == IDX_PCI_UART) {
uart16550_set_property(true, false, (uint64_t)(cmd+tmp)); uart16550_set_property(true, false, (uint64_t)(cmd+tmp));
} else if (i == IDX_SET_VMEXIT) {
set_vmexit_sample_flag(true);
} else { } else {
/* No other state currently, do nothing */ /* No other state currently, do nothing */
} }

17
hypervisor/debug/shell.c
View File

@ -1913,12 +1913,19 @@ static void clear_vmexit_info_buffer(void)
} }
/* used to control sample vmexit data */
static bool vmexit_sample_flag = false;
static int shell_show_vmexit_profile(__unused int argc, __unused char **argv) static int shell_show_vmexit_profile(__unused int argc, __unused char **argv)
{ {
if ((argc == 2) && (strcmp(argv[1], "clear") == 0)) { if ((argc == 2) && (strcmp(argv[1], "clear") == 0)) {
clear_vmexit_info_buffer(); clear_vmexit_info_buffer();
} }
if (!vmexit_sample_flag) {
printf("not enable to sample vmexit data!");
}
get_vmexit_profile_per_pcpu(shell_log_buf, SHELL_LOG_BUF_SIZE); get_vmexit_profile_per_pcpu(shell_log_buf, SHELL_LOG_BUF_SIZE);
shell_puts(shell_log_buf); shell_puts(shell_log_buf);
@ -1933,3 +1940,13 @@ static int shell_show_vmexit_profile(__unused int argc, __unused char **argv)
return 0; return 0;
} }
void set_vmexit_sample_flag(bool to_enable)
{
vmexit_sample_flag = to_enable;
}
bool is_vmexit_sample_enabled(void)
{
return vmexit_sample_flag;
}

3
hypervisor/include/debug/shell.h
View File

@ -10,4 +10,7 @@
void shell_init(void); void shell_init(void);
void shell_kick(void); void shell_kick(void);
void set_vmexit_sample_flag(bool to_enable);
bool is_vmexit_sample_enabled(void);
#endif /* SHELL_H */ #endif /* SHELL_H */