Re: [PATCH 1/1] iommu/io-pgtable: use size_t return type for all foo_unmap

From: Vivek Gautam
Date: Mon Feb 05 2018 - 13:22:06 EST

Hi Robin,


On 2/5/2018 11:38 PM, Robin Murphy wrote:
On 05/02/18 17:59, Vivek Gautam wrote:
Unmap returns a size_t all throughout the IOMMU framework.
Make io-pgtable match this convention.
Moreover, there isn't a need to have a signed int return type
as we return 0 in case of failures.

That makes sense (the code itself has always followed that convention, even if the prototypes didn't), and at a glance it looks like you've caught all the sites which need it.

Yes, all the foo_unmap() sites.

Acked-by: Robin Murphy <robin.murphy@xxxxxxx>

Thanks Robin

Regards
Vivek


Signed-off-by: Vivek Gautam <vivek.gautam@xxxxxxxxxxxxxx>
---
 drivers/iommu/io-pgtable-arm-v7s.c | 21 +++++++++++----------
 drivers/iommu/io-pgtable-arm.c | 24 ++++++++++++------------
 drivers/iommu/io-pgtable.h | 4 ++--
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 2ca08dc9331c..10e4a3d11c02 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -357,8 +357,8 @@ static bool arm_v7s_pte_is_cont(arm_v7s_iopte pte, int lvl)
ÂÂÂÂÂ return false;
 }
 -static int __arm_v7s_unmap(struct arm_v7s_io_pgtable *, unsigned long,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ size_t, int, arm_v7s_iopte *);
+static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *, unsigned long,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ size_t, int, arm_v7s_iopte *);
  static int arm_v7s_init_pte(struct arm_v7s_io_pgtable *data,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, phys_addr_t paddr, int prot,
@@ -541,9 +541,10 @@ static arm_v7s_iopte arm_v7s_split_cont(struct arm_v7s_io_pgtable *data,
ÂÂÂÂÂ return pte;
 }
 -static int arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_v7s_iopte blk_pte, arm_v7s_iopte *ptep)
+static size_t arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_v7s_iopte blk_pte,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_v7s_iopte *ptep)
 {
ÂÂÂÂÂ struct io_pgtable_cfg *cfg = &data->iop.cfg;
ÂÂÂÂÂ arm_v7s_iopte pte, *tablep;
@@ -584,9 +585,9 @@ static int arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,
ÂÂÂÂÂ return size;
 }
 -static int __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size, int lvl,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_v7s_iopte *ptep)
+static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size, int lvl,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_v7s_iopte *ptep)
 {
ÂÂÂÂÂ arm_v7s_iopte pte[ARM_V7S_CONT_PAGES];
ÂÂÂÂÂ struct io_pgtable *iop = &data->iop;
@@ -656,8 +657,8 @@ static int __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,
ÂÂÂÂÂ return __arm_v7s_unmap(data, iova, size, lvl + 1, ptep);
 }
 -static int arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova,
-ÂÂÂÂÂÂÂÂÂÂÂÂ size_t size)
+static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ size_t size)
 {
ÂÂÂÂÂ struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);
 diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 51e5c43caed1..8faaaa04d7a7 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -268,9 +268,9 @@ static void __arm_lpae_set_pte(arm_lpae_iopte *ptep, arm_lpae_iopte pte,
ÂÂÂÂÂÂÂÂÂ __arm_lpae_sync_pte(ptep, cfg);
 }
 -static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size, int lvl,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte *ptep);
+static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size, int lvl,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte *ptep);
  static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ phys_addr_t paddr, arm_lpae_iopte prot,
@@ -506,10 +506,10 @@ static void arm_lpae_free_pgtable(struct io_pgtable *iop)
ÂÂÂÂÂ kfree(data);
 }
 -static int arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte blk_pte, int lvl,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte *ptep)
+static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte blk_pte, int lvl,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte *ptep)
 {
ÂÂÂÂÂ struct io_pgtable_cfg *cfg = &data->iop.cfg;
ÂÂÂÂÂ arm_lpae_iopte pte, *tablep;
@@ -560,9 +560,9 @@ static int arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,
ÂÂÂÂÂ return size;
 }
 -static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size, int lvl,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte *ptep)
+static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova, size_t size, int lvl,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ arm_lpae_iopte *ptep)
 {
ÂÂÂÂÂ arm_lpae_iopte pte;
ÂÂÂÂÂ struct io_pgtable *iop = &data->iop;
@@ -606,8 +606,8 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
ÂÂÂÂÂ return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
 }
 -static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂ size_t size)
+static size_t arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ size_t size)
 {
ÂÂÂÂÂ struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
ÂÂÂÂÂ arm_lpae_iopte *ptep = data->pgd;
diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
index cd2e1eafffe6..2df79093cad9 100644
--- a/drivers/iommu/io-pgtable.h
+++ b/drivers/iommu/io-pgtable.h
@@ -119,8 +119,8 @@ struct io_pgtable_cfg {
 struct io_pgtable_ops {
ÂÂÂÂÂ int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
ÂÂÂÂÂÂÂÂÂÂÂÂ phys_addr_t paddr, size_t size, int prot);
-ÂÂÂ int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
-ÂÂÂÂÂÂÂÂÂÂÂÂ size_t size);
+ÂÂÂ size_t (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
+ÂÂÂÂÂÂÂÂÂÂÂ size_t size);
ÂÂÂÂÂ phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned long iova);
 };

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html