Skip to contentSkip to conversation

RISC-V: Fix of_node_* refcount

PATCH In review Atish Patra 2 participants 5 messages Nov 20, 2018 – Jan 8, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RISC-V: Fix of_node_* refcount

Fix of_node* refcount at various places by using of_node_put.

---
 arch/riscv/kernel/cacheinfo.c  | 11 +++++++++++
 arch/riscv/kernel/cpu.c        |  1 +
 arch/riscv/kernel/cpufeature.c |  2 ++
 arch/riscv/kernel/perf_event.c |  1 +
 arch/riscv/kernel/smpboot.c    |  6 +++++-
 5 files changed, 20 insertions(+), 1 deletion(-)
arch/riscv/kernel/cacheinfo.c +11 -0
index cb35ffd8..638dee3f 100644
@@ -28,6 +28,7 @@ static int __init_cache_level(unsigned int cpu)
 {
 	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
 	struct device_node *np = of_cpu_device_node_get(cpu);
+	struct device_node *prev = NULL;
 	int levels = 0, leaves = 0, level;
 
 	if (of_property_read_bool(np, "cache-size"))
@@ -39,7 +40,10 @@ static int __init_cache_level(unsigned int cpu)
 	if (leaves > 0)
 		levels = 1;
 
+	prev = np;
 	while ((np = of_find_next_cache_node(np))) {
+		of_node_put(prev);
+		prev = np;
 		if (!of_device_is_compatible(np, "cache"))
 			break;
 		if (of_property_read_u32(np, "cache-level", &level))
@@ -55,8 +59,10 @@ static int __init_cache_level(unsigned int cpu)
 		levels = level;
 	}
 
+	of_node_put(np);
 	this_cpu_ci->num_levels = levels;
 	this_cpu_ci->num_leaves = leaves;
+
 	return 0;
 }
 
@@ -65,6 +71,7 @@ static int __populate_cache_leaves(unsigned int cpu)
 	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
 	struct cacheinfo *this_leaf = this_cpu_ci->info_list;
 	struct device_node *np = of_cpu_device_node_get(cpu);
+	struct device_node *prev = NULL;
 	int levels = 1, level = 1;
 
 	if (of_property_read_bool(np, "cache-size"))
@@ -74,7 +81,10 @@ static int __populate_cache_leaves(unsigned int cpu)
 	if (of_property_read_bool(np, "d-cache-size"))
 		ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
 
+	prev = np;
 	while ((np = of_find_next_cache_node(np))) {
+		of_node_put(prev);
+		prev = np;
 		if (!of_device_is_compatible(np, "cache"))
 			break;
 		if (of_property_read_u32(np, "cache-level", &level))
@@ -89,6 +99,7 @@ static int __populate_cache_leaves(unsigned int cpu)
 			ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
 		levels = level;
 	}
+	of_node_put(np);
 
 	return 0;
 }
arch/riscv/kernel/cpu.c +1 -0
index 3a5a2ee3..7b3eb970 100644
@@ -155,6 +155,7 @@ static int c_show(struct seq_file *m, void *v)
 	    && strcmp(compat, "riscv"))
 		seq_printf(m, "uarch\t\t: %s\n", compat);
 	seq_puts(m, "\n");
+	of_node_put(node);
 
 	return 0;
 }
arch/riscv/kernel/cpufeature.c +2 -0
index 0339087a..a6e369ed 100644
@@ -56,8 +56,10 @@ void riscv_fill_hwcap(void)
 
 	if (of_property_read_string(node, "riscv,isa", &isa)) {
 		pr_warning("Unable to find \"riscv,isa\" devicetree entry");
+		of_node_put(node);
 		return;
 	}
+	of_node_put(node);
 
 	for (i = 0; i < strlen(isa); ++i)
 		elf_hwcap |= isa2hwcap[(unsigned char)(isa[i])];
arch/riscv/kernel/perf_event.c +1 -0
index a243fae1..667ee70d 100644
@@ -476,6 +476,7 @@ int __init init_hw_perf_events(void)
 
 		if (of_id)
 			riscv_pmu = of_id->data;
