Fix NULL pointer dereference with virtio-blk-pci and virtual IOMMU
Subsystems (2)
cover Fix NULL pointer dereference with virtio-blk-pci and virtual IOMMU
When running a guest featuring a virtio-blk-pci protected with a virtual IOMMU we hit a NULL pointer dereference.
This series removes the dma_max_mapping_size() call in virtio_max_dma_size when the device does not have any dma_mask set. A check is also added to early return in dma_addressing_limited() if the dma_mask is NULL.
Eric Auger (2):
dma-mapping: Protect dma_addressing_limited against NULL dma_mask virtio/virtio_ring: Fix the dma_max_mapping_size call
drivers/virtio/virtio_ring.c | 2 +- include/linux/dma-mapping.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 dma-mapping: Protect dma_addressing_limited against NULL dma_mask
dma_addressing_limited() should not be called on a device with a NULL dma_mask. If this occurs let's WARN_ON_ONCE and immediately return. Existing call sites are updated separately.
---
v1 -> v2:
- add a WARN_ON_ONCE()
- reword the commit message
--- include/linux/dma-mapping.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/dma-mapping.h +3 -2
@@ -689,8 +689,9 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)*/ static inline bool dma_addressing_limited (struct device *dev) { -return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return WARN_ON_ONCE (!dev->dma_mask) ? false : +min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev); }#ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS
Signature · 1 line
2.20.1
PATCH 1/2 dma-mapping: Protect dma_addressing_limited against NULL dma_mask
In reply to Eric Augerdma_addressing_limited() should not be called on a device with a NULL dma_mask. If this occurs let's WARN_ON_ONCE and immediately return. Existing call sites are updated separately.
---
v1 -> v2:
- add a WARN_ON_ONCE()
- reword the commit message
--- include/linux/dma-mapping.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/dma-mapping.h +3 -2
@@ -689,8 +689,9 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)*/ static inline bool dma_addressing_limited (struct device *dev) { -return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return WARN_ON_ONCE (!dev->dma_mask) ? false : +min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev); }#ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS
Signature · 1 line
2.20.1
Re: [PATCH 1/2] dma-mapping: Protect dma_addressing_limited against NULL dma_mask
include/linux/dma-mapping.h static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) · line 694
Quoted 7 lines
static inline bool
dma_addressing_limited(struct device *dev){include/linux/dma-mapping.h +3
-2-return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return WARN_ON_ONCE (!dev->dma_mask) ? false : +min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev);
This should really use a separate if statement, but I can fix that up when applying it.
Re: [PATCH 1/2] dma-mapping: Protect dma_addressing_limited against NULL dma_mask
In reply to Eric Augerinclude/linux/dma-mapping.h static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) · line 694
Quoted 7 lines
static inline bool
dma_addressing_limited(struct device *dev){include/linux/dma-mapping.h +3
-2-return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return WARN_ON_ONCE (!dev->dma_mask) ? false : +min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev);
This should really use a separate if statement, but I can fix that up when applying it.
Re: [PATCH 1/2] dma-mapping: Protect dma_addressing_limited against NULL dma_mask
Hi Christoph,
Quoted 11 lines · Christoph Hellwig
include/linux/dma-mapping.h static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) · line 694
Quoted 7 lines
static inline bool
dma_addressing_limited(struct device *dev){include/linux/dma-mapping.h +3
-2-return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return WARN_ON_ONCE (!dev->dma_mask) ? false : +min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev);This should really use a separate if statement, but I can fix that up when applying it.
Just wondering why we don't use the dma_get_mask() accessor which returns DMA_BIT_MASK(32) in case the dma_mask is not set.
Do you foresee any issue and would it still mandate to add dma_mask checks on each call sites?
Thanks
Eric
Re: [PATCH 1/2] dma-mapping: Protect dma_addressing_limited against NULL dma_mask
In reply to Christoph HellwigHi Christoph,
Quoted 11 lines · Christoph Hellwig
include/linux/dma-mapping.h static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) · line 694
Quoted 7 lines
static inline bool
dma_addressing_limited(struct device *dev){include/linux/dma-mapping.h +3
-2-return min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < -dma_get_required_mask (dev); +return WARN_ON_ONCE (!dev->dma_mask) ? false : +min_not_zero (*dev->dma_mask, dev->bus_dma_mask) < +dma_get_required_mask (dev);This should really use a separate if statement, but I can fix that up when applying it.
Just wondering why we don't use the dma_get_mask() accessor which returns DMA_BIT_MASK(32) in case the dma_mask is not set.
Do you foresee any issue and would it still mandate to add dma_mask checks on each call sites?
Thanks
Eric
PATCH 2/2 virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerDo not call dma_max_mapping_size for devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.
This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virtio/virtio_ring.c +1 -1
@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask) max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;
Signature · 1 line
2.20.1
PATCH 2/2 virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerDo not call dma_max_mapping_size for devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.
This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virtio/virtio_ring.c +1 -1
@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask) max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;
Signature · 1 line
2.20.1
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Looks good. virtio maintainers, let me know if you want to queue it up or if I should pick the patch up through the dma-mapping tree.
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerQuoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Looks good. virtio maintainers, let me know if you want to queue it up or if I should pick the patch up through the dma-mapping tree.
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Quoted 6 lines
Quoted 3 lines
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Looks good. virtio maintainers, let me know if you want to queue it up or if I should pick the patch up through the dma-mapping tree.
Personally I dislike this API because I feel presence of dma mask does not strictly have to reflect max size. And generally the requirement to check presence of mask feels like an undocumented hack to me. Even reading code will not help you avoid the warning, everyone will get it wrong and get the warning splat in their logs. So I would prefer just v1 of the patch that makes dma API do the right thing for us.
However, if that's not going to be the case, let's fix it up in virtio. In any case, for both v1 and v2 of the patches, you can merge them through your tree:
Signature · 1 line
MST
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
Quoted 6 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Quoted 6 lines
Quoted 3 lines
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>Looks good. virtio maintainers, let me know if you want to queue it up or if I should pick the patch up through the dma-mapping tree.
Personally I dislike this API because I feel presence of dma mask does not strictly have to reflect max size. And generally the requirement to check presence of mask feels like an undocumented hack to me. Even reading code will not help you avoid the warning, everyone will get it wrong and get the warning splat in their logs. So I would prefer just v1 of the patch that makes dma API do the right thing for us.
However, if that's not going to be the case, let's fix it up in virtio. In any case, for both v1 and v2 of the patches, you can merge them through your tree:
Signature · 1 line
MST
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerQuoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Christoph, I wonder why did you suggest this? The connection between dma_mask and dma_max_mapping_size is far from obvious. The documentation doesn't exist. Do we really have to teach all users about this hack? Why not just make dma_max_mapping_size DTRT?
Quoted 19 lines
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/virtio/virtio_ring.c +1
-1@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask) max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;Signature · 1 line
2.20.1
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerQuoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Christoph, I wonder why did you suggest this? The connection between dma_mask and dma_max_mapping_size is far from obvious. The documentation doesn't exist. Do we really have to teach all users about this hack? Why not just make dma_max_mapping_size DTRT?
Quoted 19 lines
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/virtio/virtio_ring.c +1
-1@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask) max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;Signature · 1 line
2.20.1
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 11 lines · Michael S. Tsirkin
Quoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Quoted 5 lines
Christoph, I wonder why did you suggest this? The connection between
dma_maskanddma_max_mapping_sizeis far from obvious. The documentation doesn't exist. Do we really have to teach all users about this hack? Why not just makedma_max_mapping_sizeDTRT?
Because we should not call into dma API functions for devices that are not DMA capable.
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Michael S. TsirkinQuoted 11 lines · Michael S. Tsirkin
Quoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Quoted 5 lines
Christoph, I wonder why did you suggest this? The connection between
dma_maskanddma_max_mapping_sizeis far from obvious. The documentation doesn't exist. Do we really have to teach all users about this hack? Why not just makedma_max_mapping_sizeDTRT?
Because we should not call into dma API functions for devices that are not DMA capable.
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 12 lines · Christoph Hellwig
Quoted 11 lines · Michael S. Tsirkin
Quoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Quoted 8 lines
Quoted 5 lines
Christoph, I wonder why did you suggest this? The connection between
dma_maskanddma_max_mapping_sizeis far from obvious. The documentation doesn't exist. Do we really have to teach all users about this hack? Why not just makedma_max_mapping_sizeDTRT?Because we should not call into dma API functions for devices that are not DMA capable.
I'd rather call is_device_dma_capable then, better than poking at DMA internals.
Signature · 1 line
MST
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Christoph HellwigQuoted 12 lines · Christoph Hellwig
Quoted 11 lines · Michael S. Tsirkin
Quoted 9 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>
Quoted 8 lines
Quoted 5 lines
Christoph, I wonder why did you suggest this? The connection between
dma_maskanddma_max_mapping_sizeis far from obvious. The documentation doesn't exist. Do we really have to teach all users about this hack? Why not just makedma_max_mapping_sizeDTRT?Because we should not call into dma API functions for devices that are not DMA capable.
I'd rather call is_device_dma_capable then, better than poking at DMA internals.
Signature · 1 line
MST
Robin Murphy
reviewerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerQuoted 18 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/virtio/virtio_ring.c +0
-0
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 5 lines
drivers/virtio/virtio_ring.c +1
-1@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask)
Hmm, might it make sense to roll that check up into vring_use_dma_api() itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Robin.
Quoted 4 lines
drivers/virtio/virtio_ring.c +0
-0max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;
Robin Murphy
reviewerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Eric AugerQuoted 18 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/virtio/virtio_ring.c +0
-0
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 5 lines
drivers/virtio/virtio_ring.c +1
-1@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask)
Hmm, might it make sense to roll that check up into vring_use_dma_api() itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Robin.
Quoted 4 lines
drivers/virtio/virtio_ring.c +0
-0max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 28 lines · Robin Murphy
Quoted 18 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/virtio/virtio_ring.c +0
-0drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 264
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-1@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Quoted 1 line
Robin.
Nope, Eric pointed out it's just dma_addressing_limited that is broken.
Other APIs call dma_get_mask which handles the NULL mask case fine.
Quoted 3 lines
Quoted 3 lines
drivers/virtio/virtio_ring.c +0
-0max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Robin MurphyQuoted 28 lines · Robin Murphy
Quoted 18 lines · Eric Auger
Do not call
dma_max_mapping_sizefor devices that have no DMA mask set, otherwise we can hit a NULL pointer dereference.This occurs when a virtio-blk-pci device is protected with a virtual IOMMU.
Fixes e6d6dd6c875e ("virtio: Introduce virtio_max_dma_size()")Signed-off-by Eric Auger <[email protected]>Suggested-by Christoph Hellwig <[email protected]>--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/virtio/virtio_ring.c +0
-0drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 264
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-1@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev) {size_t max_segment_size =SIZE_MAX ; -if (vring_use_dma_api (vdev)) +if (vring_use_dma_api (vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Quoted 1 line
Robin.
Nope, Eric pointed out it's just dma_addressing_limited that is broken.
Other APIs call dma_get_mask which handles the NULL mask case fine.
Quoted 3 lines
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev)
Quoted 3 lines
drivers/virtio/virtio_ring.c +0
-0max_segment_size =dma_max_mapping_size (&vdev->dev);return max_segment_size;
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Robin MurphyQuoted 5 lines · Robin Murphy
Quoted 5 lines
drivers/virtio/virtio_ring.c +0
-0@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)
Quoted 8 lines
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-0{size_t max_segment_size =SIZE_MAX ; - if (vring_use_dma_api(vdev)) + if (vring_use_dma_api(vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Makes sense to me.
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 15 lines · Christoph Hellwig
Quoted 5 lines · Robin Murphy
Quoted 5 lines
drivers/virtio/virtio_ring.c +0
-0@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)Quoted 8 lines
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-0{size_t max_segment_size =SIZE_MAX ; - if (vring_use_dma_api(vdev)) + if (vring_use_dma_api(vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Quoted 1 line
Makes sense to me.
Christoph - would a documented API wrapping dma_mask make sense? With the documentation explaining how users must desist from using DMA APIs if that returns false ...
Signature · 1 line
MST
Michael S. Tsirkin
maintainerRe: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Christoph HellwigQuoted 15 lines · Christoph Hellwig
Quoted 5 lines · Robin Murphy
Quoted 5 lines
drivers/virtio/virtio_ring.c +0
-0@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)Quoted 8 lines
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-0{size_t max_segment_size =SIZE_MAX ; - if (vring_use_dma_api(vdev)) + if (vring_use_dma_api(vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Quoted 1 line
Makes sense to me.
Christoph - would a documented API wrapping dma_mask make sense? With the documentation explaining how users must desist from using DMA APIs if that returns false ...
Signature · 1 line
MST
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 3 lines · Michael S. Tsirkin
Christoph - would a documented API wrapping
dma_maskmake sense? With the documentation explaining how users must desist from using DMA APIs if that returns false ...
We have some bigger changes in this are planned, including turning dma_mask into a scalar instead of a pointer, please stay tuned.
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Michael S. TsirkinQuoted 3 lines · Michael S. Tsirkin
Christoph - would a documented API wrapping
dma_maskmake sense? With the documentation explaining how users must desist from using DMA APIs if that returns false ...
We have some bigger changes in this are planned, including turning dma_mask into a scalar instead of a pointer, please stay tuned.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Christoph HellwigHi,
Quoted 15 lines · Christoph Hellwig
Quoted 5 lines · Robin Murphy
Quoted 5 lines
drivers/virtio/virtio_ring.c +0
-0@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)Quoted 8 lines
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-0{size_t max_segment_size =SIZE_MAX ; - if (vring_use_dma_api(vdev)) + if (vring_use_dma_api(vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Quoted 2 lines
Makes sense to me.
I am confused: if vring_use_dma_api() returns false if the dma_mask is unset (ie. vring_use_dma_api() returns false), the virtio-blk-pci device will not be able to get translated addresses and won't work properly.
The patch above allows the dma api to be used and only influences the max_segment_size and it works properly.
So is it normal the dma_mask is unset in my case?
Thanks
Eric
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Christoph HellwigHi,
Quoted 15 lines · Christoph Hellwig
Quoted 5 lines · Robin Murphy
Quoted 5 lines
drivers/virtio/virtio_ring.c +0
-0@@ -262,7 +262,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)Quoted 8 lines
drivers/virtio/virtio_ring.c size_t virtio_max_dma_size(struct virtio_device *vdev) · line 265
Quoted 4 lines
drivers/virtio/virtio_ring.c +1
-0{size_t max_segment_size =SIZE_MAX ; - if (vring_use_dma_api(vdev)) + if (vring_use_dma_api(vdev) && vdev->dev.dma_mask)Hmm, might it make sense to roll that check up into
vring_use_dma_api()itself? After all, if the device has no mask then it's likely that other DMA API ops wouldn't really work as expected either.
Quoted 2 lines
Makes sense to me.
I am confused: if vring_use_dma_api() returns false if the dma_mask is unset (ie. vring_use_dma_api() returns false), the virtio-blk-pci device will not be able to get translated addresses and won't work properly.
The patch above allows the dma api to be used and only influences the max_segment_size and it works properly.
So is it normal the dma_mask is unset in my case?
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Quoted 8 lines · Auger Eric
I am confused: if
vring_use_dma_api()returns false if thedma_maskis unset (ie.vring_use_dma_api()returns false), the virtio-blk-pci device will not be able to get translated addresses and won't work properly.The patch above allows the dma api to be used and only influences the
max_segment_sizeand it works properly.So is it normal the
dma_maskis unset in my case?
Its not normal. I assume you use virtio-nmio? Due to the mess with the dma_mask being a pointer a lot of subsystems forgot to set a dma mask up, and oddly enough seem to mostly get away with it.
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Auger EricQuoted 8 lines · Auger Eric
I am confused: if
vring_use_dma_api()returns false if thedma_maskis unset (ie.vring_use_dma_api()returns false), the virtio-blk-pci device will not be able to get translated addresses and won't work properly.The patch above allows the dma api to be used and only influences the
max_segment_sizeand it works properly.So is it normal the
dma_maskis unset in my case?
Its not normal. I assume you use virtio-nmio? Due to the mess with the dma_mask being a pointer a lot of subsystems forgot to set a dma mask up, and oddly enough seem to mostly get away with it.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
Hi Christoph, Michael,
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Auger Eric
I am confused: if
vring_use_dma_api()returns false if thedma_maskis unset (ie.vring_use_dma_api()returns false), the virtio-blk-pci device will not be able to get translated addresses and won't work properly.
Quoted 9 lines
Quoted 4 lines
The patch above allows the dma api to be used and only influences the
max_segment_sizeand it works properly.So is it normal the
dma_maskis unset in my case?Its not normal. I assume you use virtio-nmio? Due to the mess with the
dma_maskbeing a pointer a lot of subsystems forgot to set a dma mask up, and oddly enough seem to mostly get away with it.
No the issue is encountered with virtio-blk-pci
I think the problem is virtio_max_dma_size() is called from virtblk_probe (virtio_blk.c) on the virtio<n> device and not the actual virtio_pci_device which has a dma_mask set. I don't think the virtio<n> device ever has a dma_mask set.
We do not hit the guest crash on the virtio-net-pci device as the virtio-net driver does not call virtio_max_dma_size() on the virtio<n> device.
Does fd1068e1860e ("virtio-blk: Consider virtio_max_dma_size() for maximum segment size") call virtio_max_dma_size() on the right device?
Thanks
Eric
Re: [PATCH 2/2] virtio/virtio_ring: Fix the dma_max_mapping_size call
In reply to Christoph HellwigHi Christoph, Michael,
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Auger Eric
I am confused: if
vring_use_dma_api()returns false if thedma_maskis unset (ie.vring_use_dma_api()returns false), the virtio-blk-pci device will not be able to get translated addresses and won't work properly.
Quoted 9 lines
Quoted 4 lines
The patch above allows the dma api to be used and only influences the
max_segment_sizeand it works properly.So is it normal the
dma_maskis unset in my case?Its not normal. I assume you use virtio-nmio? Due to the mess with the
dma_maskbeing a pointer a lot of subsystems forgot to set a dma mask up, and oddly enough seem to mostly get away with it.
No the issue is encountered with virtio-blk-pci
I think the problem is virtio_max_dma_size() is called from virtblk_probe (virtio_blk.c) on the virtio<n> device and not the actual virtio_pci_device which has a dma_mask set. I don't think the virtio<n> device ever has a dma_mask set.
We do not hit the guest crash on the virtio-net-pci device as the virtio-net driver does not call virtio_max_dma_size() on the virtio<n> device.
Does fd1068e1860e ("virtio-blk: Consider virtio_max_dma_size() for maximum segment size") call virtio_max_dma_size() on the right device?
Thanks
Eric
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu