Skip to content

Commit df54909

Browse files
mchinthwenlingz
mchinth
authored and
wenlingz
committed
HV:Added support to get phy CPU, VM, tool information
This patch includes support to following 1. Collection of physical cpuid information 2. Collection of List of VM's available and information 3. Tool version information 4. Sending tool control information to guest Tracked-On: #1409 Acked-by: Eddie Dong <eddie.dong@intel.com> Signed-off-by: Chinthapally, Manisha <manisha.chinthapally@intel.com>
1 parent 8ba333d commit df54909

File tree

2 files changed

+206
-12
lines changed

2 files changed

+206
-12
lines changed

‎hypervisor/debug/profiling.c

Lines changed: 146 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
6-
76
#ifdef PROFILING_ON
87

98
#include <hypervisor.h>
109

1110
#define ACRN_DBG_PROFILING 5U
1211

12+
#define MAJOR_VERSION 1
13+
#define MINOR_VERSION 0
14+
1315
#define LVT_PERFCTR_BIT_MASK 0x10000U
1416

17+
static uint64_t sep_collection_switch;
18+
1519
static uint32_t profiling_pmi_irq = IRQ_INVALID;
1620

1721
static void profiling_initialize_vmsw(void)
@@ -62,7 +66,8 @@ static void profiling_pmi_handler(__unused unsigned int irq, __unused void *data
6266
/*
6367
* Performs MSR operations on all the CPU's
6468
*/
65-
int32_t profiling_msr_ops_all_cpus(__unused struct vm *vm, __unused uint64_t addr)
69+
70+
int32_t profiling_msr_ops_all_cpus(__unused struct vm *vm, __unused uint64_t addr)
6671
{
6772
/* to be implemented
6873
* call to smp_call_function profiling_ipi_handler
@@ -73,27 +78,138 @@ static void profiling_pmi_handler(__unused unsigned int irq, __unused void *data
7378
/*
7479
* Generate VM info list
7580
*/
76-
int32_t profiling_vm_list_info(__unused struct vm *vm, __unused uint64_t addr)
81+
int32_t profiling_vm_list_info(struct vm *vm, uint64_t addr)
7782
{
78-
/* to be implemented */
83+
struct vm *tmp_vm;
84+
struct vcpu *vcpu;
85+
int32_t vm_idx;
86+
uint16_t i, j;
87+
struct profiling_vm_info_list vm_info_list;
88+
89+
(void)memset((void *)&vm_info_list, 0U, sizeof(vm_info_list));
90+
91+
dev_dbg(ACRN_DBG_PROFILING, "%s: entering", __func__);
92+
93+
if (copy_from_gpa(vm, &vm_info_list, addr, sizeof(vm_info_list)) != 0) {
94+
pr_err("%s: Unable to copy addr from vm\n", __func__);
95+
return -EINVAL;
96+
}
97+
98+
vm_idx = 0;
99+
vm_info_list.vm_list[vm_idx].vm_id_num = -1;
100+
(void)memcpy_s((void *)vm_info_list.vm_list[vm_idx].vm_name, 4U, "VMM\0", 4U);
101+
for (i = 0U; i < phys_cpu_num; i++) {
102+
vm_info_list.vm_list[vm_idx].cpu_map[i].vcpu_id = (int32_t)i;
103+
vm_info_list.vm_list[vm_idx].cpu_map[i].pcpu_id = (int32_t)i;
104+
vm_info_list.vm_list[vm_idx].cpu_map[i].apic_id
105+
= (int32_t)per_cpu(lapic_id, i);
106+
}
107+
vm_info_list.vm_list[vm_idx].num_vcpus = (int32_t)i;
108+
vm_info_list.num_vms = 1;
109+
110+
for (j = 0U; j < CONFIG_MAX_VM_NUM; j++) {
111+
tmp_vm = get_vm_from_vmid(j);
112+
if (tmp_vm == NULL) {
113+
break;
114+
}
115+
vm_info_list.num_vms++;
116+
vm_idx++;
117+
118+
vm_info_list.vm_list[vm_idx].vm_id_num = (int32_t)tmp_vm->vm_id;
119+
(void)memcpy_s((void *)vm_info_list.vm_list[vm_idx].guid,
120+
16U, tmp_vm->GUID, 16U);
121+
snprintf(vm_info_list.vm_list[vm_idx].vm_name, 16U, "vm_%d",
122+
tmp_vm->vm_id, 16U);
123+
vm_info_list.vm_list[vm_idx].num_vcpus = 0;
124+
i = 0U;
125+
foreach_vcpu(i, tmp_vm, vcpu) {
126+
vm_info_list.vm_list[vm_idx].cpu_map[i].vcpu_id
127+
= (int32_t)vcpu->vcpu_id;
128+
vm_info_list.vm_list[vm_idx].cpu_map[i].pcpu_id
129+
= (int32_t)vcpu->pcpu_id;
130+
vm_info_list.vm_list[vm_idx].cpu_map[i].apic_id = 0;
131+
vm_info_list.vm_list[vm_idx].num_vcpus++;
132+
}
133+
}
134+
135+
if (copy_to_gpa(vm, &vm_info_list, addr, sizeof(vm_info_list)) != 0) {
136+
pr_err("%s: Unable to copy addr to vm\n", __func__);
137+
return -EINVAL;
138+
}
139+
140+
dev_dbg(ACRN_DBG_PROFILING, "%s: exiting", __func__);
79141
return 0;
80142
}
81143

82144
/*
83145
* Sep/socwatch profiling version
84146
*/
85-
int32_t profiling_get_version_info(__unused struct vm *vm, __unused uint64_t addr)
147+
int32_t profiling_get_version_info(struct vm *vm, uint64_t addr)
86148
{
87-
/* to be implemented */
149+
struct profiling_version_info ver_info;
150+
151+
(void)memset((void *)&ver_info, 0U, sizeof(ver_info));
152+
153+
dev_dbg(ACRN_DBG_PROFILING, "%s: entering", __func__);
154+
155+
if (copy_from_gpa(vm, &ver_info, addr, sizeof(ver_info)) != 0) {
156+
pr_err("%s: Unable to copy addr from vm\n", __func__);
157+
return -EINVAL;
158+
}
159+
160+
ver_info.major = MAJOR_VERSION;
161+
ver_info.minor = MINOR_VERSION;
162+
ver_info.supported_features = (int64_t)
163+
((1U << (uint64_t)CORE_PMU_SAMPLING) |
164+
(1U << (uint64_t)CORE_PMU_COUNTING) |
165+
(1U << (uint64_t)LBR_PMU_SAMPLING) |
166+
(1U << (uint64_t)VM_SWITCH_TRACING));
167+
168+
if (copy_to_gpa(vm, &ver_info, addr, sizeof(ver_info)) != 0) {
169+
pr_err("%s: Unable to copy addr to vm\n", __func__);
170+
return -EINVAL;
171+
}
172+
173+
dev_dbg(ACRN_DBG_PROFILING, "%s: exiting", __func__);
174+
88175
return 0;
89176
}
90177

91178
/*
92179
* Gets type of profiling - sep/socwatch
93180
*/
94-
int32_t profiling_get_control(__unused struct vm *vm, __unused uint64_t addr)
181+
int32_t profiling_get_control(struct vm *vm, uint64_t addr)
95182
{
96-
/* to be implemented */
183+
struct profiling_control prof_control;
184+
185+
(void)memset((void *)&prof_control, 0U, sizeof(prof_control));
186+
187+
dev_dbg(ACRN_DBG_PROFILING, "%s: entering", __func__);
188+
189+
if (copy_from_gpa(vm, &prof_control, addr, sizeof(prof_control)) != 0) {
190+
pr_err("%s: Unable to copy addr from vm\n", __func__);
191+
return -EINVAL;
192+
}
193+
194+
switch (prof_control.collector_id) {
195+
case COLLECT_PROFILE_DATA:
196+
prof_control.switches = sep_collection_switch;
197+
break;
198+
case COLLECT_POWER_DATA:
199+
break;
200+
default:
201+
pr_err("%s: unknown collector %d",
202+
__func__, prof_control.collector_id);
203+
break;
204+
}
205+
206+
if (copy_to_gpa(vm, &prof_control, addr, sizeof(prof_control)) != 0) {
207+
pr_err("%s: Unable to copy addr to vm\n", __func__);
208+
return -EINVAL;
209+
}
210+
211+
dev_dbg(ACRN_DBG_PROFILING, "%s: exiting", __func__);
212+
97213
return 0;
98214
}
99215

@@ -131,9 +247,29 @@ int32_t profiling_configure_vmsw(__unused struct vm *vm, __unused uint64_t addr)
131247
/*
132248
* Get the physical cpu id
133249
*/
134-
int32_t profiling_get_pcpu_id(__unused struct vm *vm, __unused uint64_t addr)
250+
int32_t profiling_get_pcpu_id(struct vm *vm, uint64_t addr)
135251
{
136-
/* to be implemented */
252+
struct profiling_pcpuid pcpuid;
253+
254+
(void)memset((void *)&pcpuid, 0U, sizeof(pcpuid));
255+
256+
dev_dbg(ACRN_DBG_PROFILING, "%s: entering", __func__);
257+
258+
if (copy_from_gpa(vm, &pcpuid, addr, sizeof(pcpuid)) != 0) {
259+
pr_err("%s: Unable to copy addr from vm\n", __func__);
260+
return -EINVAL;
261+
}
262+
263+
cpuid_subleaf(pcpuid.leaf, pcpuid.subleaf, &pcpuid.eax,
264+
&pcpuid.ebx, &pcpuid.ecx, &pcpuid.edx);
265+
266+
if (copy_to_gpa(vm, &pcpuid, addr, sizeof(pcpuid)) != 0) {
267+
pr_err("%s: Unable to copy param to vm\n", __func__);
268+
return -EINVAL;
269+
}
270+
271+
dev_dbg(ACRN_DBG_PROFILING, "%s: exiting", __func__);
272+
137273
return 0;
138274
}
139275

‎hypervisor/include/debug/profiling_internal.h

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,73 @@
99

1010
#ifdef PROFILING_ON
1111

12-
typedef enum IPI_COMMANDS {
12+
#define MAX_NR_VCPUS 8
13+
#define MAX_NR_VMS 6
14+
15+
#define COLLECT_PROFILE_DATA 0
16+
#define COLLECT_POWER_DATA 1
17+
18+
typedef enum IPI_COMMANDS {
1319
IPI_MSR_OP = 0,
1420
IPI_PMU_CONFIG,
1521
IPI_PMU_START,
1622
IPI_PMU_STOP,
1723
IPI_VMSW_CONFIG,
1824
IPI_UNKNOWN,
1925
} ipi_commands;
20-
/*
26+
27+
typedef enum PROFILING_SEP_FEATURE {
28+
CORE_PMU_SAMPLING = 0,
29+
CORE_PMU_COUNTING,
30+
PEBS_PMU_SAMPLING,
31+
LBR_PMU_SAMPLING,
32+
UNCORE_PMU_SAMPLING,
33+
VM_SWITCH_TRACING,
34+
MAX_SEP_FEATURE_ID
35+
} profiling_sep_feature;
36+
37+
struct profiling_version_info {
38+
int32_t major;
39+
int32_t minor;
40+
int64_t supported_features;
41+
int64_t reserved;
42+
};
43+
44+
struct profiling_pcpuid {
45+
uint32_t leaf;
46+
uint32_t subleaf;
47+
uint32_t eax;
48+
uint32_t ebx;
49+
uint32_t ecx;
50+
uint32_t edx;
51+
};
52+
53+
struct profiling_control {
54+
int32_t collector_id;
55+
int32_t reserved;
56+
uint64_t switches;
57+
};
58+
59+
struct profiling_vcpu_pcpu_map {
60+
int32_t vcpu_id;
61+
int32_t pcpu_id;
62+
int32_t apic_id;
63+
};
64+
65+
struct profiling_vm_info {
66+
int32_t vm_id_num;
67+
unsigned char guid[16];
68+
char vm_name[16];
69+
int32_t num_vcpus;
70+
struct profiling_vcpu_pcpu_map cpu_map[MAX_NR_VCPUS];
71+
};
72+
73+
struct profiling_vm_info_list {
74+
int32_t num_vms;
75+
struct profiling_vm_info vm_list[MAX_NR_VMS];
76+
};
77+
78+
/*
2179
* Wrapper containing SEP sampling/profiling related data structures
2280
*/
2381
struct profiling_info_wrapper {

0 commit comments

Comments
 (0)