+		of_node_put(node);
 	}
 
 	perf_pmu_register(riscv_pmu->pmu, "cpu", PERF_TYPE_RAW);
arch/riscv/kernel/smpboot.c +5 -1
index 18cda0e8..fc185eca 100644
@@ -57,12 +57,15 @@ void __init setup_smp(void)
 
 	while ((dn = of_find_node_by_type(dn, "cpu"))) {
 		hart = riscv_of_processor_hartid(dn);
-		if (hart < 0)
+		if (hart < 0) {
+			of_node_put(dn);
 			continue;
+		}
 
 		if (hart == cpuid_to_hartid_map(0)) {
 			BUG_ON(found_boot_cpu);
 			found_boot_cpu = 1;
+			of_node_put(dn);
 			continue;
 		}
 
@@ -70,6 +73,7 @@ void __init setup_smp(void)
 		set_cpu_possible(cpuid, true);
 		set_cpu_present(cpuid, true);
 		cpuid++;
+		of_node_put(dn);
 	}
 
 	BUG_ON(!found_boot_cpu);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 134 lines · Atish Patra

Fix of_node* refcount at various places by using of_node_put.

---
  arch/riscv/kernel/cacheinfo.c  | 11 +++++++++++
  arch/riscv/kernel/cpu.c        |  1 +
  arch/riscv/kernel/cpufeature.c |  2 ++
  arch/riscv/kernel/perf_event.c |  1 +
  arch/riscv/kernel/smpboot.c    |  6 +++++-
  5 files changed, 20 insertions(+), 1 deletion(-)
arch/riscv/kernel/cacheinfo.c +11 -0
index cb35ffd8..638dee3f 100644
@@ -28,6 +28,7 @@ static int __init_cache_level(unsigned int cpu)
  {
  	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
  	struct device_node *np = of_cpu_device_node_get(cpu);
+	struct device_node *prev = NULL;
  	int levels = 0, leaves = 0, level;
 
  	if (of_property_read_bool(np, "cache-size"))
@@ -39,7 +40,10 @@ static int __init_cache_level(unsigned int cpu)
  	if (leaves > 0)
  		levels = 1;
 
+	prev = np;
  	while ((np = of_find_next_cache_node(np))) {
+		of_node_put(prev);
+		prev = np;
  		if (!of_device_is_compatible(np, "cache"))
  			break;
  		if (of_property_read_u32(np, "cache-level", &level))
@@ -55,8 +59,10 @@ static int __init_cache_level(unsigned int cpu)
  		levels = level;
  	}
 
+	of_node_put(np);
  	this_cpu_ci->num_levels = levels;
  	this_cpu_ci->num_leaves = leaves;
+
  	return 0;
  }
 
@@ -65,6 +71,7 @@ static int __populate_cache_leaves(unsigned int cpu)
  	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
  	struct cacheinfo *this_leaf = this_cpu_ci->info_list;
  	struct device_node *np = of_cpu_device_node_get(cpu);
+	struct device_node *prev = NULL;
  	int levels = 1, level = 1;
 
  	if (of_property_read_bool(np, "cache-size"))
@@ -74,7 +81,10 @@ static int __populate_cache_leaves(unsigned int cpu)
  	if (of_property_read_bool(np, "d-cache-size"))
  		ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
 
+	prev = np;
  	while ((np = of_find_next_cache_node(np))) {
+		of_node_put(prev);
+		prev = np;
  		if (!of_device_is_compatible(np, "cache"))
  			break;
  		if (of_property_read_u32(np, "cache-level", &level))
@@ -89,6 +99,7 @@ static int __populate_cache_leaves(unsigned int cpu)
  			ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
  		levels = level;
  	}
+	of_node_put(np);
 
  	return 0;
  }
arch/riscv/kernel/cpu.c +1 -0
index 3a5a2ee3..7b3eb970 100644
@@ -155,6 +155,7 @@ static int c_show(struct seq_file *m, void *v)
  	    && strcmp(compat, "riscv"))
  		seq_printf(m, "uarch\t\t: %s\n", compat);
  	seq_puts(m, "\n");
+	of_node_put(node);
 
  	return 0;
  }
