virtio-pci: Fix legacy device flag setting error in probe
PATCH 1/1 virtio-pci: Fix legacy device flag setting error in probe
The 'is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value of vp_dev->ldev.ioaddr. However, due to the shared memory of the union between struct virtio_pci_legacy_device and struct virtio_pci_modern_device, when virtio_pci_modern_probe modifies the content of struct virtio_pci_modern_device, it affects the content of struct virtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.
--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/virtio/virtio_pci_common.c +0 -2
@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)
drivers/virtio/virtio_pci_legacy.c +1 -0
@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;return 0 ; }
Signature · 1 line
2.37.1 (Apple Git-137.1)
Quoted 11 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.
Quoted 4 lines
Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>
Quoted 33 lines
--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +1
-1@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;return 0 ; } --2.37.1 (Apple Git-137.1)
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0
drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;
This seems break force_legacy for modern device:
if (force_legacy) {
rc = virtio_pci_legacy_probe(vp_dev);
/* Also try modern mode if we can't map BAR0 (no IO space). */
if (rc == -ENODEV || rc == -ENOMEM)
rc = virtio_pci_modern_probe(vp_dev);Thanks
Quoted 6 lines
drivers/virtio/virtio_pci_legacy.c +0
-1return 0 ; } --2.37.1 (Apple Git-137.1)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 50 lines · Jason Wang
External email: Use caution opening links or attachments
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;This seems break
force_legacyfor modern device:
Quoted 8 lines
if (force_legacy) { rc = virtio_pci_legacy_probe(vp_dev); /* Also try modern mode if we can't map BAR0 (no IO space). */ if (rc == -ENODEV || rc == -ENOMEM) rc = virtio_pci_modern_probe(vp_dev);Thanks
Will do, thanks
Quoted 7 lines
Quoted 6 lines
drivers/virtio/virtio_pci_legacy.c +0
-1return 0 ; } --2.37.1 (Apple Git-137.1)
Quoted 50 lines · Jason Wang
External email: Use caution opening links or attachments
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;This seems break
force_legacyfor modern device:
Quoted 8 lines
if (force_legacy) { rc = virtio_pci_legacy_probe(vp_dev); /* Also try modern mode if we can't map BAR0 (no IO space). */ if (rc == -ENODEV || rc == -ENOMEM) rc = virtio_pci_modern_probe(vp_dev);Thanks
Hi, Jason
In the case of force_legacy, if no IO space occurs, function will return directly after vp_legacy_probe, and will not run vp_dev->is_legacy = true; because vp_dev is allocated through kzalloc, the default vp_dev->is_legacy is false, which It is expected for modern device, so it will not break modern device.
What do you think?
int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) {
[...]
rc = vp_legacy_probe(ldev); if (rc) return rc; /* if no IO space, function will return from here */
[...]
vp_dev->is_legacy = true; }
Quoted 7 lines
Quoted 6 lines
return 0;}
--
2.37.1 (Apple Git-137.1)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerQuoted 47 lines · Jason Wang
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;This seems break
force_legacyfor modern device:
Quoted 7 lines
if (force_legacy) { rc = virtio_pci_legacy_probe(vp_dev); /* Also try modern mode if we can't map BAR0 (no IO space). */ if (rc == -ENODEV || rc == -ENOMEM) rc = virtio_pci_modern_probe(vp_dev);Thanks
don't see the breakage here - can you explain a bit more?
Quoted 6 lines
Quoted 6 lines
drivers/virtio/virtio_pci_legacy.c +0
-1return 0 ; } --2.37.1 (Apple Git-137.1)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 57 lines · Michael S. Tsirkin
External email: Use caution opening links or attachments
Quoted 53 lines · Jason Wang
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;This seems break
force_legacyfor modern device:if (force_legacy) { rc = virtio_pci_legacy_probe(vp_dev); /* Also try modern mode if we can't map BAR0 (no IO space). */ if (rc == -ENODEV || rc == -ENOMEM) rc = virtio_pci_modern_probe(vp_dev);
Quoted 4 lines
Quoted 1 line
Thanks
don't see the breakage here - can you explain a bit more?
Hi, Jason
I also think there is no breakage herea and gave an explanation in another email, please have a see.
So are there any comments about this bug fix patch? Can this patch pass the review?
Thanks
Feng
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
drivers/virtio/virtio_pci_legacy.c +0
-1return 0 ; } --2.37.1 (Apple Git-137.1)
Jason Wang
Acked-byQuoted 61 lines · Feng Liu
Quoted 57 lines · Michael S. Tsirkin
External email: Use caution opening links or attachments
Quoted 53 lines · Jason Wang
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;This seems break
force_legacyfor modern device:if (force_legacy) { rc = virtio_pci_legacy_probe(vp_dev); /* Also try modern mode if we can't map BAR0 (no IO space). */ if (rc == -ENODEV || rc == -ENOMEM) rc = virtio_pci_modern_probe(vp_dev);
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Thanks
don't see the breakage here - can you explain a bit more?
Hi, Jason
I also think there is no breakage herea and gave an explanation in another email, please have a see.
I think I've made a mistake, the patch should be fine.
Quoted 3 lines
So are there any comments about this bug fix patch? Can this patch pass the review?
Yes.
Thanks
Quoted 12 lines
Thanks
FengQuoted 7 lines
Quoted 6 lines
Quoted 6 lines
drivers/virtio/virtio_pci_legacy.c +0
-1return 0 ; } --2.37.1 (Apple Git-137.1)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 77 lines · Jason Wang
External email: Use caution opening links or attachments
Quoted 61 lines · Feng Liu
Quoted 57 lines · Michael S. Tsirkin
External email: Use caution opening links or attachments
Quoted 53 lines · Jason Wang
Quoted 39 lines · Feng Liu
The '
is_legacy' flag is used to differentiate between legacy vs modern device. Currently, it is based on the value ofvp_dev->ldev.ioaddr. However, due to the shared memory of the union between structvirtio_pci_legacy_deviceand structvirtio_pci_modern_device, whenvirtio_pci_modern_probemodifies the content of structvirtio_pci_modern_device, it affects the content of structvirtio_pci_legacy_device, and ldev.ioaddr is no longer zero, causing the 'is_legacy' flag to be set as true. To resolve issue, when legacy device is probed, mark 'is_legacy' as true, when modern device is probed, keep 'is_legacy' as false.Fixes 4f0fc22534e3 ("virtio_pci: Optimize virtio_pci_device structure size")Signed-off-by Feng Liu <[email protected]>Reviewed-by Parav Pandit <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- drivers/virtio/virtio_pci_common.c | 2 -- drivers/virtio/virtio_pci_legacy.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)drivers/virtio/virtio_pci_common.c +0
-2@@ -557,8 +557,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,pci_set_master (pci_dev); - vp_dev->is_legacy = vp_dev->ldev.ioaddr ? true : false; - rc =register_virtio_device (&vp_dev->vdev); reg_dev = vp_dev;if (rc)drivers/virtio/virtio_pci_legacy.c +0
-0drivers/virtio/virtio_pci_legacy.c int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) · line 226
Quoted 4 lines
drivers/virtio/virtio_pci_legacy.c +1
-0@@ -223,6 +223,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev) vp_dev->config_vector = vp_config_vector; vp_dev->setup_vq = setup_vq; vp_dev->del_vq = del_vq; + vp_dev->is_legacy = true;This seems break
force_legacyfor modern device:if (force_legacy) { rc = virtio_pci_legacy_probe(vp_dev); /* Also try modern mode if we can't map BAR0 (no IO space). */ if (rc == -ENODEV || rc == -ENOMEM) rc = virtio_pci_modern_probe(vp_dev);Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Thanks
don't see the breakage here - can you explain a bit more?
Hi, Jason
I also think there is no breakage herea and gave an explanation in another email, please have a see.
I think I've made a mistake, the patch should be fine.
Quoted 1 line
Quoted 9 lines
Quoted 2 lines
So are there any comments about this bug fix patch? Can this patch pass the review?
Yes.
Acked-by Jason Wang <[email protected]>Thanks
Thanks Jason
Quoted 13 lines
Quoted 12 lines
Thanks
FengQuoted 7 lines
Quoted 6 lines
Quoted 6 lines
drivers/virtio/virtio_pci_legacy.c +0
-1return 0 ; } --2.37.1 (Apple Git-137.1)