From: "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
To: John Garry <john.garry@huawei.com>,
"will@kernel.org" <will@kernel.org>,
"robin.murphy@arm.com" <robin.murphy@arm.com>,
"joro@8bytes.org" <joro@8bytes.org>,
"iommu@lists.linux-foundation.org"
<iommu@lists.linux-foundation.org>
Cc: "linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Linuxarm <linuxarm@huawei.com>,
"Zengtao \(B\)" <prime.zeng@hisilicon.com>
Subject: RE: [PATCH v2] iommu/arm-smmu-v3: disable MSI polling if SEV polling is faster
Date: Fri, 31 Jul 2020 10:48:33 +0000 [thread overview]
Message-ID: <B926444035E5E2439431908E3842AFD25CFDC3@DGGEMI525-MBS.china.huawei.com> (raw)
In-Reply-To: <a425bd85-4872-bf1a-d273-c605c68fa9e1@huawei.com>
> -----Original Message-----
> From: John Garry
> Sent: Friday, July 31, 2020 10:21 PM
> To: Song Bao Hua (Barry Song) <song.bao.hua@hisilicon.com>; will@kernel.org;
> robin.murphy@arm.com; joro@8bytes.org; iommu@lists.linux-foundation.org
> Cc: Zengtao (B) <prime.zeng@hisilicon.com>; Linuxarm
> <linuxarm@huawei.com>; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v2] iommu/arm-smmu-v3: disable MSI polling if SEV
> polling is faster
>
> On 31/07/2020 09:33, Barry Song wrote:
> > Different implementations may show different performance by using SEV
> > polling or MSI polling.
> > On the implementation of hi1620, tests show disabling MSI polling can
> > bring performance improvement.
> > Using 16 threads to run netperf on hns3 100G NIC with UDP packet size
> > in 32768bytes and set iommu to strict, TX throughput can improve from
> > 25Gbps to 27Gbps by this patch.
> > This patch adds a generic function to support implementation options
> > based on IIDR and disables MSI polling if IIDR matches the specific
> > implementation tested.
> Not sure if we should do checks like this on an implementation basis.
> I'm sure maintainers will decide.
Yes, maintainers will decide. I guess Will won't object to IIDR-based solution according to
previous discussion threads:
https://lore.kernel.org/patchwork/patch/783718/
Am I right, Will?
>
> >
> > Cc: Prime Zeng <prime.zeng@hisilicon.com>
> > Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
> > ---
> > -v2: rather than disabling msipolling globally, only disable it for
> > specific implementation based on IIDR
> >
> > drivers/iommu/arm-smmu-v3.c | 31 +++++++++++++++++++++++++++++--
>
> this file has moved, check linux-next
Thanks for reminding. Hopefully Will or Robin can give some feedback so that the v3 can come to fix this
as well as other issues they might point out.
>
> > 1 file changed, 29 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
> > index f578677a5c41..ed5a6774eb45 100644
> > --- a/drivers/iommu/arm-smmu-v3.c
> > +++ b/drivers/iommu/arm-smmu-v3.c
> > @@ -88,6 +88,12 @@
> > #define IDR5_VAX GENMASK(11, 10)
> > #define IDR5_VAX_52_BIT 1
> >
> > +#define ARM_SMMU_IIDR 0x18
> > +#define IIDR_VARIANT GENMASK(19, 16)
> > +#define IIDR_REVISION GENMASK(15, 12)
> > +#define IIDR_IMPLEMENTER GENMASK(11, 0)
> > +#define IMPLEMENTER_HISILICON 0x736
> > +
> > #define ARM_SMMU_CR0 0x20
> > #define CR0_ATSCHK (1 << 4)
> > #define CR0_CMDQEN (1 << 3)
> > @@ -652,6 +658,7 @@ struct arm_smmu_device {
> >
> > #define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0)
> > #define ARM_SMMU_OPT_PAGE0_REGS_ONLY (1 << 1)
> > +#define ARM_SMMU_OPT_DISABLE_MSIPOLL (1 << 2)
> > u32 options;
> >
> > struct arm_smmu_cmdq cmdq;
> > @@ -992,7 +999,8 @@ static void arm_smmu_cmdq_build_sync_cmd(u64
> *cmd, struct arm_smmu_device *smmu,
> > * Beware that Hi16xx adds an extra 32 bits of goodness to its MSI
> > * payload, so the write will zero the entire command on that platform.
> > */
> > - if (smmu->features & ARM_SMMU_FEAT_MSI &&
> > + if (!(smmu->options & ARM_SMMU_OPT_DISABLE_MSIPOLL) &&
> > + smmu->features & ARM_SMMU_FEAT_MSI &&
>
> I don't know why you check MSIPOLL disabled and then MSI poll supported.
> Surely for native non-MSI poll (like hi1616), the ARM_SMMU_FEAT_MSI
> check first makes sense. This is fastpath, albeit fast to maybe wait..
I was thinking !(smmu->options & ARM_SMMU_OPT_DISABLE_MSIPOLL) is the fast path
for 1620 as it can jump out quickly.
But yes, you are right since there are many other SMMU not only 1620.
>
> > smmu->features & ARM_SMMU_FEAT_COHERENCY) {
> > ent.sync.msiaddr = q->base_dma + Q_IDX(&q->llq, prod) *
> > q->ent_dwords * 8;
> > @@ -1332,7 +1340,8 @@ static int
> __arm_smmu_cmdq_poll_until_consumed(struct arm_smmu_device *smmu,
> > static int arm_smmu_cmdq_poll_until_sync(struct arm_smmu_device
> *smmu,
> > struct arm_smmu_ll_queue *llq)
> > {
> > - if (smmu->features & ARM_SMMU_FEAT_MSI &&
> > + if (!(smmu->options & ARM_SMMU_OPT_DISABLE_MSIPOLL) &&
> > + smmu->features & ARM_SMMU_FEAT_MSI &&
> > smmu->features & ARM_SMMU_FEAT_COHERENCY)
> > return __arm_smmu_cmdq_poll_until_msi(smmu, llq);
> >
> > @@ -3693,6 +3702,21 @@ static int arm_smmu_device_reset(struct
> arm_smmu_device *smmu, bool bypass)
> > return 0;
> > }
> >
> > +static void acpi_smmu_get_implementation_options(struct
> arm_smmu_device *smmu)
> > +{
> > + /*
> > + * IIDR provides information about the implementation and implementer
> of
> > + * the SMMU
> > + */
> > + u32 iidr = readl_relaxed(smmu->base + ARM_SMMU_IIDR);
> > + u32 implementer = FIELD_GET(IIDR_IMPLEMENTER, iidr);
> > + u32 variant = FIELD_GET(IIDR_VARIANT, iidr);
> > + u32 revision = FIELD_GET(IIDR_REVISION, iidr);
>
> why not check the product ID also, i.e. the complete register contents?
Ideally, we can use variant and revision to differentiate all 1616, 1620, 1630 and so on.
All of them should get different values for the combination of variant and revision.
However, I will think more about other fields as you are suggesting.
>
> > +
> > + if (implementer == IMPLEMENTER_HISILICON && variant == 3 && revision
> == 0)
> > + smmu->options |= ARM_SMMU_OPT_DISABLE_MSIPOLL;
> > +}
> > +
> > static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)
> > {
> > u32 reg;
> > @@ -3892,6 +3916,9 @@ static int arm_smmu_device_hw_probe(struct
> arm_smmu_device *smmu)
> >
> > smmu->ias = max(smmu->ias, smmu->oas);
> >
> > + /* set implementation-related options according to IIDR */
> > + acpi_smmu_get_implementation_options(smmu);
> > +
> > dev_info(smmu->dev, "ias %lu-bit, oas %lu-bit (features 0x%08x)\n",
> > smmu->ias, smmu->oas, smmu->features);
> > return 0;
> >
Thanks
Barry
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-07-31 10:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 8:33 [PATCH v2] iommu/arm-smmu-v3: disable MSI polling if SEV polling is faster Barry Song
2020-07-31 10:21 ` John Garry
2020-07-31 10:48 ` Song Bao Hua (Barry Song) [this message]
2020-07-31 12:21 ` Will Deacon
2020-07-31 12:30 ` Song Bao Hua (Barry Song)
2020-07-31 12:43 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B926444035E5E2439431908E3842AFD25CFDC3@DGGEMI525-MBS.china.huawei.com \
--to=song.bao.hua@hisilicon.com \
--cc=iommu@lists.linux-foundation.org \
--cc=john.garry@huawei.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linuxarm@huawei.com \
--cc=prime.zeng@hisilicon.com \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).