Skip to contentSkip to conversation

Minor cleanups

PATCH In review Hanjun Guo 2 participants 5 messages Jul 21, 2020 – Jul 27, 2020 ACPI

lore
Share & tools
lore

Hanjun Guo

author
#0 lore raw

cover Minor cleanups

When reviewing patchset "[PATCH v2 0/6] ACPI: Only create NUMA nodes from entries in SRAT or SRAT emulation." [0] from Jonathan, I found some code can be improved, here are some cleanup patches.

[0]: https://www.spinics.net/lists/linux-mm/msg220777.html

Hanjun Guo (3):
ACPI: tables: Remove the duplicated checks for
acpi_parse_entries_array()
ACPI: NUMA: Remove the useless sub table pointer check
ACPI: NUMA: Remove the useless 'node >= MAX_NUMNODES' check

 drivers/acpi/numa/srat.c | 10 +---------
 drivers/acpi/tables.c    | 17 +++--------------
 2 files changed, 4 insertions(+), 23 deletions(-)
Signature · 1 line
1.7.12.4
author
#1 lore raw

PATCH 1/3 ACPI: tables: Remove the duplicated checks for acpi_parse_entries_array()

acpi_disabled, pointer id and table_header are checked in acpi_table_parse_entries_array(), and acpi_parse_entries_array() is only called by acpi_table_parse_entries_array(), so those checks in acpi_parse_entries_array() are duplicate.

Remove those duplicated check and move the table_size check to function acpi_table_parse_entries_array() as well.

---
 drivers/acpi/tables.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/acpi/tables.c +3 -14
index 0e905c3..c85e1c6 100644
@@ -292,20 +292,6 @@ static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
 	int errs = 0;
 	int i;
 
-	if (acpi_disabled)
-		return -ENODEV;
-
-	if (!id)
-		return -EINVAL;
-
-	if (!table_size)
-		return -EINVAL;
-
-	if (!table_header) {
-		pr_warn("%4.4s not present\n", id);
-		return -ENODEV;
-	}
-
 	table_end = (unsigned long)table_header + table_header->length;
 
 	/* Parse all entries looking for a match. */
@@ -371,6 +357,9 @@ int __init acpi_table_parse_entries_array(char *id,
 	if (!id)
 		return -EINVAL;
 
+	if (!table_size)
+		return -EINVAL;
+
 	if (!strncmp(id, ACPI_SIG_MADT, 4))
 		instance = acpi_apic_instance;
 
Signature · 1 line
1.7.12.4
author
#2 lore raw

PATCH 2/3 ACPI: NUMA: Remove the useless sub table pointer check

In reply to Hanjun Guo

In acpi_parse_entries_array(), the subtable entries (entry.hdr) will never be NULL, so for ACPI subtable handler in struct acpi_subtable_proc, will never handle NULL subtable entries, remove those useless subtable pointer checks in those callback handlers.

---
 drivers/acpi/numa/srat.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/acpi/numa/srat.c +0 -8
index 5be5a97..3d430b0 100644
@@ -291,8 +291,6 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
 	struct acpi_srat_x2apic_cpu_affinity *processor_affinity;
 
 	processor_affinity = (struct acpi_srat_x2apic_cpu_affinity *)header;
-	if (!processor_affinity)
-		return -EINVAL;
 
 	acpi_table_print_srat_entry(&header->common);
 
@@ -309,8 +307,6 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
 	struct acpi_srat_cpu_affinity *processor_affinity;
 
 	processor_affinity = (struct acpi_srat_cpu_affinity *)header;
-	if (!processor_affinity)
-		return -EINVAL;
 
 	acpi_table_print_srat_entry(&header->common);
 
@@ -327,8 +323,6 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
 	struct acpi_srat_gicc_affinity *processor_affinity;
 
 	processor_affinity = (struct acpi_srat_gicc_affinity *)header;
-	if (!processor_affinity)
-		return -EINVAL;
 
 	acpi_table_print_srat_entry(&header->common);
 
@@ -347,8 +341,6 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
 	struct acpi_srat_mem_affinity *memory_affinity;
 
 	memory_affinity = (struct acpi_srat_mem_affinity *)header;
-	if (!memory_affinity)
-		return -EINVAL;
 
 	acpi_table_print_srat_entry(&header->common);
 
Signature · 1 line
1.7.12.4
author
#3 lore raw

PATCH 3/3 ACPI: NUMA: Remove the useless 'node >= MAX_NUMNODES' check

In reply to Hanjun Guo

acpi_map_pxm_to_node() will never return numa node greater than MAX_NUMNODES, so 'node >= MAX_NUMNODES' is not needed, remove it.

---
 drivers/acpi/numa/srat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/numa/srat.c +1 -1
index 3d430b0..15bbaab 100644
@@ -230,7 +230,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 		pxm &= 0xff;
 
 	node = acpi_map_pxm_to_node(pxm);
-	if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {
+	if (node == NUMA_NO_NODE) {
 		pr_err("SRAT: Too many proximity domains.\n");
 		goto out_err_bad_srat;
 	}
Signature · 1 line
1.7.12.4
#4 lore raw
In reply to Hanjun Guo
Quoted 13 lines · Hanjun Guo

When reviewing patchset "[PATCH v2 0/6] ACPI: Only create NUMA nodes from entries in SRAT or SRAT emulation." [0] from Jonathan, I found some code can be improved, here are some cleanup patches.

[0]: https://www.spinics.net/lists/linux-mm/msg220777.html

Hanjun Guo (3):
ACPI: tables: Remove the duplicated checks for
acpi_parse_entries_array()
ACPI: NUMA: Remove the useless sub table pointer check
ACPI: NUMA: Remove the useless 'node >= MAX_NUMNODES' check

Quoted 5 lines
 drivers/acpi/numa/srat.c | 10 +---------
 drivers/acpi/tables.c    | 17 +++--------------
 2 files changed, 4 insertions(+), 23 deletions(-)

--

All three patches applied as 5.9 material, thanks!