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

HV: remove sharing_mode_vdev_array from sharing_mode.c

Browse Source 
Sharing mode has its own static global variables to store
number of vdevs and vdev list, we already have the per vpci pci_vdev[]
in struct acrn_vpci, so use the vpci_vdev in acrn_vpci instead to unify
the vdev list management for both sharing mode and partition mode.

Tracked-On: #2534
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen 2019-02-07 16:03:37 -08:00 committed by Eddie Dong
parent 00f9b85072
commit 819bcec693
2 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hypervisor/dm/vpci/pci_priv.h
View File

@ -79,7 +79,6 @@ void pci_vdev_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes,
void populate_msi_struct(struct pci_vdev *vdev); void populate_msi_struct(struct pci_vdev *vdev);
struct pci_vdev *sharing_mode_find_vdev(union pci_bdf pbdf);
void add_vdev_handler(struct pci_vdev *vdev, const struct pci_vdev_ops *ops); void add_vdev_handler(struct pci_vdev *vdev, const struct pci_vdev_ops *ops);
#endif /* PCI_PRIV_H_ */ #endif /* PCI_PRIV_H_ */

88
hypervisor/dm/vpci/sharing_mode.c
View File

@ -32,19 +32,19 @@
#include <logmsg.h> #include <logmsg.h>
#include "pci_priv.h" #include "pci_priv.h"
static uint32_t num_pci_vdev;
static struct pci_vdev sharing_mode_vdev_array[CONFIG_MAX_PCI_DEV_NUM];
struct pci_vdev *sharing_mode_find_vdev(union pci_bdf pbdf) /**
* @pre tmp != NULL
*/
static struct pci_vdev *sharing_mode_find_vdev(const struct acrn_vpci *vpci, union pci_bdf pbdf)
{ {
struct pci_vdev *vdev, *tmp; struct pci_vdev *vdev, *tmp;
uint32_t i; uint32_t i;
vdev = NULL; vdev = NULL;
/* SOS_VM uses phys BDF */ for (i = 0U; i < vpci->pci_vdev_cnt; i++) {
for (i = 0U; i < num_pci_vdev; i++) { tmp = (struct pci_vdev *)&(vpci->pci_vdevs[i]);
tmp = &sharing_mode_vdev_array[i]; if ((tmp->pdev != NULL) && bdf_is_equal((union pci_bdf *)&(tmp->pdev->bdf), &pbdf)) {
if ((tmp->pdev != NULL) && bdf_is_equal((union pci_bdf*)&(tmp->pdev->bdf), &pbdf)) {
vdev = tmp; vdev = tmp;
break; break;
} }
@ -53,6 +53,25 @@ struct pci_vdev *sharing_mode_find_vdev(union pci_bdf pbdf)
return vdev; return vdev;
} }
/**
* @pre vpci != NULL
*/
static struct pci_vdev *sharing_mode_find_vdev_sos(union pci_bdf pbdf)
{
struct acrn_vm *vm;
struct acrn_vpci *vpci;
struct pci_vdev *vdev = NULL;
vm = get_sos_vm();
if (vm != NULL) {
vpci = &vm->vpci;
vdev = sharing_mode_find_vdev(vpci, pbdf);
}
return vdev;
}
static void sharing_mode_cfgread(__unused struct acrn_vpci *vpci, union pci_bdf bdf, static void sharing_mode_cfgread(__unused struct acrn_vpci *vpci, union pci_bdf bdf,
uint32_t offset, uint32_t bytes, uint32_t *val) uint32_t offset, uint32_t bytes, uint32_t *val)
{ {
@ -60,13 +79,13 @@ static void sharing_mode_cfgread(__unused struct acrn_vpci *vpci, union pci_bdf
bool handled = false; bool handled = false;
uint32_t i; uint32_t i;
vdev = sharing_mode_find_vdev(bdf); vdev = sharing_mode_find_vdev_sos(bdf);
/* vdev == NULL: Could be hit for PCI enumeration from guests */ /* vdev == NULL: Could be hit for PCI enumeration from guests */
if ((vdev == NULL) || ((bytes != 1U) && (bytes != 2U) && (bytes != 4U))) { if ((vdev == NULL) || ((bytes != 1U) && (bytes != 2U) && (bytes != 4U))) {
*val = ~0U; *val = ~0U;
} else { } else {
for (i = 0U; (i < vdev->nr_ops) && !handled; i++) { for (i = 0U; (i < vdev->nr_ops) && (!handled); i++) {
if (vdev->ops[i].cfgread != NULL) { if (vdev->ops[i].cfgread != NULL) {
if (vdev->ops[i].cfgread(vdev, offset, bytes, val) == 0) { if (vdev->ops[i].cfgread(vdev, offset, bytes, val) == 0) {
handled = true; handled = true;
@ -89,9 +108,9 @@ static void sharing_mode_cfgwrite(__unused struct acrn_vpci *vpci, union pci_bdf
uint32_t i; uint32_t i;
if ((bytes == 1U) || (bytes == 2U) || (bytes == 4U)) { if ((bytes == 1U) || (bytes == 2U) || (bytes == 4U)) {
vdev = sharing_mode_find_vdev(bdf); vdev = sharing_mode_find_vdev_sos(bdf);
if (vdev != NULL) { if (vdev != NULL) {
for (i = 0U; (i < vdev->nr_ops) && !handled; i++) { for (i = 0U; (i < vdev->nr_ops) && (!handled); i++) {
if (vdev->ops[i].cfgwrite != NULL) { if (vdev->ops[i].cfgwrite != NULL) {
if (vdev->ops[i].cfgwrite(vdev, offset, bytes, val) == 0) { if (vdev->ops[i].cfgwrite(vdev, offset, bytes, val) == 0) {
handled = true; handled = true;
@ -107,20 +126,25 @@ static void sharing_mode_cfgwrite(__unused struct acrn_vpci *vpci, union pci_bdf
} }
} }
/**
* @pre vm != NULL
* @pre pdev_ref != NULL
* @pre vm->vpci->pci_vdev_cnt <= CONFIG_MAX_PCI_DEV_NUM
* @pre vdev != NULL
*/
static struct pci_vdev *alloc_pci_vdev(const struct acrn_vm *vm, struct pci_pdev *pdev_ref) static struct pci_vdev *alloc_pci_vdev(const struct acrn_vm *vm, struct pci_pdev *pdev_ref)
{ {
struct pci_vdev *vdev = NULL; struct pci_vdev *vdev = NULL;
struct acrn_vpci *vpci = (struct acrn_vpci *)&(vm->vpci);
if (num_pci_vdev < CONFIG_MAX_PCI_DEV_NUM) { if (vpci->pci_vdev_cnt < CONFIG_MAX_PCI_DEV_NUM) {
vdev = &sharing_mode_vdev_array[num_pci_vdev]; vdev = &vpci->pci_vdevs[vpci->pci_vdev_cnt];
num_pci_vdev++; vpci->pci_vdev_cnt++;
if ((vm != NULL) && (vdev != NULL) && (pdev_ref != NULL)) { vdev->vpci = vpci;
vdev->vpci = &vm->vpci; /* vbdf equals to pbdf otherwise remapped */
/* vbdf equals to pbdf otherwise remapped */ vdev->vbdf = pdev_ref->bdf;
vdev->vbdf = pdev_ref->bdf; vdev->pdev = pdev_ref;
vdev->pdev = pdev_ref;
}
} }
return vdev; return vdev;
@ -137,6 +161,9 @@ static void init_vdev_for_pdev(struct pci_pdev *pdev, const void *cb_data)
} }
} }
/**
* @pre vdev != NULL
*/
static int32_t sharing_mode_vpci_init(const struct acrn_vm *vm) static int32_t sharing_mode_vpci_init(const struct acrn_vm *vm)
{ {
struct pci_vdev *vdev; struct pci_vdev *vdev;
@ -153,8 +180,8 @@ static int32_t sharing_mode_vpci_init(const struct acrn_vm *vm)
/* Build up vdev array for sos_vm */ /* Build up vdev array for sos_vm */
pci_pdev_foreach(init_vdev_for_pdev, vm); pci_pdev_foreach(init_vdev_for_pdev, vm);
for (i = 0U; i < num_pci_vdev; i++) { for (i = 0U; i < vm->vpci.pci_vdev_cnt; i++) {
vdev = &sharing_mode_vdev_array[i]; vdev = (struct pci_vdev *)&(vm->vpci.pci_vdevs[i]);
for (j = 0U; j < vdev->nr_ops; j++) { for (j = 0U; j < vdev->nr_ops; j++) {
if (vdev->ops[j].init != NULL) { if (vdev->ops[j].init != NULL) {
(void)vdev->ops[j].init(vdev); (void)vdev->ops[j].init(vdev);
@ -167,14 +194,17 @@ static int32_t sharing_mode_vpci_init(const struct acrn_vm *vm)
return ret; return ret;
} }
static void sharing_mode_vpci_deinit(__unused const struct acrn_vm *vm) /**
* @pre vdev != NULL
*/
static void sharing_mode_vpci_deinit(const struct acrn_vm *vm)
{ {
struct pci_vdev *vdev; struct pci_vdev *vdev;
uint32_t i, j; uint32_t i, j;
if (is_sos_vm(vm)) { if (is_sos_vm(vm)) {
for (i = 0U; i < num_pci_vdev; i++) { for (i = 0U; i < vm->vpci.pci_vdev_cnt; i++) {
vdev = &sharing_mode_vdev_array[i]; vdev = (struct pci_vdev *)&(vm->vpci.pci_vdevs[i]);
for (j = 0U; j < vdev->nr_ops; j++) { for (j = 0U; j < vdev->nr_ops; j++) {
if (vdev->ops[j].deinit != NULL) { if (vdev->ops[j].deinit != NULL) {
(void)vdev->ops[j].deinit(vdev); (void)vdev->ops[j].deinit(vdev);
@ -204,8 +234,10 @@ const struct vpci_ops sharing_mode_vpci_ops = {
void vpci_set_ptdev_intr_info(const struct acrn_vm *target_vm, uint16_t vbdf, uint16_t pbdf) void vpci_set_ptdev_intr_info(const struct acrn_vm *target_vm, uint16_t vbdf, uint16_t pbdf)
{ {
struct pci_vdev *vdev; struct pci_vdev *vdev;
union pci_bdf bdf;
vdev = sharing_mode_find_vdev((union pci_bdf)pbdf); bdf.value = pbdf;
vdev = sharing_mode_find_vdev_sos(bdf);
if (vdev == NULL) { if (vdev == NULL) {
pr_err("%s, can't find PCI device for vm%d, vbdf (0x%x) pbdf (0x%x)", __func__, pr_err("%s, can't find PCI device for vm%d, vbdf (0x%x) pbdf (0x%x)", __func__,
target_vm->vm_id, vbdf, pbdf); target_vm->vm_id, vbdf, pbdf);
@ -221,8 +253,10 @@ void vpci_reset_ptdev_intr_info(const struct acrn_vm *target_vm, uint16_t vbdf,
{ {
struct pci_vdev *vdev; struct pci_vdev *vdev;
struct acrn_vm *vm; struct acrn_vm *vm;
union pci_bdf bdf;
vdev = sharing_mode_find_vdev((union pci_bdf)pbdf); bdf.value = pbdf;
vdev = sharing_mode_find_vdev_sos(bdf);
if (vdev == NULL) { if (vdev == NULL) {
pr_err("%s, can't find PCI device for vm%d, vbdf (0x%x) pbdf (0x%x)", __func__, pr_err("%s, can't find PCI device for vm%d, vbdf (0x%x) pbdf (0x%x)", __func__,
target_vm->vm_id, vbdf, pbdf); target_vm->vm_id, vbdf, pbdf);