arch/riscv/kernel/cpufeature.c +2 -0
index 0339087a..a6e369ed 100644
@@ -56,8 +56,10 @@ void riscv_fill_hwcap(void)
 
  	if (of_property_read_string(node, "riscv,isa", &isa)) {
  		pr_warning("Unable to find \"riscv,isa\" devicetree entry");
+		of_node_put(node);
  		return;
  	}
+	of_node_put(node);
 
  	for (i = 0; i < strlen(isa); ++i)
  		elf_hwcap |= isa2hwcap[(unsigned char)(isa[i])];
arch/riscv/kernel/perf_event.c +1 -0
index a243fae1..667ee70d 100644
@@ -476,6 +476,7 @@ int __init init_hw_perf_events(void)
 
  		if (of_id)
  			riscv_pmu = of_id->data;
+		of_node_put(node);
  	}
 
  	perf_pmu_register(riscv_pmu->pmu, "cpu", PERF_TYPE_RAW);
arch/riscv/kernel/smpboot.c +4 -1
index 18cda0e8..fc185eca 100644
@@ -57,12 +57,15 @@ void __init setup_smp(void)
 
  	while ((dn = of_find_node_by_type(dn, "cpu"))) {
  		hart = riscv_of_processor_hartid(dn);
-		if (hart < 0)
+		if (hart < 0) {
+			of_node_put(dn);
  			continue;
+		}
 
  		if (hart == cpuid_to_hartid_map(0)) {
  			BUG_ON(found_boot_cpu);
  			found_boot_cpu = 1;
+			of_node_put(dn);
  			continue;
  		}
 

arch/riscv/kernel/smpboot.c void __init setup_smp(void) · line 79

Quoted 7 lines
arch/riscv/kernel/smpboot.c +1 -0
@@ -70,6 +73,7 @@ void __init setup_smp(void)
  		set_cpu_possible(cpuid, true);
  		set_cpu_present(cpuid, true);
  		cpuid++;
+		of_node_put(dn);
  	}
 
  	BUG_ON(!found_boot_cpu);

ping ?

Regards,
Atish

