Skip to content

Commit 571fb33

Browse files
JasonChenCJlijinxia
JasonChenCJ
authored and
lijinxia
committed
rename copy_from/to_vm to copy_from/to_gpa
the name copy_from/to_gpa should be more suitable. Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent 8d35d87 commit 571fb33

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎hypervisor/arch/x86/guest/guest.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,12 @@ static inline int copy_gva(struct vcpu *vcpu, void *h_ptr, uint64_t gva,
388388
* - some other gpa from hypercall parameters, VHM should make sure it's
389389
* continuous
390390
*/
391-
int copy_from_vm(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size)
391+
int copy_from_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size)
392392
{
393393
return copy_gpa(vm, h_ptr, gpa, size, 1);
394394
}
395395

396-
int copy_to_vm(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size)
396+
int copy_to_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size)
397397
{
398398
return copy_gpa(vm, h_ptr, gpa, size, 0);
399399
}

‎hypervisor/common/hypercall.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int64_t hcall_get_api_version(struct vm *vm, uint64_t param)
3333
version.major_version = HV_API_MAJOR_VERSION;
3434
version.minor_version = HV_API_MINOR_VERSION;
3535

36-
if (copy_to_vm(vm, &version, param, sizeof(version))) {
36+
if (copy_to_gpa(vm, &version, param, sizeof(version))) {
3737
pr_err("%s: Unable copy param to vm\n", __func__);
3838
return -1;
3939
}
@@ -136,7 +136,7 @@ int64_t hcall_create_vm(struct vm *vm, uint64_t param)
136136
struct vm_description vm_desc;
137137

138138
memset((void *)&cv, 0, sizeof(cv));
139-
if (copy_from_vm(vm, &cv, param, sizeof(cv))) {
139+
if (copy_from_gpa(vm, &cv, param, sizeof(cv))) {
140140
pr_err("%s: Unable copy param to vm\n", __func__);
141141
return -1;
142142
}
@@ -156,7 +156,7 @@ int64_t hcall_create_vm(struct vm *vm, uint64_t param)
156156
ret = 0;
157157
}
158158

159-
if (copy_to_vm(vm, &cv.vmid, param, sizeof(cv.vmid))) {
159+
if (copy_to_gpa(vm, &cv.vmid, param, sizeof(cv.vmid))) {
160160
pr_err("%s: Unable copy param to vm\n", __func__);
161161
return -1;
162162
}
@@ -213,7 +213,7 @@ int64_t hcall_create_vcpu(struct vm *vm, uint64_t vmid, uint64_t param)
213213
if (!target_vm || !param)
214214
return -1;
215215

216-
if (copy_from_vm(vm, &cv, param, sizeof(cv))) {
216+
if (copy_from_gpa(vm, &cv, param, sizeof(cv))) {
217217
pr_err("%s: Unable copy param to vm\n", __func__);
218218
return -1;
219219
}
@@ -234,7 +234,7 @@ int64_t hcall_assert_irqline(struct vm *vm, uint64_t vmid, uint64_t param)
234234
int64_t ret = 0;
235235
struct acrn_irqline irqline;
236236

237-
if (copy_from_vm(vm, &irqline, param, sizeof(irqline))) {
237+
if (copy_from_gpa(vm, &irqline, param, sizeof(irqline))) {
238238
pr_err("%s: Unable copy param to vm\n", __func__);
239239
return -1;
240240
}
@@ -248,7 +248,7 @@ int64_t hcall_deassert_irqline(struct vm *vm, uint64_t vmid, uint64_t param)
248248
int64_t ret = 0;
249249
struct acrn_irqline irqline;
250250

251-
if (copy_from_vm(vm, &irqline, param, sizeof(irqline))) {
251+
if (copy_from_gpa(vm, &irqline, param, sizeof(irqline))) {
252252
pr_err("%s: Unable copy param to vm\n", __func__);
253253
return -1;
254254
}
@@ -262,7 +262,7 @@ int64_t hcall_pulse_irqline(struct vm *vm, uint64_t vmid, uint64_t param)
262262
int64_t ret = 0;
263263
struct acrn_irqline irqline;
264264

265-
if (copy_from_vm(vm, &irqline, param, sizeof(irqline))) {
265+
if (copy_from_gpa(vm, &irqline, param, sizeof(irqline))) {
266266
pr_err("%s: Unable copy param to vm\n", __func__);
267267
return -1;
268268
}
@@ -281,7 +281,7 @@ int64_t hcall_inject_msi(struct vm *vm, uint64_t vmid, uint64_t param)
281281
return -1;
282282

283283
memset((void *)&msi, 0, sizeof(msi));
284-
if (copy_from_vm(vm, &msi, param, sizeof(msi))) {
284+
if (copy_from_gpa(vm, &msi, param, sizeof(msi))) {
285285
pr_err("%s: Unable copy param to vm\n", __func__);
286286
return -1;
287287
}
@@ -302,7 +302,7 @@ int64_t hcall_set_ioreq_buffer(struct vm *vm, uint64_t vmid, uint64_t param)
302302

303303
memset((void *)&iobuf, 0, sizeof(iobuf));
304304

305-
if (copy_from_vm(vm, &iobuf, param, sizeof(iobuf))) {
305+
if (copy_from_gpa(vm, &iobuf, param, sizeof(iobuf))) {
306306
pr_err("%s: Unable copy param to vm\n", __func__);
307307
return -1;
308308
}
@@ -452,7 +452,7 @@ int64_t hcall_set_vm_memmap(struct vm *vm, uint64_t vmid, uint64_t param)
452452

453453
memset((void *)&memmap, 0, sizeof(memmap));
454454

455-
if (copy_from_vm(vm, &memmap, param, sizeof(memmap))) {
455+
if (copy_from_gpa(vm, &memmap, param, sizeof(memmap))) {
456456
pr_err("%s: Unable copy param to vm\n", __func__);
457457
return -1;
458458
}
@@ -485,7 +485,7 @@ int64_t hcall_set_vm_memmaps(struct vm *vm, uint64_t param)
485485

486486
memset((void *)&set_memmaps, 0, sizeof(set_memmaps));
487487

488-
if (copy_from_vm(vm, &set_memmaps, param, sizeof(set_memmaps))) {
488+
if (copy_from_gpa(vm, &set_memmaps, param, sizeof(set_memmaps))) {
489489
pr_err("%s: Unable copy param from vm\n", __func__);
490490
return -1;
491491
}
@@ -498,7 +498,7 @@ int64_t hcall_set_vm_memmaps(struct vm *vm, uint64_t param)
498498
}
499499

500500
idx = 0;
501-
/*TODO: use copy_from_vm for this buffer page */
501+
/*TODO: use copy_from_gpa for this buffer page */
502502
regions = GPA2HVA(vm, set_memmaps.memmaps_gpa);
503503
while (idx < set_memmaps.memmaps_num) {
504504
/* the force pointer change below is for back compatible
@@ -524,7 +524,7 @@ int64_t hcall_remap_pci_msix(struct vm *vm, uint64_t vmid, uint64_t param)
524524

525525
memset((void *)&remap, 0, sizeof(remap));
526526

527-
if (copy_from_vm(vm, &remap, param, sizeof(remap))) {
527+
if (copy_from_gpa(vm, &remap, param, sizeof(remap))) {
528528
pr_err("%s: Unable copy param to vm\n", __func__);
529529
return -1;
530530
}
@@ -543,7 +543,7 @@ int64_t hcall_remap_pci_msix(struct vm *vm, uint64_t vmid, uint64_t param)
543543
remap.msi_data = info.pmsi_data;
544544
remap.msi_addr = info.pmsi_addr;
545545

546-
if (copy_to_vm(vm, &remap, param, sizeof(remap))) {
546+
if (copy_to_gpa(vm, &remap, param, sizeof(remap))) {
547547
pr_err("%s: Unable copy param to vm\n", __func__);
548548
return -1;
549549
}
@@ -563,12 +563,12 @@ int64_t hcall_gpa_to_hpa(struct vm *vm, uint64_t vmid, uint64_t param)
563563

564564
memset((void *)&v_gpa2hpa, 0, sizeof(v_gpa2hpa));
565565

566-
if (copy_from_vm(vm, &v_gpa2hpa, param, sizeof(v_gpa2hpa))) {
566+
if (copy_from_gpa(vm, &v_gpa2hpa, param, sizeof(v_gpa2hpa))) {
567567
pr_err("HCALL gpa2hpa: Unable copy param from vm\n");
568568
return -1;
569569
}
570570
v_gpa2hpa.hpa = gpa2hpa(target_vm, v_gpa2hpa.gpa);
571-
if (copy_to_vm(vm, &v_gpa2hpa, param, sizeof(v_gpa2hpa))) {
571+
if (copy_to_gpa(vm, &v_gpa2hpa, param, sizeof(v_gpa2hpa))) {
572572
pr_err("%s: Unable copy param to vm\n", __func__);
573573
return -1;
574574
}
@@ -587,7 +587,7 @@ int64_t hcall_assign_ptdev(struct vm *vm, uint64_t vmid, uint64_t param)
587587
return -EINVAL;
588588
}
589589

590-
if (copy_from_vm(vm, &bdf, param, sizeof(bdf))) {
590+
if (copy_from_gpa(vm, &bdf, param, sizeof(bdf))) {
591591
pr_err("%s: Unable copy param from vm %d\n",
592592
__func__, vm->attr.id);
593593
return -EIO;
@@ -622,7 +622,7 @@ int64_t hcall_deassign_ptdev(struct vm *vm, uint64_t vmid, uint64_t param)
622622
if (target_vm == NULL)
623623
return -1;
624624

625-
if (copy_from_vm(vm, &bdf, param, sizeof(bdf))) {
625+
if (copy_from_gpa(vm, &bdf, param, sizeof(bdf))) {
626626
pr_err("%s: Unable copy param to vm\n", __func__);
627627
return -1;
628628
}
@@ -643,7 +643,7 @@ int64_t hcall_set_ptdev_intr_info(struct vm *vm, uint64_t vmid, uint64_t param)
643643

644644
memset((void *)&irq, 0, sizeof(irq));
645645

646-
if (copy_from_vm(vm, &irq, param, sizeof(irq))) {
646+
if (copy_from_gpa(vm, &irq, param, sizeof(irq))) {
647647
pr_err("%s: Unable copy param to vm\n", __func__);
648648
return -1;
649649
}
@@ -673,7 +673,7 @@ hcall_reset_ptdev_intr_info(struct vm *vm, uint64_t vmid, uint64_t param)
673673

674674
memset((void *)&irq, 0, sizeof(irq));
675675

676-
if (copy_from_vm(vm, &irq, param, sizeof(irq))) {
676+
if (copy_from_gpa(vm, &irq, param, sizeof(irq))) {
677677
pr_err("%s: Unable copy param to vm\n", __func__);
678678
return -1;
679679
}
@@ -697,7 +697,7 @@ int64_t hcall_setup_sbuf(struct vm *vm, uint64_t param)
697697

698698
memset((void *)&ssp, 0, sizeof(ssp));
699699

700-
if (copy_from_vm(vm, &ssp, param, sizeof(ssp))) {
700+
if (copy_from_gpa(vm, &ssp, param, sizeof(ssp))) {
701701
pr_err("%s: Unable copy param to vm\n", __func__);
702702
return -1;
703703
}
@@ -729,7 +729,7 @@ int64_t hcall_get_cpu_pm_state(struct vm *vm, uint64_t cmd, uint64_t param)
729729
return -1;
730730
}
731731

732-
if (copy_to_vm(vm, &(target_vm->pm.px_cnt), param,
732+
if (copy_to_gpa(vm, &(target_vm->pm.px_cnt), param,
733733
sizeof(target_vm->pm.px_cnt))) {
734734
pr_err("%s: Unable copy param to vm\n", __func__);
735735
return -1;
@@ -754,7 +754,7 @@ int64_t hcall_get_cpu_pm_state(struct vm *vm, uint64_t cmd, uint64_t param)
754754
}
755755

756756
px_data = target_vm->pm.px_data + pn;
757-
if (copy_to_vm(vm, px_data, param,
757+
if (copy_to_gpa(vm, px_data, param,
758758
sizeof(struct cpu_px_data))) {
759759
pr_err("%s: Unable copy param to vm\n", __func__);
760760
return -1;
@@ -768,7 +768,7 @@ int64_t hcall_get_cpu_pm_state(struct vm *vm, uint64_t cmd, uint64_t param)
768768
return -1;
769769
}
770770

771-
if (copy_to_vm(vm, &(target_vm->pm.cx_cnt), param,
771+
if (copy_to_gpa(vm, &(target_vm->pm.cx_cnt), param,
772772
sizeof(target_vm->pm.cx_cnt))) {
773773
pr_err("%s: Unable copy param to vm\n", __func__);
774774
return -1;
@@ -790,7 +790,7 @@ int64_t hcall_get_cpu_pm_state(struct vm *vm, uint64_t cmd, uint64_t param)
790790

791791
cx_data = target_vm->pm.cx_data + cx_idx;
792792

793-
if (copy_to_vm(vm, cx_data, param,
793+
if (copy_to_gpa(vm, cx_data, param,
794794
sizeof(struct cpu_cx_data))) {
795795
pr_err("%s: Unable copy param to vm\n", __func__);
796796
return -1;

‎hypervisor/include/arch/x86/guest/guest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ int general_sw_loader(struct vm *vm, struct vcpu *vcpu);
120120
typedef int (*vm_sw_loader_t)(struct vm *, struct vcpu *);
121121
extern vm_sw_loader_t vm_sw_loader;
122122

123-
int copy_from_vm(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
124-
int copy_to_vm(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
123+
int copy_from_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
124+
int copy_to_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
125125
int copy_from_gva(struct vcpu *vcpu, void *h_ptr, uint64_t gva,
126126
uint32_t size, uint32_t *err_code);
127127
int copy_to_gva(struct vcpu *vcpu, void *h_ptr, uint64_t gva,

0 commit comments

Comments
 (0)