From: Robin Murphy <robin.murphy@arm.com>
To: Keqian Zhu <zhukeqian1@huawei.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org
Cc: Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
Joerg Roedel <joro@8bytes.org>,
Catalin Marinas <catalin.marinas@arm.com>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Mark Brown <broonie@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
Alexios Zavras <alexios.zavras@intel.com>,
wanghaibin.wang@huawei.com, jiangkunkun@huawei.com
Subject: Re: [PATCH v2] iommu: Defer the early return in arm_(v7s/lpae)_map
Date: Tue, 8 Dec 2020 14:20:27 +0000 [thread overview]
Message-ID: <ebf1f2cc-b6bf-90b2-8a1c-535fc242d6da@arm.com> (raw)
In-Reply-To: <20201207115758.9400-1-zhukeqian1@huawei.com>
On 2020-12-07 11:57, Keqian Zhu wrote:
> Although handling a mapping request with no permissions is a
> trivial no-op, defer the early return until after the size/range
> checks so that we are consistent with other mapping requests.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
> drivers/iommu/io-pgtable-arm-v7s.c | 8 ++++----
> drivers/iommu/io-pgtable-arm.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
> index a688f22cbe3b..359b96b0fa3e 100644
> --- a/drivers/iommu/io-pgtable-arm-v7s.c
> +++ b/drivers/iommu/io-pgtable-arm-v7s.c
> @@ -522,14 +522,14 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
> struct io_pgtable *iop = &data->iop;
> int ret;
>
> - /* If no access, then nothing to do */
> - if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
> - return 0;
> -
> if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) ||
> paddr >= (1ULL << data->iop.cfg.oas)))
> return -ERANGE;
>
> + /* If no access, then nothing to do */
> + if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
> + return 0;
> +
> ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);
> /*
> * Synchronise all PTE updates for the new mapping before there's
> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
> index a7a9bc08dcd1..8ade72adab31 100644
> --- a/drivers/iommu/io-pgtable-arm.c
> +++ b/drivers/iommu/io-pgtable-arm.c
> @@ -444,10 +444,6 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
> arm_lpae_iopte prot;
> long iaext = (s64)iova >> cfg->ias;
>
> - /* If no access, then nothing to do */
> - if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))
> - return 0;
> -
> if (WARN_ON(!size || (size & cfg->pgsize_bitmap) != size))
> return -EINVAL;
>
> @@ -456,6 +452,10 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
> if (WARN_ON(iaext || paddr >> cfg->oas))
> return -ERANGE;
>
> + /* If no access, then nothing to do */
> + if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))
> + return 0;
> +
> prot = arm_lpae_prot_to_pte(data, iommu_prot);
> ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep, gfp);
> /*
>
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com>
To: Keqian Zhu <zhukeqian1@huawei.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>,
Marc Zyngier <maz@kernel.org>,
jiangkunkun@huawei.com,
Sean Christopherson <sean.j.christopherson@intel.com>,
Alexios Zavras <alexios.zavras@intel.com>,
Mark Brown <broonie@kernel.org>,
James Morse <james.morse@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
wanghaibin.wang@huawei.com, Thomas Gleixner <tglx@linutronix.de>,
Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: Re: [PATCH v2] iommu: Defer the early return in arm_(v7s/lpae)_map
Date: Tue, 8 Dec 2020 14:20:27 +0000 [thread overview]
Message-ID: <ebf1f2cc-b6bf-90b2-8a1c-535fc242d6da@arm.com> (raw)
In-Reply-To: <20201207115758.9400-1-zhukeqian1@huawei.com>
On 2020-12-07 11:57, Keqian Zhu wrote:
> Although handling a mapping request with no permissions is a
> trivial no-op, defer the early return until after the size/range
> checks so that we are consistent with other mapping requests.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
> drivers/iommu/io-pgtable-arm-v7s.c | 8 ++++----
> drivers/iommu/io-pgtable-arm.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
> index a688f22cbe3b..359b96b0fa3e 100644
> --- a/drivers/iommu/io-pgtable-arm-v7s.c
> +++ b/drivers/iommu/io-pgtable-arm-v7s.c
> @@ -522,14 +522,14 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
> struct io_pgtable *iop = &data->iop;
> int ret;
>
> - /* If no access, then nothing to do */
> - if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
> - return 0;
> -
> if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) ||
> paddr >= (1ULL << data->iop.cfg.oas)))
> return -ERANGE;
>
> + /* If no access, then nothing to do */
> + if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
> + return 0;
> +
> ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);
> /*
> * Synchronise all PTE updates for the new mapping before there's
> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
> index a7a9bc08dcd1..8ade72adab31 100644
> --- a/drivers/iommu/io-pgtable-arm.c
> +++ b/drivers/iommu/io-pgtable-arm.c
> @@ -444,10 +444,6 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
> arm_lpae_iopte prot;
> long iaext = (s64)iova >> cfg->ias;
>
> - /* If no access, then nothing to do */
> - if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))
> - return 0;
> -
> if (WARN_ON(!size || (size & cfg->pgsize_bitmap) != size))
> return -EINVAL;
>
> @@ -456,6 +452,10 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
> if (WARN_ON(iaext || paddr >> cfg->oas))
> return -ERANGE;
>
> + /* If no access, then nothing to do */
> + if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))
> + return 0;
> +
> prot = arm_lpae_prot_to_pte(data, iommu_prot);
> ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep, gfp);
> /*
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com>
To: Keqian Zhu <zhukeqian1@huawei.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>,
Marc Zyngier <maz@kernel.org>, Joerg Roedel <joro@8bytes.org>,
jiangkunkun@huawei.com,
Sean Christopherson <sean.j.christopherson@intel.com>,
Alexios Zavras <alexios.zavras@intel.com>,
Mark Brown <broonie@kernel.org>,
James Morse <james.morse@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
wanghaibin.wang@huawei.com, Thomas Gleixner <tglx@linutronix.de>,
Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: Re: [PATCH v2] iommu: Defer the early return in arm_(v7s/lpae)_map
Date: Tue, 8 Dec 2020 14:20:27 +0000 [thread overview]
Message-ID: <ebf1f2cc-b6bf-90b2-8a1c-535fc242d6da@arm.com> (raw)
In-Reply-To: <20201207115758.9400-1-zhukeqian1@huawei.com>
On 2020-12-07 11:57, Keqian Zhu wrote:
> Although handling a mapping request with no permissions is a
> trivial no-op, defer the early return until after the size/range
> checks so that we are consistent with other mapping requests.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
> drivers/iommu/io-pgtable-arm-v7s.c | 8 ++++----
> drivers/iommu/io-pgtable-arm.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
> index a688f22cbe3b..359b96b0fa3e 100644
> --- a/drivers/iommu/io-pgtable-arm-v7s.c
> +++ b/drivers/iommu/io-pgtable-arm-v7s.c
> @@ -522,14 +522,14 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
> struct io_pgtable *iop = &data->iop;
> int ret;
>
> - /* If no access, then nothing to do */
> - if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
> - return 0;
> -
> if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) ||
> paddr >= (1ULL << data->iop.cfg.oas)))
> return -ERANGE;
>
> + /* If no access, then nothing to do */
> + if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
> + return 0;
> +
> ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);
> /*
> * Synchronise all PTE updates for the new mapping before there's
> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
> index a7a9bc08dcd1..8ade72adab31 100644
> --- a/drivers/iommu/io-pgtable-arm.c
> +++ b/drivers/iommu/io-pgtable-arm.c
> @@ -444,10 +444,6 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
> arm_lpae_iopte prot;
> long iaext = (s64)iova >> cfg->ias;
>
> - /* If no access, then nothing to do */
> - if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))
> - return 0;
> -
> if (WARN_ON(!size || (size & cfg->pgsize_bitmap) != size))
> return -EINVAL;
>
> @@ -456,6 +452,10 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
> if (WARN_ON(iaext || paddr >> cfg->oas))
> return -ERANGE;
>
> + /* If no access, then nothing to do */
> + if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))
> + return 0;
> +
> prot = arm_lpae_prot_to_pte(data, iommu_prot);
> ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep, gfp);
> /*
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-08 14:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 11:57 [PATCH v2] iommu: Defer the early return in arm_(v7s/lpae)_map Keqian Zhu
2020-12-07 11:57 ` Keqian Zhu
2020-12-07 11:57 ` Keqian Zhu
2020-12-08 14:20 ` Robin Murphy [this message]
2020-12-08 14:20 ` Robin Murphy
2020-12-08 14:20 ` Robin Murphy
2020-12-08 15:54 ` Will Deacon
2020-12-08 15:54 ` Will Deacon
2020-12-08 15:54 ` 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=ebf1f2cc-b6bf-90b2-8a1c-535fc242d6da@arm.com \
--to=robin.murphy@arm.com \
--cc=akpm@linux-foundation.org \
--cc=alexios.zavras@intel.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=james.morse@arm.com \
--cc=jiangkunkun@huawei.com \
--cc=joro@8bytes.org \
--cc=julien.thierry.kdev@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=wanghaibin.wang@huawei.com \
--cc=will@kernel.org \
--cc=zhukeqian1@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.