Skip to contentSkip to conversation

drm/amdkfd: Put ACPI table after using it

PATCH In review Hanjun Guo 2 participants 3 messages Jul 22, 2020 – Jul 31, 2020

Subsystems (3)
lore
Share & tools
lore

Hanjun Guo

author
#0 lore raw

PATCH 1/1 drm/amdkfd: Put ACPI table after using it

The acpi_get_table() should be coupled with acpi_put_table() if the mapped table is not used at runtime to release the table mapping.

In kfd_create_crat_image_acpi(), crat_table is copied to pcrat_image, and in kfd_create_vcrat_image_cpu(), the acpi_table is only used to get the OEM info, so those table mappings need to be release after using it.

---
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +11 -5
index 1009a3b..d378e61 100644
@@ -756,6 +756,7 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
 	struct acpi_table_header *crat_table;
 	acpi_status status;
 	void *pcrat_image;
+	int rc = 0;
 
 	if (!crat_image)
 		return -EINVAL;
@@ -776,17 +777,21 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
 
 	if (ignore_crat) {
 		pr_info("CRAT table disabled by module option\n");
-		return -ENODATA;
+		rc = -ENODATA;
+		goto out;
 	}
 
 	pcrat_image = kmemdup(crat_table, crat_table->length, GFP_KERNEL);
-	if (!pcrat_image)
-		return -ENOMEM;
+	if (!pcrat_image) {
+		rc = -ENOMEM;
+		goto out;
+	}
 
 	*crat_image = pcrat_image;
 	*size = crat_table->length;
-
-	return 0;
+out:
+	acpi_put_table(crat_table);
+	return rc;
 }
 
 /* Memory required to create Virtual CRAT.
@@ -970,6 +975,7 @@ static int kfd_create_vcrat_image_cpu(void *pcrat_image, size_t *size)
 				CRAT_OEMID_LENGTH);
 		memcpy(crat_table->oem_table_id, acpi_table->oem_table_id,
 				CRAT_OEMTABLEID_LENGTH);
+		acpi_put_table(acpi_table);
 	}
 	crat_table->total_entries = 0;
 	crat_table->num_domains = 0;
Signature · 1 line
1.7.12.4
maintainer
#1 lore raw

Hi Hanjun,

Sorry for the late reply.

Thank you for the patch and the explanation. This seems to have been broken since the first version of KFD in 2014. See one suggestion inline.

Am 2020-07-22 um 5:48 a.m. schrieb Hanjun Guo:

Quoted 27 lines

The acpi_get_table() should be coupled with acpi_put_table() if the mapped table is not used at runtime to release the table mapping.

In kfd_create_crat_image_acpi(), crat_table is copied to pcrat_image, and in kfd_create_vcrat_image_cpu(), the acpi_table is only used to get the OEM info, so those table mappings need to be release after using it.

---
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -0
index 1009a3b..d378e61 100644
@@ -756,6 +756,7 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
 	struct acpi_table_header *crat_table;
 	acpi_status status;
 	void *pcrat_image;
+	int rc = 0;
 
 	if (!crat_image)
 		return -EINVAL;

drivers/gpu/drm/amd/amdkfd/kfd_crat.c int kfd_create_crat_image_acpi(void **crat_image, size_t *size) · line 779

Quoted 3 lines
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +0 -0
@@ -776,17 +777,21 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
 
 	if (ignore_crat) {
 		pr_info("CRAT table disabled by module option\n");

We should probably move this check to before we get the CRAT table. There is not point getting and putting it if we're going to ignore it anyway.

Do you want to send an updated patch with that change? Or maybe do it as a 2-patch series?

Regards,
  Felix

Quoted 31 lines
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +10 -5
-		return -ENODATA;
+		rc = -ENODATA;
+		goto out;
 	}
 
 	pcrat_image = kmemdup(crat_table, crat_table->length, GFP_KERNEL);
-	if (!pcrat_image)
-		return -ENOMEM;
+	if (!pcrat_image) {
+		rc = -ENOMEM;
+		goto out;
+	}
 
 	*crat_image = pcrat_image;
 	*size = crat_table->length;
-
-	return 0;
+out:
+	acpi_put_table(crat_table);
+	return rc;
 }
 
 /* Memory required to create Virtual CRAT.
@@ -970,6 +975,7 @@ static int kfd_create_vcrat_image_cpu(void *pcrat_image, size_t *size)
 				CRAT_OEMID_LENGTH);
 		memcpy(crat_table->oem_table_id, acpi_table->oem_table_id,
 				CRAT_OEMTABLEID_LENGTH);
+		acpi_put_table(acpi_table);
 	}
 	crat_table->total_entries = 0;
 	crat_table->num_domains = 0;
author
#2 lore raw
Quoted 43 lines · Felix Kuehling

Hi Hanjun,

Sorry for the late reply.

Thank you for the patch and the explanation. This seems to have been broken since the first version of KFD in 2014. See one suggestion inline.

Am 2020-07-22 um 5:48 a.m. schrieb Hanjun Guo:

Quoted 27 lines

The acpi_get_table() should be coupled with acpi_put_table() if the mapped table is not used at runtime to release the table mapping.

In kfd_create_crat_image_acpi(), crat_table is copied to pcrat_image, and in kfd_create_vcrat_image_cpu(), the acpi_table is only used to get the OEM info, so those table mappings need to be release after using it.

---
  drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -0
index 1009a3b..d378e61 100644
@@ -756,6 +756,7 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
  	struct acpi_table_header *crat_table;
  	acpi_status status;
  	void *pcrat_image;
+	int rc = 0;
 
  	if (!crat_image)
  		return -EINVAL;

drivers/gpu/drm/amd/amdkfd/kfd_crat.c int kfd_create_crat_image_acpi(void **crat_image, size_t *size) · line 779

Quoted 3 lines
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +0 -0
@@ -776,17 +777,21 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
 
  	if (ignore_crat) {
  		pr_info("CRAT table disabled by module option\n");

We should probably move this check to before we get the CRAT table. There is not point getting and putting it if we're going to ignore it anyway.

Quoted 2 lines

Do you want to send an updated patch with that change? Or maybe do it as a 2-patch series?

I will do it as 2-patch series and send a updated patch set.

Thanks
Hanjun