github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-17 00:41:30 +00:00
Code Issues Projects Releases Wiki Activity

ACRN: DM: Fix the virtio negotiated features bug.

Browse Source 
The virtio feature bits is 64bits but the access will be split
as two times 32bits access. This patch fixes the bug which overwrites
another side 32bits, and causes feature bits are lost.

Tracked-On: #7456
Signed-off-by: Liu Long <long.liu@linux.intel.com>
Reviewed-by: Conghui <conghui.chen@intel.com>
Acked-by: Wang, Yu1 <yu1.wang@intel.com>
This commit is contained in:
Liu Long 2022-05-11 14:14:01 +08:00 committed by acrnsi-robot
parent 46e41390b5
commit 49426147aa
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devicemodel/hw/pci/virtio/virtio.c
View File

@ -1387,6 +1387,7 @@ virtio_common_cfg_write(struct pci_vdev *dev, uint64_t offset, int size,
struct virtio_ops *vops;
const struct config_reg *cr;
const char *name;
uint64_t features = 0;
vops = base->vops;
name = vops->name;
@ -1421,9 +1422,15 @@ virtio_common_cfg_write(struct pci_vdev *dev, uint64_t offset, int size,
break;
if (base->driver_feature_select < 2) {
value &= 0xffffffff;
base->negotiated_caps =
(value << (base->driver_feature_select * 32))
& base->device_caps;
if (base->driver_feature_select == 0) {
features = base->device_caps & value;
base->negotiated_caps &= ~0xffffffffULL;
} else {
features = (value << 32)
& base->device_caps;
base->negotiated_caps &= 0xffffffffULL;
}
base->negotiated_caps |= features;
if (vops->apply_features)
(*vops->apply_features)(DEV_STRUCT(base),
base->negotiated_caps);

14
devicemodel/include/vhost.h
View File

@ -20,7 +20,7 @@
* @brief vhost APIs
*
* @addtogroup acrn_virtio
* @{
*
*/
struct vhost_vq {
@ -132,15 +132,15 @@ int vhost_dev_start(struct vhost_dev *vdev);
int vhost_dev_stop(struct vhost_dev *vdev);
/**
* @brief vhost kernel dev ioctrl function
* @brief vhost kernel dev ioctrl function.
*
* This interface is used to operation the vhost dev kernel.
*
* @param vdev Pointer to struct vhost_dev
* @param The request to vhost kernel
* @param The arguments of vhost kernel operation
* @param vdev Pointer to struct vhost_dev.
* @param request to vhost kernel.
* @param arg of vhost kernel operation.
*
* @return 0 on success and -1 on failure
* @return 0 on success and -1 on failure.
*/
int vhost_kernel_ioctl(struct vhost_dev *vdev, unsigned long int request, void *arg);
#endif
#endif /* __VHOST_H__ */