Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To:     linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Cc:     joro@8bytes.org, will@kernel.org,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [PATCH v4 04/13] iommu/amd: Convert to using amd_io_pgtable
Date:   Tue, 15 Dec 2020 01:36:56 -0600
Message-Id: <20201215073705.123786-5-suravee.suthikulpanit@amd.com>
In-Reply-To: <20201215073705.123786-1-suravee.suthikulpanit@amd.com>
References: <20201215073705.123786-1-suravee.suthikulpanit@amd.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from ethanolx5673host.amd.com (165.204.78.2) by SN2PR01CA0060.prod.exchangelabs.com (2603:10b6:800::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 07:34:40 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 9141819d-7afa-4519-ff27-08d8a0cbe2c3
X-MS-TrafficTypeDiagnostic: BY5PR12MB3794:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BY5PR12MB37943D38A8F62C487C4AA753F3C60@BY5PR12MB3794.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5236;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: SUfJNQSyzQWpUe2c4WRkgf9B3MRU9YKViv1k6x42FGYrwgkh+S2ipGNcNcoxfenYANTnJHi99NmZhFK6deA5R3C/tDWmmeOfTVOaPFbesRpMt3J50jj1HGdyU1v6A4OJ4PRA7usjhLS4CfrpgvcvjaKG0HuBlDbxUuy0AuqCnRmzr9XNyNRde3yDsyObH6KVUO4RaP4PYVbdN5UXqIE23T3tWEUqcwPryshjKZR77tEiacevbghXIfHJDbw4SJoBs1SLvEFp9VzbwgVR86o5qDEW9BT4fhVEsD9anzzwHH+wtfSkLYriUiB7tIz3vzC/StEkdaFWex2kh+VaOvXfuq1CEXkuynTkLDkrqso1PTv192ZtukV3x1arkBcvjB7C
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB4597.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(366004)(346002)(376002)(6666004)(2616005)(66556008)(16526019)(86362001)(956004)(66946007)(6486002)(34490700003)(26005)(52116002)(186003)(66476007)(1076003)(7696005)(36756003)(83380400001)(5660300002)(44832011)(2906002)(8676002)(508600001)(8936002)(4326008);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?cLi2jGAQL+/CoyJZLInhS9jeqGHjIqxU5ndJXNSC74ZQ1xtZqVr9JO2XFoXx?=
 =?us-ascii?Q?ZDx/xmzxi+J+KuXT7bt1QG7P0Pe4n2Zn5p1UsddPXAT7lFxldf9HpvCYUjM7?=
 =?us-ascii?Q?5s/6yREZNdHK2a8atGw31afpO+R3juAAVUcMqMPlQgRULxwH87TrHtSuCzdK?=
 =?us-ascii?Q?vquqeZl0cA3Zn5WAOKZFN6KfOwUAKbyxTxHM7TEAbLVMlgSu3/3UZe74yWpD?=
 =?us-ascii?Q?kdDXoyoPYbRFbVtUefycXQjh0aeoCJaYVL3NZOWi/BAEhes4NEo2nJvAXG3z?=
 =?us-ascii?Q?YPk4EyUdf6Yz8SLNYpO7JCHh74Ro+bgAz4cL4ss9fZ7ppbe6MIae5Nv1Kf/Z?=
 =?us-ascii?Q?Wx6J243xwrbpIT/YRByDcJ3QIbgStCp8MKh+6H+xRKSV+n3ozkJjVCz/ycMT?=
 =?us-ascii?Q?bYuC7zum5bSmGb6iwn3DKJMSVqnFx2dqVQBrH5C9aJEG81pzALiw6OYQTSQp?=
 =?us-ascii?Q?NKRKBRQ5+1v+6jVz9BuehqblgCTniiMI6TpWyQDT/FJZfEop1Rr/Ixbv/Gbn?=
 =?us-ascii?Q?W18bO9mpLqLn0n6YzUsmfkNqihS2dSE6A3at8RyHs1ktn7y3luaDJnfZzgKF?=
 =?us-ascii?Q?JZa9JNmXSZlDE1/pxiXrEBFwVnPei9iL4uCJSdmkgTx1Ac2l++G727q3IRz7?=
 =?us-ascii?Q?nkry0PBX3DX5rvFmo6N9CZCnox3FfDY0xdQSYOFdsFdw8QupIbr9ob4JtGFF?=
 =?us-ascii?Q?0C9rGzLChpq7GxIqA3gIJZJDuvx1QmAkXydcST5UoX4eb09thHigqXtMv8+7?=
 =?us-ascii?Q?51SOaS3k1msm7hB/+T9Hp8QMylpDbWxkdKSt2drhQO2N4kZNx4fc5QFz6j66?=
 =?us-ascii?Q?vzQU9wsGjLaVUO+eHbeS4GShCXcFpUB4d9RTVmZeyFvo6kG8+wI+eYk6nJRn?=
 =?us-ascii?Q?6npGBuN47XR8qdU4gL1chIeNrn0AYzzZ6I8S4GLg9x467MgG1t7D0y9GemVU?=
 =?us-ascii?Q?NJfX9dv/2SEvesP/vLa9siCGqZQgWdYc+5Vc3NFTtfaDerRbNYHw4fcqN559?=
 =?us-ascii?Q?8YW2?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB4597.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 07:34:41.2498
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-Network-Message-Id: 9141819d-7afa-4519-ff27-08d8a0cbe2c3
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /V+05KYigkgqhZ7iMMGPviU3ireC/MYEZvBx2uNOfG2K8yDvugprdRjFGMxGhjosBU2RAvPSlUEIZ5Lc9DMS3Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3794
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Make use of the new struct amd_io_pgtable in preparation to remove
the struct domain_pgtable.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/iommu/amd/amd_iommu.h |  1 +
 drivers/iommu/amd/iommu.c     | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index b8dae3941f0f..bf9723b35e77 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -56,6 +56,7 @@ extern void amd_iommu_domain_direct_map(struct iommu_domain *dom);
 extern int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids);
 extern int amd_iommu_flush_page(struct iommu_domain *dom, u32 pasid,
 				u64 address);
