Messages in this thread | | | Subject | Re: [PATCH v3 4/8] iommu/vt-d: Avoid duplicated code for PASID setup | From | Auger Eric <> | Date | Wed, 20 Nov 2019 22:01:21 +0100 |
| |
Hi Jacob,
On 11/19/19 6:56 PM, Jacob Pan wrote: > After each setup for PASID entry, related translation caches must be > flushed. We can combine duplicated code into one function which is less > error prone. > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> > Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com> > Acked-by: Lu Baolu <baolu.lu@linux.intel.com> I sent my R-b already on v2: Reviewed-by: Eric Auger <eric.auger@redhat.com>
Eric > --- > drivers/iommu/intel-pasid.c | 48 +++++++++++++++++---------------------------- > 1 file changed, 18 insertions(+), 30 deletions(-) > > diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c > index e7cb0b8a7332..732bfee228df 100644 > --- a/drivers/iommu/intel-pasid.c > +++ b/drivers/iommu/intel-pasid.c > @@ -465,6 +465,21 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, > devtlb_invalidation_with_pasid(iommu, dev, pasid); > } > > +static void pasid_flush_caches(struct intel_iommu *iommu, > + struct pasid_entry *pte, > + int pasid, u16 did) > +{ > + if (!ecap_coherent(iommu->ecap)) > + clflush_cache_range(pte, sizeof(*pte)); > + > + if (cap_caching_mode(iommu->cap)) { > + pasid_cache_invalidation_with_pasid(iommu, did, pasid); > + iotlb_invalidation_with_pasid(iommu, did, pasid); > + } else { > + iommu_flush_write_buffer(iommu); > + } > +} > + > /* > * Set up the scalable mode pasid table entry for first only > * translation type. > @@ -518,16 +533,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, > /* Setup Present and PASID Granular Transfer Type: */ > pasid_set_translation_type(pte, 1); > pasid_set_present(pte); > - > - if (!ecap_coherent(iommu->ecap)) > - clflush_cache_range(pte, sizeof(*pte)); > - > - if (cap_caching_mode(iommu->cap)) { > - pasid_cache_invalidation_with_pasid(iommu, did, pasid); > - iotlb_invalidation_with_pasid(iommu, did, pasid); > - } else { > - iommu_flush_write_buffer(iommu); > - } > + pasid_flush_caches(iommu, pte, pasid, did); > > return 0; > } > @@ -591,16 +597,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu, > */ > pasid_set_sre(pte); > pasid_set_present(pte); > - > - if (!ecap_coherent(iommu->ecap)) > - clflush_cache_range(pte, sizeof(*pte)); > - > - if (cap_caching_mode(iommu->cap)) { > - pasid_cache_invalidation_with_pasid(iommu, did, pasid); > - iotlb_invalidation_with_pasid(iommu, did, pasid); > - } else { > - iommu_flush_write_buffer(iommu); > - } > + pasid_flush_caches(iommu, pte, pasid, did); > > return 0; > } > @@ -634,16 +631,7 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, > */ > pasid_set_sre(pte); > pasid_set_present(pte); > - > - if (!ecap_coherent(iommu->ecap)) > - clflush_cache_range(pte, sizeof(*pte)); > - > - if (cap_caching_mode(iommu->cap)) { > - pasid_cache_invalidation_with_pasid(iommu, did, pasid); > - iotlb_invalidation_with_pasid(iommu, did, pasid); > - } else { > - iommu_flush_write_buffer(iommu); > - } > + pasid_flush_caches(iommu, pte, pasid, did); > > return 0; > } >
| |