Re: [PATCH v2] hw/arm/smmuv3: Fix addr_mask for range-based invalidation

[Peter Maydell]

On Sat, 30 Jan 2021 at 04:32, Zenghui Yu  wrote:
>
> When handling guest range-based IOTLB invalidation, we should decode the TG
> field into the corresponding translation granule size so that we can pass
> the correct invalidation range to backend. Set @granule to (tg * 2 + 10) to
> properly emulate the architecture.
>
> Fixes: d52915616c05 ("hw/arm/smmuv3: Get prepared for range invalidation")
> Signed-off-by: Zenghui Yu 
> ---
> * From v1:
>   - Fix the compilation error
>
>  hw/arm/smmuv3.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
> index bbca0e9f20..98b99d4fe8 100644
> --- a/hw/arm/smmuv3.c
> +++ b/hw/arm/smmuv3.c
> @@ -801,7 +801,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
>  {
>  SMMUDevice *sdev = container_of(mr, SMMUDevice, iommu);
>  IOMMUTLBEvent event;
> -uint8_t granule = tg;
> +uint8_t granule;
>
>  if (!tg) {
>  SMMUEventInfo event = {.inval_ste_allowed = true};
> @@ -821,6 +821,8 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
>  return;
>  }
>  granule = tt->granule_sz;
> +} else {
> +granule = tg * 2 + 10;
>  }
>
>  event.type = IOMMU_NOTIFIER_UNMAP;



Applied to target-arm.next, thanks.

-- PMM

Re: [PATCH v2] hw/arm/smmuv3: Fix addr_mask for range-based invalidation

[Auger Eric]

Hi Zenghui,

On 1/30/21 5:32 AM, Zenghui Yu wrote:
> When handling guest range-based IOTLB invalidation, we should decode the TG
> field into the corresponding translation granule size so that we can pass
> the correct invalidation range to backend. Set @granule to (tg * 2 + 10) to
> properly emulate the architecture.
> 
> Fixes: d52915616c05 ("hw/arm/smmuv3: Get prepared for range invalidation")
> Signed-off-by: Zenghui Yu 
> ---
> * From v1:
>   - Fix the compilation error
> 
>  hw/arm/smmuv3.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
> index bbca0e9f20..98b99d4fe8 100644
> --- a/hw/arm/smmuv3.c
> +++ b/hw/arm/smmuv3.c
> @@ -801,7 +801,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
>  {
>  SMMUDevice *sdev = container_of(mr, SMMUDevice, iommu);
>  IOMMUTLBEvent event;
> -uint8_t granule = tg;
> +uint8_t granule;
>  
>  if (!tg) {
>  SMMUEventInfo event = {.inval_ste_allowed = true};
> @@ -821,6 +821,8 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
>  return;
>  }
>  granule = tt->granule_sz;
> +} else {
> +granule = tg * 2 + 10;
>  }
>  
>  event.type = IOMMU_NOTIFIER_UNMAP;
> 
Acked-by: Eric Auger 

Thanks

Eric

[PATCH v2] hw/arm/smmuv3: Fix addr_mask for range-based invalidation

[Zenghui Yu]

When handling guest range-based IOTLB invalidation, we should decode the TG
field into the corresponding translation granule size so that we can pass
the correct invalidation range to backend. Set @granule to (tg * 2 + 10) to
properly emulate the architecture.

Fixes: d52915616c05 ("hw/arm/smmuv3: Get prepared for range invalidation")
Signed-off-by: Zenghui Yu 
---
* From v1:
  - Fix the compilation error

 hw/arm/smmuv3.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index bbca0e9f20..98b99d4fe8 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -801,7 +801,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
 {
 SMMUDevice *sdev = container_of(mr, SMMUDevice, iommu);
 IOMMUTLBEvent event;
-uint8_t granule = tg;
+uint8_t granule;
 
 if (!tg) {
 SMMUEventInfo event = {.inval_ste_allowed = true};
@@ -821,6 +821,8 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
 return;
 }
 granule = tt->granule_sz;
+} else {
+granule = tg * 2 + 10;
 }
 
 event.type = IOMMU_NOTIFIER_UNMAP;
-- 
2.19.1