+extern void amd_iommu_update_and_flush_device_table(struct protection_domain *domain);
 extern int amd_iommu_flush_tlb(struct iommu_domain *dom, u32 pasid);
 extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, u32 pasid,
 				     unsigned long cr3);
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 5b93536d6877..fdb6030b505d 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -89,8 +89,6 @@ struct kmem_cache *amd_iommu_irq_cache;
 
 static void update_domain(struct protection_domain *domain);
 static void detach_device(struct device *dev);
-static void update_and_flush_device_table(struct protection_domain *domain,
-					  struct domain_pgtable *pgtable);
 
 /****************************************************************************
  *
@@ -1502,7 +1500,7 @@ static bool increase_address_space(struct protection_domain *domain,
 
 	pgtable.root  = pte;
 	pgtable.mode += 1;
-	update_and_flush_device_table(domain, &pgtable);
+	amd_iommu_update_and_flush_device_table(domain);
 	domain_flush_complete(domain);
 
 	/*
@@ -1877,17 +1875,16 @@ static void free_gcr3_table(struct protection_domain *domain)
 }
 
 static void set_dte_entry(u16 devid, struct protection_domain *domain,
-			  struct domain_pgtable *pgtable,
 			  bool ats, bool ppr)
 {
 	u64 pte_root = 0;
 	u64 flags = 0;
 	u32 old_domid;
 
-	if (pgtable->mode != PAGE_MODE_NONE)
-		pte_root = iommu_virt_to_phys(pgtable->root);
+	if (domain->iop.mode != PAGE_MODE_NONE)
+		pte_root = iommu_virt_to_phys(domain->iop.root);
 
-	pte_root |= (pgtable->mode & DEV_ENTRY_MODE_MASK)
+	pte_root |= (domain->iop.mode & DEV_ENTRY_MODE_MASK)
 		    << DEV_ENTRY_MODE_SHIFT;
 	pte_root |= DTE_FLAG_IR | DTE_FLAG_IW | DTE_FLAG_V | DTE_FLAG_TV;
 
@@ -1977,7 +1974,7 @@ static void do_attach(struct iommu_dev_data *dev_data,
 
 	/* Update device table */
 	amd_iommu_domain_get_pgtable(domain, &pgtable);
-	set_dte_entry(dev_data->devid, domain, &pgtable,
+	set_dte_entry(dev_data->devid, domain,
 		      ats, dev_data->iommu_v2);
 	clone_aliases(dev_data->pdev);
 
@@ -2284,22 +2281,20 @@ static int amd_iommu_domain_get_attr(struct iommu_domain *domain,
  *
  *****************************************************************************/
 
-static void update_device_table(struct protection_domain *domain,
-				struct domain_pgtable *pgtable)
+static void update_device_table(struct protection_domain *domain)
 {
 	struct iommu_dev_data *dev_data;
 
 	list_for_each_entry(dev_data, &domain->dev_list, list) {
-		set_dte_entry(dev_data->devid, domain, pgtable,
+		set_dte_entry(dev_data->devid, domain,
 			      dev_data->ats.enabled, dev_data->iommu_v2);
 		clone_aliases(dev_data->pdev);
 	}
 }
 
-static void update_and_flush_device_table(struct protection_domain *domain,
-					  struct domain_pgtable *pgtable)
+void amd_iommu_update_and_flush_device_table(struct protection_domain *domain)
 {
-	update_device_table(domain, pgtable);
+	update_device_table(domain);
 	domain_flush_devices(domain);
 }
 
@@ -2309,7 +2304,7 @@ static void update_domain(struct protection_domain *domain)
 
 	/* Update device table */
 	amd_iommu_domain_get_pgtable(domain, &pgtable);
-	update_and_flush_device_table(domain, &pgtable);
+	amd_iommu_update_and_flush_device_table(domain);
 
 	/* Flush domain TLB(s) and wait for completion */
 	domain_flush_tlb_pde(domain);
-- 
2.17.1