#2 lore raw
In reply to Atish Patra
Quoted 11 lines · Atish Patra
arch/riscv/kernel/smpboot.c +2 -1
index 18cda0e8..fc185eca 100644
@@ -57,12 +57,15 @@ void __init setup_smp(void)
 
 	while ((dn = of_find_node_by_type(dn, "cpu"))) {
 		hart = riscv_of_processor_hartid(dn);
-		if (hart < 0)
+		if (hart < 0) {
+			of_node_put(dn);

arch/riscv/kernel/smpboot.c void __init setup_smp(void) · line 71

Quoted 10 lines
arch/riscv/kernel/smpboot.c +2 -0
 			continue;
+		}
 
 		if (hart == cpuid_to_hartid_map(0)) {
 			BUG_ON(found_boot_cpu);
 			found_boot_cpu = 1;
+			of_node_put(dn);
 			continue;
 		}
 
[    0.000000] OF: ERROR: Bad of_node_put() on /cpus/cpu@0
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.0.0-rc1-00013-ge0b3e41110 #4
[    0.000000] Call Trace:
[    0.000000] [<ffffffe0010c8c74>] walk_stackframe+0x0/0xa4
[    0.000000] [<ffffffe0010c8e74>] show_stack+0x2a/0x34
[    0.000000] [<ffffffe00160989c>] dump_stack+0x62/0x7c
[    0.000000] [<ffffffe0014d9660>] of_node_release+0xbe/0xc0
[    0.000000] [<ffffffe00160e560>] kobject_put+0xa6/0x1e8
[    0.000000] [<ffffffe0014d8bb8>] of_node_put+0x16/0x20
[    0.000000] [<ffffffe0014d4bc2>] of_find_node_by_type+0x66/0xa4
[    0.000000] [<ffffffe0000028bc>] 0xffffffe0000028bc
[    0.000000] [<ffffffe0000026cc>] 0xffffffe0000026cc
[    0.000000] [<ffffffe0000006ec>] 0xffffffe0000006ec
[    0.000000] [<ffffffe000000076>] 0xffffffe000000076
[    0.000000] OF: ERROR: Bad of_node_put() on /cpus/cpu@1
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.0.0-rc1-00013-ge0b3e41110 #4
[    0.000000] Call Trace:
[    0.000000] [<ffffffe0010c8c74>] walk_stackframe+0x0/0xa4
[    0.000000] [<ffffffe0010c8e74>] show_stack+0x2a/0x34
[    0.000000] [<ffffffe00160989c>] dump_stack+0x62/0x7c
[    0.000000] [<ffffffe0014d9660>] of_node_release+0xbe/0xc0
[    0.000000] [<ffffffe00160e560>] kobject_put+0xa6/0x1e8
[    0.000000] [<ffffffe0014d8bb8>] of_node_put+0x16/0x20
[    0.000000] [<ffffffe0014d4bc2>] of_find_node_by_type+0x66/0xa4
[    0.000000] [<ffffffe0000028bc>] 0xffffffe0000028bc
[    0.000000] [<ffffffe0000026cc>] 0xffffffe0000026cc
[    0.000000] [<ffffffe0000006ec>] 0xffffffe0000006ec
[    0.000000] [<ffffffe000000076>] 0xffffffe000000076

Andreas.

Signature · 3 lines
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
#3 lore raw

PATCH 1/1 RISC-V: fix bad use of of_node_put

In reply to Atish Patra

of_find_node_by_type already calls of_node_put, don't call it again.

Fixes 94f9bf118f ("RISC-V: Fix of_node_* refcount")
---
 arch/riscv/kernel/smpboot.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
arch/riscv/kernel/smpboot.c +1 -5
index fc185ecabb..18cda0e8cf 100644
@@ -57,15 +57,12 @@ void __init setup_smp(void)
 
 	while ((dn = of_find_node_by_type(dn, "cpu"))) {
 		hart = riscv_of_processor_hartid(dn);
-		if (hart < 0) {
-			of_node_put(dn);
+		if (hart < 0)
 			continue;
-		}
 
 		if (hart == cpuid_to_hartid_map(0)) {
 			BUG_ON(found_boot_cpu);
 			found_boot_cpu = 1;
-			of_node_put(dn);
 			continue;
 		}
 
@@ -73,7 +70,6 @@ void __init setup_smp(void)
 		set_cpu_possible(cpuid, true);
 		set_cpu_present(cpuid, true);
 		cpuid++;
-		of_node_put(dn);
 	}
 
 	BUG_ON(!found_boot_cpu);
Signature · 6 lines
2.20.1

-- 
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
author Reviewed-by on v1 1/1
#4 lore raw

Re: [PATCH] RISC-V: fix bad use of of_node_put

Quoted 31 lines · Andreas Schwab

of_find_node_by_type already calls of_node_put, don't call it again.

Fixes 94f9bf118f ("RISC-V: Fix of_node_* refcount")
---
  arch/riscv/kernel/smpboot.c | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
arch/riscv/kernel/smpboot.c +1 -4
index fc185ecabb..18cda0e8cf 100644
@@ -57,15 +57,12 @@ void __init setup_smp(void)
 
  	while ((dn = of_find_node_by_type(dn, "cpu"))) {
  		hart = riscv_of_processor_hartid(dn);
-		if (hart < 0) {
-			of_node_put(dn);
+		if (hart < 0)
  			continue;
-		}
 
  		if (hart == cpuid_to_hartid_map(0)) {
  			BUG_ON(found_boot_cpu);
  			found_boot_cpu = 1;
-			of_node_put(dn);
  			continue;
  		}
 

arch/riscv/kernel/smpboot.c void __init setup_smp(void) · line 75

Quoted 7 lines
arch/riscv/kernel/smpboot.c +0 -1
@@ -73,7 +70,6 @@ void __init setup_smp(void)
  		set_cpu_possible(cpuid, true);
  		set_cpu_present(cpuid, true);
  		cpuid++;
-		of_node_put(dn);
  	}
 
  	BUG_ON(!found_boot_cpu);

Thanks for catching and fixing this.

Regards,
Atish