From 05ab2496ba9815f13013fc07abbbcc5cb59678ef Mon Sep 17 00:00:00 2001
From: Jiankang Chen <chenjiankang1@huawei.com>
Date: Sat, 18 May 2019 22:09:58 +0800
Subject: [PATCH] iommu: Allow the thread binding device

hulk inclusion
category: feature
bugzilla: 14369
CVE: NA
-------------------

iommu pasid bond to device

Signed-off-by: Jiankang Chen <chenjiankang1@huawei.com>
Signed-off-by: Fang Lijun <fanglijun3@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/iommu/iommu-sva.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c
index 00ae7f0e62a1..b666fae6f55c 100644
--- a/drivers/iommu/iommu-sva.c
+++ b/drivers/iommu/iommu-sva.c
@@ -679,9 +679,10 @@ int __iommu_sva_bind_device(struct device *dev, struct mm_struct *mm,
 	}
 	spin_unlock(&iommu_sva_lock);
 
-	if (bond)
-		return -EEXIST;
-
+	if (bond) {
+		*pasid = bond->io_mm->pasid;
+		return ret;
+	}
 	/* Require identical features within an io_mm for now */
 	if (io_mm && (flags != io_mm->flags)) {
 		io_mm_put(io_mm);
-- 
GitLab