* [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML @ 2020-11-26 3:42 Zhen Lei 2021-01-22 12:51 ` Will Deacon 0 siblings, 1 reply; 16+ messages in thread From: Zhen Lei @ 2020-11-26 3:42 UTC (permalink / raw) To: Will Deacon, Robin Murphy, Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel Cc: Zhen Lei, Yang Yingliang When changing from a set of pages/smaller blocks to a larger block for an address, the software should follow the sequence of BBML processing. When changing from a block to a set of pages/smaller blocks for an address, there's no need to use nT bit. If an address in the large block is accessed before page table switching, the TLB caches the large block mapping. After the page table is switched and before TLB invalidation finished, new access requests are still based on large block mapping. After the block or page is invalidated, the system reads the small block or page mapping from the memory; If the address in the large block is not accessed before page table switching, the TLB has no cache. After the page table is switched, a new access is initiated to read the small block or page mapping from the memory. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- include/linux/io-pgtable.h | 1 + 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index e634bbe60573..14a1a11565fb 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, .tlb = &arm_smmu_flush_ops, .iommu_dev = smmu->dev, + .bbml = smmu->bbml, }; if (smmu_domain->non_strict) @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) /* IDR3 */ reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); + smmu->bbml = FIELD_GET(IDR3_BBML, reg); if (FIELD_GET(IDR3_RIL, reg)) smmu->features |= ARM_SMMU_FEAT_RANGE_INV; diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index d4b7f40ccb02..aa7eb460fa09 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -51,6 +51,7 @@ #define IDR1_SIDSIZE GENMASK(5, 0) #define ARM_SMMU_IDR3 0xc +#define IDR3_BBML GENMASK(12, 11) #define IDR3_RIL (1 << 10) #define ARM_SMMU_IDR5 0x14 @@ -617,6 +618,7 @@ struct arm_smmu_device { int gerr_irq; int combined_irq; + int bbml; unsigned long ias; /* IPA */ unsigned long oas; /* PA */ diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index a7a9bc08dcd1..341581337ad0 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -72,6 +72,7 @@ #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, phys_addr_t paddr, arm_lpae_iopte prot, - int lvl, arm_lpae_iopte *ptep) + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) { arm_lpae_iopte pte = prot; @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, pte |= ARM_LPAE_PTE_TYPE_BLOCK; pte |= paddr_to_iopte(paddr, data); + pte |= nT; __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); } +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, + arm_lpae_iopte *ptep); static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, unsigned long iova, phys_addr_t paddr, arm_lpae_iopte prot, int lvl, arm_lpae_iopte *ptep) { arm_lpae_iopte pte = *ptep; + struct io_pgtable_cfg *cfg = &data->iop.cfg; if (iopte_leaf(pte, lvl, data->iop.fmt)) { /* We require an unmap first */ WARN_ON(!selftest_running); return -EEXIST; } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { - /* - * We need to unmap and free the old table before - * overwriting it with a block entry. - */ arm_lpae_iopte *tblp; + struct io_pgtable *iop = &data->iop; size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { - WARN_ON(1); - return -EINVAL; + switch (cfg->bbml) { + case 0: + /* + * We need to unmap and free the old table before + * overwriting it with a block entry. + */ + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { + WARN_ON(1); + return -EINVAL; + } + break; + case 1: + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); + + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); + tblp = iopte_deref(pte, data); + __arm_lpae_free_pgtable(data, lvl + 1, tblp); + break; + case 2: + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); + + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); + tblp = iopte_deref(pte, data); + __arm_lpae_free_pgtable(data, lvl + 1, tblp); + return 0; } } - __arm_lpae_init_pte(data, paddr, prot, lvl, ptep); + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); return 0; } @@ -537,7 +561,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, if (i == unmap_idx) continue; - __arm_lpae_init_pte(data, blk_paddr, pte, lvl, &tablep[i]); + __arm_lpae_init_pte(data, blk_paddr, pte, lvl, &tablep[i], 0); } pte = arm_lpae_install_table(tablep, ptep, blk_pte, cfg); diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index 4cde111e425b..0a45c2818686 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -98,6 +98,7 @@ struct io_pgtable_cfg { unsigned int ias; unsigned int oas; bool coherent_walk; + int bbml; const struct iommu_flush_ops *tlb; struct device *iommu_dev; -- 2.26.0.106.g9fadedd ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2020-11-26 3:42 [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML Zhen Lei @ 2021-01-22 12:51 ` Will Deacon 2021-01-22 13:00 ` Robin Murphy 2021-01-23 10:08 ` Leizhen (ThunderTown) 0 siblings, 2 replies; 16+ messages in thread From: Will Deacon @ 2021-01-22 12:51 UTC (permalink / raw) To: Zhen Lei Cc: Robin Murphy, Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: > When changing from a set of pages/smaller blocks to a larger block for an > address, the software should follow the sequence of BBML processing. > > When changing from a block to a set of pages/smaller blocks for an > address, there's no need to use nT bit. If an address in the large block > is accessed before page table switching, the TLB caches the large block > mapping. After the page table is switched and before TLB invalidation > finished, new access requests are still based on large block mapping. > After the block or page is invalidated, the system reads the small block > or page mapping from the memory; If the address in the large block is not > accessed before page table switching, the TLB has no cache. After the > page table is switched, a new access is initiated to read the small block > or page mapping from the memory. > > Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + > drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- > include/linux/io-pgtable.h | 1 + > 4 files changed, 40 insertions(+), 11 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index e634bbe60573..14a1a11565fb 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, > .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, > .tlb = &arm_smmu_flush_ops, > .iommu_dev = smmu->dev, > + .bbml = smmu->bbml, > }; > > if (smmu_domain->non_strict) > @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) > > /* IDR3 */ > reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); > + smmu->bbml = FIELD_GET(IDR3_BBML, reg); > if (FIELD_GET(IDR3_RIL, reg)) > smmu->features |= ARM_SMMU_FEAT_RANGE_INV; > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > index d4b7f40ccb02..aa7eb460fa09 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > @@ -51,6 +51,7 @@ > #define IDR1_SIDSIZE GENMASK(5, 0) > > #define ARM_SMMU_IDR3 0xc > +#define IDR3_BBML GENMASK(12, 11) > #define IDR3_RIL (1 << 10) > > #define ARM_SMMU_IDR5 0x14 > @@ -617,6 +618,7 @@ struct arm_smmu_device { > > int gerr_irq; > int combined_irq; > + int bbml; > > unsigned long ias; /* IPA */ > unsigned long oas; /* PA */ > diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c > index a7a9bc08dcd1..341581337ad0 100644 > --- a/drivers/iommu/io-pgtable-arm.c > +++ b/drivers/iommu/io-pgtable-arm.c > @@ -72,6 +72,7 @@ > > #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) > #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) > +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) > #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) > #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) > #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) > @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, > > static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, > phys_addr_t paddr, arm_lpae_iopte prot, > - int lvl, arm_lpae_iopte *ptep) > + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) > { > arm_lpae_iopte pte = prot; > > @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, > pte |= ARM_LPAE_PTE_TYPE_BLOCK; > > pte |= paddr_to_iopte(paddr, data); > + pte |= nT; > > __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); > } > > +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, > + arm_lpae_iopte *ptep); > static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, > unsigned long iova, phys_addr_t paddr, > arm_lpae_iopte prot, int lvl, > arm_lpae_iopte *ptep) > { > arm_lpae_iopte pte = *ptep; > + struct io_pgtable_cfg *cfg = &data->iop.cfg; > > if (iopte_leaf(pte, lvl, data->iop.fmt)) { > /* We require an unmap first */ > WARN_ON(!selftest_running); > return -EEXIST; > } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { > - /* > - * We need to unmap and free the old table before > - * overwriting it with a block entry. > - */ > arm_lpae_iopte *tblp; > + struct io_pgtable *iop = &data->iop; > size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); > > - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); > - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { > - WARN_ON(1); > - return -EINVAL; > + switch (cfg->bbml) { > + case 0: > + /* > + * We need to unmap and free the old table before > + * overwriting it with a block entry. > + */ > + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); > + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { > + WARN_ON(1); > + return -EINVAL; > + } > + break; > + case 1: > + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); > + > + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); > + tblp = iopte_deref(pte, data); > + __arm_lpae_free_pgtable(data, lvl + 1, tblp); > + break; > + case 2: > + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); > + > + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); > + tblp = iopte_deref(pte, data); > + __arm_lpae_free_pgtable(data, lvl + 1, tblp); > + return 0; Sorry, but I really don't understand what you're trying to do here. The old code uses BBM for the table -> block path so we don't need anything extra here. The dodgy case is when we unmap part of a block, and end up installing a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there could be ongoing DMA to parts of the block mapping that we want to remain in place. Are you seeing a problem in practice? Will ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-22 12:51 ` Will Deacon @ 2021-01-22 13:00 ` Robin Murphy 2021-01-22 13:21 ` Leizhen (ThunderTown) 2021-01-23 10:20 ` Leizhen (ThunderTown) 2021-01-23 10:08 ` Leizhen (ThunderTown) 1 sibling, 2 replies; 16+ messages in thread From: Robin Murphy @ 2021-01-22 13:00 UTC (permalink / raw) To: Will Deacon, Zhen Lei Cc: Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021-01-22 12:51, Will Deacon wrote: > On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: >> When changing from a set of pages/smaller blocks to a larger block for an >> address, the software should follow the sequence of BBML processing. >> >> When changing from a block to a set of pages/smaller blocks for an >> address, there's no need to use nT bit. If an address in the large block >> is accessed before page table switching, the TLB caches the large block >> mapping. After the page table is switched and before TLB invalidation >> finished, new access requests are still based on large block mapping. >> After the block or page is invalidated, the system reads the small block >> or page mapping from the memory; If the address in the large block is not >> accessed before page table switching, the TLB has no cache. After the >> page table is switched, a new access is initiated to read the small block >> or page mapping from the memory. >> >> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >> --- >> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + >> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + >> drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- >> include/linux/io-pgtable.h | 1 + >> 4 files changed, 40 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >> index e634bbe60573..14a1a11565fb 100644 >> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >> @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, >> .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, >> .tlb = &arm_smmu_flush_ops, >> .iommu_dev = smmu->dev, >> + .bbml = smmu->bbml, >> }; >> >> if (smmu_domain->non_strict) >> @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) >> >> /* IDR3 */ >> reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); >> + smmu->bbml = FIELD_GET(IDR3_BBML, reg); >> if (FIELD_GET(IDR3_RIL, reg)) >> smmu->features |= ARM_SMMU_FEAT_RANGE_INV; >> >> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >> index d4b7f40ccb02..aa7eb460fa09 100644 >> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >> @@ -51,6 +51,7 @@ >> #define IDR1_SIDSIZE GENMASK(5, 0) >> >> #define ARM_SMMU_IDR3 0xc >> +#define IDR3_BBML GENMASK(12, 11) >> #define IDR3_RIL (1 << 10) >> >> #define ARM_SMMU_IDR5 0x14 >> @@ -617,6 +618,7 @@ struct arm_smmu_device { >> >> int gerr_irq; >> int combined_irq; >> + int bbml; >> >> unsigned long ias; /* IPA */ >> unsigned long oas; /* PA */ >> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c >> index a7a9bc08dcd1..341581337ad0 100644 >> --- a/drivers/iommu/io-pgtable-arm.c >> +++ b/drivers/iommu/io-pgtable-arm.c >> @@ -72,6 +72,7 @@ >> >> #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) >> #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) >> +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) >> #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) >> #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) >> #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) >> @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, >> >> static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >> phys_addr_t paddr, arm_lpae_iopte prot, >> - int lvl, arm_lpae_iopte *ptep) >> + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) >> { >> arm_lpae_iopte pte = prot; >> >> @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >> pte |= ARM_LPAE_PTE_TYPE_BLOCK; >> >> pte |= paddr_to_iopte(paddr, data); >> + pte |= nT; >> >> __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); >> } >> >> +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, >> + arm_lpae_iopte *ptep); >> static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >> unsigned long iova, phys_addr_t paddr, >> arm_lpae_iopte prot, int lvl, >> arm_lpae_iopte *ptep) >> { >> arm_lpae_iopte pte = *ptep; >> + struct io_pgtable_cfg *cfg = &data->iop.cfg; >> >> if (iopte_leaf(pte, lvl, data->iop.fmt)) { >> /* We require an unmap first */ >> WARN_ON(!selftest_running); >> return -EEXIST; >> } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { >> - /* >> - * We need to unmap and free the old table before >> - * overwriting it with a block entry. >> - */ >> arm_lpae_iopte *tblp; >> + struct io_pgtable *iop = &data->iop; >> size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); >> >> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >> - WARN_ON(1); >> - return -EINVAL; >> + switch (cfg->bbml) { >> + case 0: >> + /* >> + * We need to unmap and free the old table before >> + * overwriting it with a block entry. >> + */ >> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >> + WARN_ON(1); >> + return -EINVAL; >> + } >> + break; >> + case 1: >> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); >> + >> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >> + tblp = iopte_deref(pte, data); >> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >> + break; >> + case 2: >> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); >> + >> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >> + tblp = iopte_deref(pte, data); >> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >> + return 0; > > Sorry, but I really don't understand what you're trying to do here. The old > code uses BBM for the table -> block path so we don't need anything extra > here. The dodgy case is when we unmap part of a block, and end up installing > a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there > could be ongoing DMA to parts of the block mapping that we want to remain in > place. > > Are you seeing a problem in practice? Right, I was under the assumption that we could ignore BBML because we should never have a legitimate reason to split blocks. I'm certainly not keen on piling any more complexity into split_blk_unmap, because the IOMMU API clearly doesn't have a well-defined behaviour for that case anyway - some other drivers will just unmap the entire block, and IIRC there was a hint somewhere in VFIO that it might actually expect that behaviour. Robin. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-22 13:00 ` Robin Murphy @ 2021-01-22 13:21 ` Leizhen (ThunderTown) 2021-01-22 13:26 ` Will Deacon 2021-01-23 10:20 ` Leizhen (ThunderTown) 1 sibling, 1 reply; 16+ messages in thread From: Leizhen (ThunderTown) @ 2021-01-22 13:21 UTC (permalink / raw) To: Robin Murphy, Will Deacon Cc: Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021/1/22 21:00, Robin Murphy wrote: > On 2021-01-22 12:51, Will Deacon wrote: >> On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: >>> When changing from a set of pages/smaller blocks to a larger block for an >>> address, the software should follow the sequence of BBML processing. >>> >>> When changing from a block to a set of pages/smaller blocks for an >>> address, there's no need to use nT bit. If an address in the large block >>> is accessed before page table switching, the TLB caches the large block >>> mapping. After the page table is switched and before TLB invalidation >>> finished, new access requests are still based on large block mapping. >>> After the block or page is invalidated, the system reads the small block >>> or page mapping from the memory; If the address in the large block is not >>> accessed before page table switching, the TLB has no cache. After the >>> page table is switched, a new access is initiated to read the small block >>> or page mapping from the memory. >>> >>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >>> --- >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + >>> drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- >>> include/linux/io-pgtable.h | 1 + >>> 4 files changed, 40 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> index e634bbe60573..14a1a11565fb 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, >>> .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, >>> .tlb = &arm_smmu_flush_ops, >>> .iommu_dev = smmu->dev, >>> + .bbml = smmu->bbml, >>> }; >>> if (smmu_domain->non_strict) >>> @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) >>> /* IDR3 */ >>> reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); >>> + smmu->bbml = FIELD_GET(IDR3_BBML, reg); >>> if (FIELD_GET(IDR3_RIL, reg)) >>> smmu->features |= ARM_SMMU_FEAT_RANGE_INV; >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> index d4b7f40ccb02..aa7eb460fa09 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> @@ -51,6 +51,7 @@ >>> #define IDR1_SIDSIZE GENMASK(5, 0) >>> #define ARM_SMMU_IDR3 0xc >>> +#define IDR3_BBML GENMASK(12, 11) >>> #define IDR3_RIL (1 << 10) >>> #define ARM_SMMU_IDR5 0x14 >>> @@ -617,6 +618,7 @@ struct arm_smmu_device { >>> int gerr_irq; >>> int combined_irq; >>> + int bbml; >>> unsigned long ias; /* IPA */ >>> unsigned long oas; /* PA */ >>> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c >>> index a7a9bc08dcd1..341581337ad0 100644 >>> --- a/drivers/iommu/io-pgtable-arm.c >>> +++ b/drivers/iommu/io-pgtable-arm.c >>> @@ -72,6 +72,7 @@ >>> #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) >>> #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) >>> +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) >>> #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) >>> #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) >>> #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) >>> @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, >>> static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> phys_addr_t paddr, arm_lpae_iopte prot, >>> - int lvl, arm_lpae_iopte *ptep) >>> + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) >>> { >>> arm_lpae_iopte pte = prot; >>> @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> pte |= ARM_LPAE_PTE_TYPE_BLOCK; >>> pte |= paddr_to_iopte(paddr, data); >>> + pte |= nT; >>> __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); >>> } >>> +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, >>> + arm_lpae_iopte *ptep); >>> static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> unsigned long iova, phys_addr_t paddr, >>> arm_lpae_iopte prot, int lvl, >>> arm_lpae_iopte *ptep) >>> { >>> arm_lpae_iopte pte = *ptep; >>> + struct io_pgtable_cfg *cfg = &data->iop.cfg; >>> if (iopte_leaf(pte, lvl, data->iop.fmt)) { >>> /* We require an unmap first */ >>> WARN_ON(!selftest_running); >>> return -EEXIST; >>> } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { >>> - /* >>> - * We need to unmap and free the old table before >>> - * overwriting it with a block entry. >>> - */ >>> arm_lpae_iopte *tblp; >>> + struct io_pgtable *iop = &data->iop; >>> size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); >>> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>> - WARN_ON(1); >>> - return -EINVAL; >>> + switch (cfg->bbml) { >>> + case 0: >>> + /* >>> + * We need to unmap and free the old table before >>> + * overwriting it with a block entry. >>> + */ >>> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>> + WARN_ON(1); >>> + return -EINVAL; >>> + } >>> + break; >>> + case 1: >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); >>> + >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>> + tblp = iopte_deref(pte, data); >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>> + break; >>> + case 2: >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); >>> + >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>> + tblp = iopte_deref(pte, data); >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>> + return 0; >> >> Sorry, but I really don't understand what you're trying to do here. The old >> code uses BBM for the table -> block path so we don't need anything extra >> here. The dodgy case is when we unmap part of a block, and end up installing >> a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there >> could be ongoing DMA to parts of the block mapping that we want to remain in >> place. >> >> Are you seeing a problem in practice? > > Right, I was under the assumption that we could ignore BBML because we should never have a legitimate reason to split blocks. I'm certainly not keen on piling any more complexity into split_blk_unmap, because the IOMMU API clearly doesn't have a well-defined behaviour for that case anyway - some other drivers will just unmap the entire block, and IIRC there was a hint somewhere in VFIO that it might actually expect that behaviour. I'm going home. I'll answer you two tomorrow. > > Robin. > > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-22 13:21 ` Leizhen (ThunderTown) @ 2021-01-22 13:26 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2021-01-22 13:26 UTC (permalink / raw) To: Leizhen (ThunderTown) Cc: Robin Murphy, Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On Fri, Jan 22, 2021 at 09:21:20PM +0800, Leizhen (ThunderTown) wrote: > On 2021/1/22 21:00, Robin Murphy wrote: > > On 2021-01-22 12:51, Will Deacon wrote: > >> On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: > >>> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); > >>> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { > >>> - WARN_ON(1); > >>> - return -EINVAL; > >>> + switch (cfg->bbml) { > >>> + case 0: > >>> + /* > >>> + * We need to unmap and free the old table before > >>> + * overwriting it with a block entry. > >>> + */ > >>> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); > >>> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { > >>> + WARN_ON(1); > >>> + return -EINVAL; > >>> + } > >>> + break; > >>> + case 1: > >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); > >>> + > >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); > >>> + tblp = iopte_deref(pte, data); > >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); > >>> + break; > >>> + case 2: > >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); > >>> + > >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); > >>> + tblp = iopte_deref(pte, data); > >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); > >>> + return 0; > >> > >> Sorry, but I really don't understand what you're trying to do here. The old > >> code uses BBM for the table -> block path so we don't need anything extra > >> here. The dodgy case is when we unmap part of a block, and end up installing > >> a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there > >> could be ongoing DMA to parts of the block mapping that we want to remain in > >> place. > >> > >> Are you seeing a problem in practice? > > > > Right, I was under the assumption that we could ignore BBML because we > > should never have a legitimate reason to split blocks. I'm certainly not > > keen on piling any more complexity into split_blk_unmap, because the > > IOMMU API clearly doesn't have a well-defined behaviour for that case > > anyway - some other drivers will just unmap the entire block, and IIRC > > there was a hint somewhere in VFIO that it might actually expect that > > behaviour. > > I'm going home. I'll answer you two tomorrow. It can wait until Monday! Have a good weekend :) Will ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-22 13:00 ` Robin Murphy 2021-01-22 13:21 ` Leizhen (ThunderTown) @ 2021-01-23 10:20 ` Leizhen (ThunderTown) 2021-01-25 19:54 ` Robin Murphy 1 sibling, 1 reply; 16+ messages in thread From: Leizhen (ThunderTown) @ 2021-01-23 10:20 UTC (permalink / raw) To: Robin Murphy, Will Deacon Cc: Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021/1/22 21:00, Robin Murphy wrote: > On 2021-01-22 12:51, Will Deacon wrote: >> On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: >>> When changing from a set of pages/smaller blocks to a larger block for an >>> address, the software should follow the sequence of BBML processing. >>> >>> When changing from a block to a set of pages/smaller blocks for an >>> address, there's no need to use nT bit. If an address in the large block >>> is accessed before page table switching, the TLB caches the large block >>> mapping. After the page table is switched and before TLB invalidation >>> finished, new access requests are still based on large block mapping. >>> After the block or page is invalidated, the system reads the small block >>> or page mapping from the memory; If the address in the large block is not >>> accessed before page table switching, the TLB has no cache. After the >>> page table is switched, a new access is initiated to read the small block >>> or page mapping from the memory. >>> >>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >>> --- >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + >>> drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- >>> include/linux/io-pgtable.h | 1 + >>> 4 files changed, 40 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> index e634bbe60573..14a1a11565fb 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, >>> .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, >>> .tlb = &arm_smmu_flush_ops, >>> .iommu_dev = smmu->dev, >>> + .bbml = smmu->bbml, >>> }; >>> if (smmu_domain->non_strict) >>> @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) >>> /* IDR3 */ >>> reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); >>> + smmu->bbml = FIELD_GET(IDR3_BBML, reg); >>> if (FIELD_GET(IDR3_RIL, reg)) >>> smmu->features |= ARM_SMMU_FEAT_RANGE_INV; >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> index d4b7f40ccb02..aa7eb460fa09 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> @@ -51,6 +51,7 @@ >>> #define IDR1_SIDSIZE GENMASK(5, 0) >>> #define ARM_SMMU_IDR3 0xc >>> +#define IDR3_BBML GENMASK(12, 11) >>> #define IDR3_RIL (1 << 10) >>> #define ARM_SMMU_IDR5 0x14 >>> @@ -617,6 +618,7 @@ struct arm_smmu_device { >>> int gerr_irq; >>> int combined_irq; >>> + int bbml; >>> unsigned long ias; /* IPA */ >>> unsigned long oas; /* PA */ >>> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c >>> index a7a9bc08dcd1..341581337ad0 100644 >>> --- a/drivers/iommu/io-pgtable-arm.c >>> +++ b/drivers/iommu/io-pgtable-arm.c >>> @@ -72,6 +72,7 @@ >>> #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) >>> #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) >>> +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) >>> #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) >>> #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) >>> #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) >>> @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, >>> static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> phys_addr_t paddr, arm_lpae_iopte prot, >>> - int lvl, arm_lpae_iopte *ptep) >>> + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) >>> { >>> arm_lpae_iopte pte = prot; >>> @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> pte |= ARM_LPAE_PTE_TYPE_BLOCK; >>> pte |= paddr_to_iopte(paddr, data); >>> + pte |= nT; >>> __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); >>> } >>> +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, >>> + arm_lpae_iopte *ptep); >>> static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> unsigned long iova, phys_addr_t paddr, >>> arm_lpae_iopte prot, int lvl, >>> arm_lpae_iopte *ptep) >>> { >>> arm_lpae_iopte pte = *ptep; >>> + struct io_pgtable_cfg *cfg = &data->iop.cfg; >>> if (iopte_leaf(pte, lvl, data->iop.fmt)) { >>> /* We require an unmap first */ >>> WARN_ON(!selftest_running); >>> return -EEXIST; >>> } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { >>> - /* >>> - * We need to unmap and free the old table before >>> - * overwriting it with a block entry. >>> - */ >>> arm_lpae_iopte *tblp; >>> + struct io_pgtable *iop = &data->iop; >>> size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); >>> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>> - WARN_ON(1); >>> - return -EINVAL; >>> + switch (cfg->bbml) { >>> + case 0: >>> + /* >>> + * We need to unmap and free the old table before >>> + * overwriting it with a block entry. >>> + */ >>> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>> + WARN_ON(1); >>> + return -EINVAL; >>> + } >>> + break; >>> + case 1: >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); >>> + >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>> + tblp = iopte_deref(pte, data); >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>> + break; >>> + case 2: >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); >>> + >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>> + tblp = iopte_deref(pte, data); >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>> + return 0; >> >> Sorry, but I really don't understand what you're trying to do here. The old >> code uses BBM for the table -> block path so we don't need anything extra >> here. The dodgy case is when we unmap part of a block, and end up installing >> a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there >> could be ongoing DMA to parts of the block mapping that we want to remain in >> place. >> >> Are you seeing a problem in practice? > > Right, I was under the assumption that we could ignore BBML because we should never have a legitimate reason to split blocks. I'm certainly not keen on piling any more complexity into split_blk_unmap, because the IOMMU API clearly doesn't have a well-defined behaviour for that case anyway - some other drivers will just unmap the entire block, and IIRC there was a hint somewhere in VFIO that it might actually expect that behaviour. KVM has this usage scenario. > > Robin. > > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-23 10:20 ` Leizhen (ThunderTown) @ 2021-01-25 19:54 ` Robin Murphy 0 siblings, 0 replies; 16+ messages in thread From: Robin Murphy @ 2021-01-25 19:54 UTC (permalink / raw) To: Leizhen (ThunderTown), Will Deacon Cc: Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021-01-23 10:20, Leizhen (ThunderTown) wrote: > > > On 2021/1/22 21:00, Robin Murphy wrote: >> On 2021-01-22 12:51, Will Deacon wrote: >>> On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: >>>> When changing from a set of pages/smaller blocks to a larger block for an >>>> address, the software should follow the sequence of BBML processing. >>>> >>>> When changing from a block to a set of pages/smaller blocks for an >>>> address, there's no need to use nT bit. If an address in the large block >>>> is accessed before page table switching, the TLB caches the large block >>>> mapping. After the page table is switched and before TLB invalidation >>>> finished, new access requests are still based on large block mapping. >>>> After the block or page is invalidated, the system reads the small block >>>> or page mapping from the memory; If the address in the large block is not >>>> accessed before page table switching, the TLB has no cache. After the >>>> page table is switched, a new access is initiated to read the small block >>>> or page mapping from the memory. >>>> >>>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >>>> --- >>>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + >>>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + >>>> drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- >>>> include/linux/io-pgtable.h | 1 + >>>> 4 files changed, 40 insertions(+), 11 deletions(-) >>>> >>>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>>> index e634bbe60573..14a1a11565fb 100644 >>>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>>> @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, >>>> .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, >>>> .tlb = &arm_smmu_flush_ops, >>>> .iommu_dev = smmu->dev, >>>> + .bbml = smmu->bbml, >>>> }; >>>> if (smmu_domain->non_strict) >>>> @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) >>>> /* IDR3 */ >>>> reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); >>>> + smmu->bbml = FIELD_GET(IDR3_BBML, reg); >>>> if (FIELD_GET(IDR3_RIL, reg)) >>>> smmu->features |= ARM_SMMU_FEAT_RANGE_INV; >>>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>>> index d4b7f40ccb02..aa7eb460fa09 100644 >>>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>>> @@ -51,6 +51,7 @@ >>>> #define IDR1_SIDSIZE GENMASK(5, 0) >>>> #define ARM_SMMU_IDR3 0xc >>>> +#define IDR3_BBML GENMASK(12, 11) >>>> #define IDR3_RIL (1 << 10) >>>> #define ARM_SMMU_IDR5 0x14 >>>> @@ -617,6 +618,7 @@ struct arm_smmu_device { >>>> int gerr_irq; >>>> int combined_irq; >>>> + int bbml; >>>> unsigned long ias; /* IPA */ >>>> unsigned long oas; /* PA */ >>>> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c >>>> index a7a9bc08dcd1..341581337ad0 100644 >>>> --- a/drivers/iommu/io-pgtable-arm.c >>>> +++ b/drivers/iommu/io-pgtable-arm.c >>>> @@ -72,6 +72,7 @@ >>>> #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) >>>> #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) >>>> +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) >>>> #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) >>>> #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) >>>> #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) >>>> @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, >>>> static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>>> phys_addr_t paddr, arm_lpae_iopte prot, >>>> - int lvl, arm_lpae_iopte *ptep) >>>> + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) >>>> { >>>> arm_lpae_iopte pte = prot; >>>> @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>>> pte |= ARM_LPAE_PTE_TYPE_BLOCK; >>>> pte |= paddr_to_iopte(paddr, data); >>>> + pte |= nT; >>>> __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); >>>> } >>>> +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, >>>> + arm_lpae_iopte *ptep); >>>> static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>>> unsigned long iova, phys_addr_t paddr, >>>> arm_lpae_iopte prot, int lvl, >>>> arm_lpae_iopte *ptep) >>>> { >>>> arm_lpae_iopte pte = *ptep; >>>> + struct io_pgtable_cfg *cfg = &data->iop.cfg; >>>> if (iopte_leaf(pte, lvl, data->iop.fmt)) { >>>> /* We require an unmap first */ >>>> WARN_ON(!selftest_running); >>>> return -EEXIST; >>>> } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { >>>> - /* >>>> - * We need to unmap and free the old table before >>>> - * overwriting it with a block entry. >>>> - */ >>>> arm_lpae_iopte *tblp; >>>> + struct io_pgtable *iop = &data->iop; >>>> size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); >>>> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>>> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>>> - WARN_ON(1); >>>> - return -EINVAL; >>>> + switch (cfg->bbml) { >>>> + case 0: >>>> + /* >>>> + * We need to unmap and free the old table before >>>> + * overwriting it with a block entry. >>>> + */ >>>> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>>> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>>> + WARN_ON(1); >>>> + return -EINVAL; >>>> + } >>>> + break; >>>> + case 1: >>>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); >>>> + >>>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>>> + tblp = iopte_deref(pte, data); >>>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>>> + break; >>>> + case 2: >>>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); >>>> + >>>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>>> + tblp = iopte_deref(pte, data); >>>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>>> + return 0; >>> >>> Sorry, but I really don't understand what you're trying to do here. The old >>> code uses BBM for the table -> block path so we don't need anything extra >>> here. The dodgy case is when we unmap part of a block, and end up installing >>> a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there >>> could be ongoing DMA to parts of the block mapping that we want to remain in >>> place. >>> >>> Are you seeing a problem in practice? >> >> Right, I was under the assumption that we could ignore BBML because we should never have a legitimate reason to split blocks. I'm certainly not keen on piling any more complexity into split_blk_unmap, because the IOMMU API clearly doesn't have a well-defined behaviour for that case anyway - some other drivers will just unmap the entire block, and IIRC there was a hint somewhere in VFIO that it might actually expect that behaviour. > > KVM has this usage scenario. As far as I'm aware KVM doesn't go anywhere near the IOMMU API, does it? If you mean VFIO, the comment starting at line 1110 of vfio_iommu_type1.c disagrees, especially the part that explicitly says "Unmap requests must fully cover previous mappings." Robin. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-22 12:51 ` Will Deacon 2021-01-22 13:00 ` Robin Murphy @ 2021-01-23 10:08 ` Leizhen (ThunderTown) 2021-01-25 20:23 ` Robin Murphy 1 sibling, 1 reply; 16+ messages in thread From: Leizhen (ThunderTown) @ 2021-01-23 10:08 UTC (permalink / raw) To: Will Deacon Cc: Robin Murphy, Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021/1/22 20:51, Will Deacon wrote: > On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: >> When changing from a set of pages/smaller blocks to a larger block for an >> address, the software should follow the sequence of BBML processing. >> >> When changing from a block to a set of pages/smaller blocks for an >> address, there's no need to use nT bit. If an address in the large block >> is accessed before page table switching, the TLB caches the large block >> mapping. After the page table is switched and before TLB invalidation >> finished, new access requests are still based on large block mapping. >> After the block or page is invalidated, the system reads the small block >> or page mapping from the memory; If the address in the large block is not >> accessed before page table switching, the TLB has no cache. After the >> page table is switched, a new access is initiated to read the small block >> or page mapping from the memory. >> >> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >> --- >> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + >> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + >> drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- >> include/linux/io-pgtable.h | 1 + >> 4 files changed, 40 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >> index e634bbe60573..14a1a11565fb 100644 >> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >> @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, >> .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, >> .tlb = &arm_smmu_flush_ops, >> .iommu_dev = smmu->dev, >> + .bbml = smmu->bbml, >> }; >> >> if (smmu_domain->non_strict) >> @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) >> >> /* IDR3 */ >> reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); >> + smmu->bbml = FIELD_GET(IDR3_BBML, reg); >> if (FIELD_GET(IDR3_RIL, reg)) >> smmu->features |= ARM_SMMU_FEAT_RANGE_INV; >> >> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >> index d4b7f40ccb02..aa7eb460fa09 100644 >> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >> @@ -51,6 +51,7 @@ >> #define IDR1_SIDSIZE GENMASK(5, 0) >> >> #define ARM_SMMU_IDR3 0xc >> +#define IDR3_BBML GENMASK(12, 11) >> #define IDR3_RIL (1 << 10) >> >> #define ARM_SMMU_IDR5 0x14 >> @@ -617,6 +618,7 @@ struct arm_smmu_device { >> >> int gerr_irq; >> int combined_irq; >> + int bbml; >> >> unsigned long ias; /* IPA */ >> unsigned long oas; /* PA */ >> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c >> index a7a9bc08dcd1..341581337ad0 100644 >> --- a/drivers/iommu/io-pgtable-arm.c >> +++ b/drivers/iommu/io-pgtable-arm.c >> @@ -72,6 +72,7 @@ >> >> #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) >> #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) >> +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) >> #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) >> #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) >> #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) >> @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, >> >> static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >> phys_addr_t paddr, arm_lpae_iopte prot, >> - int lvl, arm_lpae_iopte *ptep) >> + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) >> { >> arm_lpae_iopte pte = prot; >> >> @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >> pte |= ARM_LPAE_PTE_TYPE_BLOCK; >> >> pte |= paddr_to_iopte(paddr, data); >> + pte |= nT; >> >> __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); >> } >> >> +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, >> + arm_lpae_iopte *ptep); >> static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >> unsigned long iova, phys_addr_t paddr, >> arm_lpae_iopte prot, int lvl, >> arm_lpae_iopte *ptep) >> { >> arm_lpae_iopte pte = *ptep; >> + struct io_pgtable_cfg *cfg = &data->iop.cfg; >> >> if (iopte_leaf(pte, lvl, data->iop.fmt)) { >> /* We require an unmap first */ >> WARN_ON(!selftest_running); >> return -EEXIST; >> } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { >> - /* >> - * We need to unmap and free the old table before >> - * overwriting it with a block entry. >> - */ >> arm_lpae_iopte *tblp; >> + struct io_pgtable *iop = &data->iop; >> size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); >> >> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >> - WARN_ON(1); >> - return -EINVAL; >> + switch (cfg->bbml) { >> + case 0: >> + /* >> + * We need to unmap and free the old table before >> + * overwriting it with a block entry. >> + */ >> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >> + WARN_ON(1); >> + return -EINVAL; >> + } >> + break; >> + case 1: >> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); >> + >> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >> + tblp = iopte_deref(pte, data); >> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >> + break; >> + case 2: >> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); >> + >> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >> + tblp = iopte_deref(pte, data); >> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >> + return 0; > > Sorry, but I really don't understand what you're trying to do here. The old > code uses BBM for the table -> block path so we don't need anything extra > here. The old BBM is the use case of BBML=0. There's a very small window of time. In arm_lpae_init_pte(): CPU side: SMMU side: 1) __arm_lpae_unmap()，unmap the table mapping and perform TLBI 2) Some devices are accessing this memory, but the page table mapping is invalid. So triggers translation faults 3)__arm_lpae_init_pte(), create the block mapping Above have been mentioned in SMMUv3 specification: 3.21.1.1 Translation tables update procedure Note: The requirement for a break-before-make sequence can cause problems for unrelated I/O streams that might use addresses overlapping a region of interest, because the I/O streams cannot always be conveniently stopped and might not tolerate translation faults. So the hardware introduces BBML=1 and BBML=2: For BBML=1: 1) __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); //switch the mapping from table to block, but with bit nT=1 2) perform TLBI and free the table mapping memory 3) __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); //clear nT bit. Some devices may access the memory between 1) and 3), they correctly access the memory based on the nT=1 block mapping. The nT=1 block mapping is not cached in theTLB, so after the table mapping has been invalidated, clear the nT bit. After 3), the new memory access causes the block mapping to be cached in the TLB. For BBML=2: 1) __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); 2) perform TLBI 3) free the table mapping memory ----------------- | Page0 | Page1 | ----------------- | Block | ----------------- Assume that a device has accessed Page0 before 1）, so the TLB cached the 4K Page0 mapping. The a device accesses the Page1 after 1). This time, the block mapping will be cached in the TLB. At this time, for 4K Page0, the TLB has two different mappings(4K and 2M). A device accesses Page0 will trigger TLB conflict if BBML=2 is not supported. But now, the hardware choose either of the two mappings. This is not a problem because the output addresses of both mapping translations are the same. 2) is added by me, clear the useless mappings in a timely manner, it's not required by BBML=2 specication. > The dodgy case is when we unmap part of a block, and end up installing > a table via arm_lpae_split_blk_unmap(). We can't use BBM there because there > could be ongoing DMA to parts of the block mapping that we want to remain in > place. > > Are you seeing a problem in practice? > > Will > > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-23 10:08 ` Leizhen (ThunderTown) @ 2021-01-25 20:23 ` Robin Murphy 2021-01-26 10:12 ` Will Deacon 0 siblings, 1 reply; 16+ messages in thread From: Robin Murphy @ 2021-01-25 20:23 UTC (permalink / raw) To: Leizhen (ThunderTown), Will Deacon Cc: Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021-01-23 10:08, Leizhen (ThunderTown) wrote: > > > On 2021/1/22 20:51, Will Deacon wrote: >> On Thu, Nov 26, 2020 at 11:42:30AM +0800, Zhen Lei wrote: >>> When changing from a set of pages/smaller blocks to a larger block for an >>> address, the software should follow the sequence of BBML processing. >>> >>> When changing from a block to a set of pages/smaller blocks for an >>> address, there's no need to use nT bit. If an address in the large block >>> is accessed before page table switching, the TLB caches the large block >>> mapping. After the page table is switched and before TLB invalidation >>> finished, new access requests are still based on large block mapping. >>> After the block or page is invalidated, the system reads the small block >>> or page mapping from the memory; If the address in the large block is not >>> accessed before page table switching, the TLB has no cache. After the >>> page table is switched, a new access is initiated to read the small block >>> or page mapping from the memory. >>> >>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >>> --- >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 + >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 + >>> drivers/iommu/io-pgtable-arm.c | 46 ++++++++++++++++----- >>> include/linux/io-pgtable.h | 1 + >>> 4 files changed, 40 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> index e634bbe60573..14a1a11565fb 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> @@ -1977,6 +1977,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, >>> .coherent_walk = smmu->features & ARM_SMMU_FEAT_COHERENCY, >>> .tlb = &arm_smmu_flush_ops, >>> .iommu_dev = smmu->dev, >>> + .bbml = smmu->bbml, >>> }; >>> >>> if (smmu_domain->non_strict) >>> @@ -3291,6 +3292,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) >>> >>> /* IDR3 */ >>> reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); >>> + smmu->bbml = FIELD_GET(IDR3_BBML, reg); >>> if (FIELD_GET(IDR3_RIL, reg)) >>> smmu->features |= ARM_SMMU_FEAT_RANGE_INV; >>> >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> index d4b7f40ccb02..aa7eb460fa09 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h >>> @@ -51,6 +51,7 @@ >>> #define IDR1_SIDSIZE GENMASK(5, 0) >>> >>> #define ARM_SMMU_IDR3 0xc >>> +#define IDR3_BBML GENMASK(12, 11) >>> #define IDR3_RIL (1 << 10) >>> >>> #define ARM_SMMU_IDR5 0x14 >>> @@ -617,6 +618,7 @@ struct arm_smmu_device { >>> >>> int gerr_irq; >>> int combined_irq; >>> + int bbml; >>> >>> unsigned long ias; /* IPA */ >>> unsigned long oas; /* PA */ >>> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c >>> index a7a9bc08dcd1..341581337ad0 100644 >>> --- a/drivers/iommu/io-pgtable-arm.c >>> +++ b/drivers/iommu/io-pgtable-arm.c >>> @@ -72,6 +72,7 @@ >>> >>> #define ARM_LPAE_PTE_NSTABLE (((arm_lpae_iopte)1) << 63) >>> #define ARM_LPAE_PTE_XN (((arm_lpae_iopte)3) << 53) >>> +#define ARM_LPAE_PTE_nT (((arm_lpae_iopte)1) << 16) >>> #define ARM_LPAE_PTE_AF (((arm_lpae_iopte)1) << 10) >>> #define ARM_LPAE_PTE_SH_NS (((arm_lpae_iopte)0) << 8) >>> #define ARM_LPAE_PTE_SH_OS (((arm_lpae_iopte)2) << 8) >>> @@ -255,7 +256,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, >>> >>> static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> phys_addr_t paddr, arm_lpae_iopte prot, >>> - int lvl, arm_lpae_iopte *ptep) >>> + int lvl, arm_lpae_iopte *ptep, arm_lpae_iopte nT) >>> { >>> arm_lpae_iopte pte = prot; >>> >>> @@ -265,37 +266,60 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> pte |= ARM_LPAE_PTE_TYPE_BLOCK; >>> >>> pte |= paddr_to_iopte(paddr, data); >>> + pte |= nT; >>> >>> __arm_lpae_set_pte(ptep, pte, &data->iop.cfg); >>> } >>> >>> +static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl, >>> + arm_lpae_iopte *ptep); >>> static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, >>> unsigned long iova, phys_addr_t paddr, >>> arm_lpae_iopte prot, int lvl, >>> arm_lpae_iopte *ptep) >>> { >>> arm_lpae_iopte pte = *ptep; >>> + struct io_pgtable_cfg *cfg = &data->iop.cfg; >>> >>> if (iopte_leaf(pte, lvl, data->iop.fmt)) { >>> /* We require an unmap first */ >>> WARN_ON(!selftest_running); >>> return -EEXIST; >>> } else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) { >>> - /* >>> - * We need to unmap and free the old table before >>> - * overwriting it with a block entry. >>> - */ >>> arm_lpae_iopte *tblp; >>> + struct io_pgtable *iop = &data->iop; >>> size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); >>> >>> - tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>> - if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>> - WARN_ON(1); >>> - return -EINVAL; >>> + switch (cfg->bbml) { >>> + case 0: >>> + /* >>> + * We need to unmap and free the old table before >>> + * overwriting it with a block entry. >>> + */ >>> + tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); >>> + if (__arm_lpae_unmap(data, NULL, iova, sz, lvl, tblp) != sz) { >>> + WARN_ON(1); >>> + return -EINVAL; >>> + } >>> + break; >>> + case 1: >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); >>> + >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>> + tblp = iopte_deref(pte, data); >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>> + break; >>> + case 2: >>> + __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); >>> + >>> + io_pgtable_tlb_flush_walk(iop, iova, sz, ARM_LPAE_GRANULE(data)); >>> + tblp = iopte_deref(pte, data); >>> + __arm_lpae_free_pgtable(data, lvl + 1, tblp); >>> + return 0; >> >> Sorry, but I really don't understand what you're trying to do here. The old >> code uses BBM for the table -> block path so we don't need anything extra >> here. > > The old BBM is the use case of BBML=0. There's a very small window of time. > In arm_lpae_init_pte(): > CPU side: SMMU side: > 1) __arm_lpae_unmap()，unmap the table mapping and perform TLBI > 2) Some devices are accessing this memory, but the page table mapping is invalid. So triggers translation faults > 3)__arm_lpae_init_pte(), create the block mapping > > Above have been mentioned in SMMUv3 specification: 3.21.1.1 Translation tables update procedure > Note: The requirement for a break-before-make sequence can cause problems for unrelated I/O streams that might > use addresses overlapping a region of interest, because the I/O streams cannot always be conveniently stopped and > might not tolerate translation faults. > > So the hardware introduces BBML=1 and BBML=2: > For BBML=1: > 1) __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, ARM_LPAE_PTE_nT); //switch the mapping from table to block, but with bit nT=1 > 2) perform TLBI and free the table mapping memory > 3) __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); //clear nT bit. > > Some devices may access the memory between 1) and 3), they correctly access the memory based on the nT=1 block mapping. > The nT=1 block mapping is not cached in theTLB, so after the table mapping has been invalidated, clear the nT bit. > After 3), the new memory access causes the block mapping to be cached in the TLB. > > For BBML=2: > 1) __arm_lpae_init_pte(data, paddr, prot, lvl, ptep, 0); > 2) perform TLBI > 3) free the table mapping memory > > ----------------- > | Page0 | Page1 | > ----------------- > | Block | > ----------------- > Assume that a device has accessed Page0 before 1）, so the TLB cached the 4K Page0 mapping. The a device accesses the Page1 after 1). > This time, the block mapping will be cached in the TLB. At this time, for 4K Page0, the TLB has two different mappings(4K and 2M). > A device accesses Page0 will trigger TLB conflict if BBML=2 is not supported. But now, the hardware choose either of the two mappings. > This is not a problem because the output addresses of both mapping translations are the same. > > 2) is added by me, clear the useless mappings in a timely manner, it's not required by BBML=2 specication. We know how BBML works; the point is that the only thing the Linux IOMMU API ever legitimately does that even comes near its scope is putting down a block entry over an old table. Crucially, though, we still never do that *while the table is live*. In general, callers *cannot* expect two overlapping iommu_map() requests to work, because in most cases one of the requests will fail, and at best even if both "succeed" there is no guarantee of what will actually be mapped afterwards. That's largely why we don't bother walking down a table entry if we *do* find one when mapping a block; the only *valid* way for that to happen implies that anything which was previously in that table has already been unmapped such that the IOVA could have been reused, so we can just go ahead and free it straight away. And for clearing out a dead table, BBML really doesn't gain us anything: BBML=0: write 0 TLBI + sync write block PTE free table BBML=1: write nT block PTE TLBI + sync write block PTE TLBI + sync free table that's *more* work... BBML=2 write block PTE TLBI + sync free table we save a grand total of one store, woo. Now we probably will need some degreee of BBML feature awareness for the sake of SVA if and when we start using it for CPU pagetables, but I still cannot see any need to consider it in io-pgtable. Robin. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-25 20:23 ` Robin Murphy @ 2021-01-26 10:12 ` Will Deacon 2021-01-27 2:01 ` Leizhen (ThunderTown) 0 siblings, 1 reply; 16+ messages in thread From: Will Deacon @ 2021-01-26 10:12 UTC (permalink / raw) To: Robin Murphy Cc: Leizhen (ThunderTown), Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: > Now we probably will need some degreee of BBML feature awareness for the > sake of SVA if and when we start using it for CPU pagetables, but I still > cannot see any need to consider it in io-pgtable. Agreed; I don't think this is something that io-pgtable should have to care about. Will ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-26 10:12 ` Will Deacon @ 2021-01-27 2:01 ` Leizhen (ThunderTown) 2021-01-27 7:36 ` Keqian Zhu 0 siblings, 1 reply; 16+ messages in thread From: Leizhen (ThunderTown) @ 2021-01-27 2:01 UTC (permalink / raw) To: Will Deacon, Robin Murphy Cc: Joerg Roedel, Jean-Philippe Brucker, Jonathan Cameron, linux-arm-kernel, iommu, linux-kernel, Yang Yingliang On 2021/1/26 18:12, Will Deacon wrote: > On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: >> Now we probably will need some degreee of BBML feature awareness for the >> sake of SVA if and when we start using it for CPU pagetables, but I still >> cannot see any need to consider it in io-pgtable. > > Agreed; I don't think this is something that io-pgtable should have to care > about. Yes, the SVA works in stall mode, and the failed device access requests are not discarded. Let me look for examples. The BBML usage scenario was told by a former colleague. > > Will > > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-27 2:01 ` Leizhen (ThunderTown) @ 2021-01-27 7:36 ` Keqian Zhu 2021-01-27 9:39 ` Robin Murphy 0 siblings, 1 reply; 16+ messages in thread From: Keqian Zhu @ 2021-01-27 7:36 UTC (permalink / raw) To: Will Deacon, Robin Murphy Cc: Leizhen (ThunderTown), Jean-Philippe Brucker, Joerg Roedel, Yang Yingliang, linux-kernel, iommu, Jonathan Cameron, linux-arm-kernel On 2021/1/27 10:01, Leizhen (ThunderTown) wrote: > > > On 2021/1/26 18:12, Will Deacon wrote: >> On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: >>> Now we probably will need some degreee of BBML feature awareness for the >>> sake of SVA if and when we start using it for CPU pagetables, but I still >>> cannot see any need to consider it in io-pgtable. >> >> Agreed; I don't think this is something that io-pgtable should have to care >> about. Hi, I have a question here :-). If the old table is not live, then the break procedure seems unnecessary. Do I miss something? Thanks, Keqian > > Yes, the SVA works in stall mode, and the failed device access requests are not > discarded. > > Let me look for examples. The BBML usage scenario was told by a former colleague. > >> >> Will >> >> . >> > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-27 7:36 ` Keqian Zhu @ 2021-01-27 9:39 ` Robin Murphy 2021-01-28 15:18 ` Keqian Zhu 0 siblings, 1 reply; 16+ messages in thread From: Robin Murphy @ 2021-01-27 9:39 UTC (permalink / raw) To: Keqian Zhu, Will Deacon Cc: Jean-Philippe Brucker, linux-kernel, iommu, Yang Yingliang, linux-arm-kernel On 2021-01-27 07:36, Keqian Zhu wrote: > > > On 2021/1/27 10:01, Leizhen (ThunderTown) wrote: >> >> >> On 2021/1/26 18:12, Will Deacon wrote: >>> On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: >>>> Now we probably will need some degreee of BBML feature awareness for the >>>> sake of SVA if and when we start using it for CPU pagetables, but I still >>>> cannot see any need to consider it in io-pgtable. >>> >>> Agreed; I don't think this is something that io-pgtable should have to care >>> about. > Hi, > > I have a question here :-). > If the old table is not live, then the break procedure seems unnecessary. Do I miss something? The MMU is allowed to prefetch translations at any time, so not following the proper update procedure could still potentially lead to a TLB conflict, even if there's no device traffic to worry about disrupting. Robin. > Thanks, > Keqian > >> >> Yes, the SVA works in stall mode, and the failed device access requests are not >> discarded. >> >> Let me look for examples. The BBML usage scenario was told by a former colleague. >> >>> >>> Will >>> >>> . >>> >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >> . >> > _______________________________________________ > iommu mailing list > iommu@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/iommu > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-27 9:39 ` Robin Murphy @ 2021-01-28 15:18 ` Keqian Zhu 2021-01-28 16:17 ` Robin Murphy 0 siblings, 1 reply; 16+ messages in thread From: Keqian Zhu @ 2021-01-28 15:18 UTC (permalink / raw) To: Robin Murphy, Will Deacon Cc: Jean-Philippe Brucker, linux-kernel, iommu, Yang Yingliang, linux-arm-kernel On 2021/1/27 17:39, Robin Murphy wrote: > On 2021-01-27 07:36, Keqian Zhu wrote: >> >> >> On 2021/1/27 10:01, Leizhen (ThunderTown) wrote: >>> >>> >>> On 2021/1/26 18:12, Will Deacon wrote: >>>> On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: >>>>> Now we probably will need some degreee of BBML feature awareness for the >>>>> sake of SVA if and when we start using it for CPU pagetables, but I still >>>>> cannot see any need to consider it in io-pgtable. >>>> >>>> Agreed; I don't think this is something that io-pgtable should have to care >>>> about. >> Hi, >> >> I have a question here :-). >> If the old table is not live, then the break procedure seems unnecessary. Do I miss something? > > The MMU is allowed to prefetch translations at any time, so not following the proper update procedure could still potentially lead to a TLB conflict, even if there's no device traffic to worry about disrupting. > > Robin. Thanks. Does the MMU you mention here includes MMU and SMMU? I know that at SMMU side, ATS can prefetch translation. Keqian > >> Thanks, >> Keqian >> >>> >>> Yes, the SVA works in stall mode, and the failed device access requests are not >>> discarded. >>> >>> Let me look for examples. The BBML usage scenario was told by a former colleague. >>> >>>> >>>> Will >>>> >>>> . >>>> >>> >>> >>> _______________________________________________ >>> linux-arm-kernel mailing list >>> linux-arm-kernel@lists.infradead.org >>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >>> . >>> >> _______________________________________________ >> iommu mailing list >> iommu@lists.linux-foundation.org >> https://lists.linuxfoundation.org/mailman/listinfo/iommu >> > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-28 15:18 ` Keqian Zhu @ 2021-01-28 16:17 ` Robin Murphy 2021-01-29 6:12 ` Keqian Zhu 0 siblings, 1 reply; 16+ messages in thread From: Robin Murphy @ 2021-01-28 16:17 UTC (permalink / raw) To: Keqian Zhu, Will Deacon Cc: Jean-Philippe Brucker, linux-kernel, iommu, Yang Yingliang, linux-arm-kernel On 2021-01-28 15:18, Keqian Zhu wrote: > > > On 2021/1/27 17:39, Robin Murphy wrote: >> On 2021-01-27 07:36, Keqian Zhu wrote: >>> >>> >>> On 2021/1/27 10:01, Leizhen (ThunderTown) wrote: >>>> >>>> >>>> On 2021/1/26 18:12, Will Deacon wrote: >>>>> On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: >>>>>> Now we probably will need some degreee of BBML feature awareness for the >>>>>> sake of SVA if and when we start using it for CPU pagetables, but I still >>>>>> cannot see any need to consider it in io-pgtable. >>>>> >>>>> Agreed; I don't think this is something that io-pgtable should have to care >>>>> about. >>> Hi, >>> >>> I have a question here :-). >>> If the old table is not live, then the break procedure seems unnecessary. Do I miss something? >> >> The MMU is allowed to prefetch translations at any time, so not following the proper update procedure could still potentially lead to a TLB conflict, even if there's no device traffic to worry about disrupting. >> >> Robin. > > Thanks. Does the MMU you mention here includes MMU and SMMU? I know that at SMMU side, ATS can prefetch translation. Yes, both - VMSAv8 allows speculative translation table walks, so SMMUv3 inherits from there (per 3.21.1 "Translation tables and TLB invalidation completion behavior"). Robin. > > Keqian >> >>> Thanks, >>> Keqian >>> >>>> >>>> Yes, the SVA works in stall mode, and the failed device access requests are not >>>> discarded. >>>> >>>> Let me look for examples. The BBML usage scenario was told by a former colleague. >>>> >>>>> >>>>> Will >>>>> >>>>> . >>>>> >>>> >>>> >>>> _______________________________________________ >>>> linux-arm-kernel mailing list >>>> linux-arm-kernel@lists.infradead.org >>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >>>> . >>>> >>> _______________________________________________ >>> iommu mailing list >>> iommu@lists.linux-foundation.org >>> https://lists.linuxfoundation.org/mailman/listinfo/iommu >>> >> . >> ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML 2021-01-28 16:17 ` Robin Murphy @ 2021-01-29 6:12 ` Keqian Zhu 0 siblings, 0 replies; 16+ messages in thread From: Keqian Zhu @ 2021-01-29 6:12 UTC (permalink / raw) To: Robin Murphy, Will Deacon Cc: Jean-Philippe Brucker, linux-kernel, iommu, Yang Yingliang, linux-arm-kernel On 2021/1/29 0:17, Robin Murphy wrote: > On 2021-01-28 15:18, Keqian Zhu wrote: >> >> >> On 2021/1/27 17:39, Robin Murphy wrote: >>> On 2021-01-27 07:36, Keqian Zhu wrote: >>>> >>>> >>>> On 2021/1/27 10:01, Leizhen (ThunderTown) wrote: >>>>> >>>>> >>>>> On 2021/1/26 18:12, Will Deacon wrote: >>>>>> On Mon, Jan 25, 2021 at 08:23:40PM +0000, Robin Murphy wrote: >>>>>>> Now we probably will need some degreee of BBML feature awareness for the >>>>>>> sake of SVA if and when we start using it for CPU pagetables, but I still >>>>>>> cannot see any need to consider it in io-pgtable. >>>>>> >>>>>> Agreed; I don't think this is something that io-pgtable should have to care >>>>>> about. >>>> Hi, >>>> >>>> I have a question here :-). >>>> If the old table is not live, then the break procedure seems unnecessary. Do I miss something? >>> >>> The MMU is allowed to prefetch translations at any time, so not following the proper update procedure could still potentially lead to a TLB conflict, even if there's no device traffic to worry about disrupting. >>> >>> Robin. >> >> Thanks. Does the MMU you mention here includes MMU and SMMU? I know that at SMMU side, ATS can prefetch translation. > > Yes, both - VMSAv8 allows speculative translation table walks, so SMMUv3 inherits from there (per 3.21.1 "Translation tables and TLB invalidation completion behavior"). OK, I Get it. Thanks. Keqian. > > Robin. > >> >> Keqian >>> >>>> Thanks, >>>> Keqian >>>> >>>>> >>>>> Yes, the SVA works in stall mode, and the failed device access requests are not >>>>> discarded. >>>>> >>>>> Let me look for examples. The BBML usage scenario was told by a former colleague. >>>>> >>>>>> >>>>>> Will >>>>>> >>>>>> . >>>>>> >>>>> >>>>> >>>>> _______________________________________________ >>>>> linux-arm-kernel mailing list >>>>> linux-arm-kernel@lists.infradead.org >>>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >>>>> . >>>>> >>>> _______________________________________________ >>>> iommu mailing list >>>> iommu@lists.linux-foundation.org >>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu >>>> >>> . >>> > . > ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2021-01-29 6:14 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-11-26 3:42 [PATCH 1/1] iommu/arm-smmu-v3: add support for BBML Zhen Lei 2021-01-22 12:51 ` Will Deacon 2021-01-22 13:00 ` Robin Murphy 2021-01-22 13:21 ` Leizhen (ThunderTown) 2021-01-22 13:26 ` Will Deacon 2021-01-23 10:20 ` Leizhen (ThunderTown) 2021-01-25 19:54 ` Robin Murphy 2021-01-23 10:08 ` Leizhen (ThunderTown) 2021-01-25 20:23 ` Robin Murphy 2021-01-26 10:12 ` Will Deacon 2021-01-27 2:01 ` Leizhen (ThunderTown) 2021-01-27 7:36 ` Keqian Zhu 2021-01-27 9:39 ` Robin Murphy 2021-01-28 15:18 ` Keqian Zhu 2021-01-28 16:17 ` Robin Murphy 2021-01-29 6:12 ` Keqian Zhu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).