Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1407358 > unrolled thread
| Started by | Zhen Lei <thunder.leizhen@huawei.com> |
|---|---|
| First post | 2016-05-26 04:50 +0200 |
| Last post | 2016-05-27 09:10 +0200 |
| Articles | 6 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH 1/3] of/numa: remove a duplicated pr_debug information Zhen Lei <thunder.leizhen@huawei.com> - 2016-05-26 04:50 +0200
[PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block Zhen Lei <thunder.leizhen@huawei.com> - 2016-05-26 04:50 +0200
Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block Rob Herring <robh@kernel.org> - 2016-05-26 15:20 +0200
Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-05-27 05:40 +0200
Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block Rob Herring <robh@kernel.org> - 2016-05-27 06:30 +0200
Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-05-27 09:10 +0200
| From | Zhen Lei <thunder.leizhen@huawei.com> |
|---|---|
| Date | 2016-05-26 04:50 +0200 |
| Subject | [PATCH 1/3] of/numa: remove a duplicated pr_debug information |
| Message-ID | <rCTwZ-wH-3@gated-at.bofh.it> |
This information will be printed in the subfunction numa_add_memblk.
They are not the same, but very similar.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/of/of_numa.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 0f2784b..21d831f 100644
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -88,9 +88,6 @@ static int __init of_numa_parse_memory_nodes(void)
break;
}
- pr_debug("NUMA: base = %llx len = %llx, node = %u\n",
- rsrc.start, rsrc.end - rsrc.start + 1, nid);
-
r = numa_add_memblk(nid, rsrc.start,
rsrc.end - rsrc.start + 1);
if (r)
--
2.5.0
[toc] | [next] | [standalone]
| From | Zhen Lei <thunder.leizhen@huawei.com> |
|---|---|
| Date | 2016-05-26 04:50 +0200 |
| Subject | [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block |
| Message-ID | <rCTx0-wH-9@gated-at.bofh.it> |
| In reply to | #1407358 |
For a normal memory@ devicetree node, its reg property can contains more
memory blocks.
Because we don't known how many memory blocks maybe contained, so we try
from index=0, increase 1 until error returned(the end).
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/of/of_numa.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 21d831f..2c5f249 100644
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -63,7 +63,7 @@ static int __init of_numa_parse_memory_nodes(void)
struct device_node *np = NULL;
struct resource rsrc;
u32 nid;
- int r = 0;
+ int i, r = 0;
for (;;) {
np = of_find_node_by_type(np, "memory");
@@ -82,17 +82,27 @@ static int __init of_numa_parse_memory_nodes(void)
/* some other error */
break;
- r = of_address_to_resource(np, 0, &rsrc);
- if (r) {
- pr_err("NUMA: bad reg property in memory node\n");
- break;
+ for (i = 0; ; i++) {
+ r = of_address_to_resource(np, i, &rsrc);
+ if (r) {
+ /* reached the end of of_address */
+ if (i > 0) {
+ r = 0;
+ break;
+ }
+
+ pr_err("NUMA: bad reg property in memory node\n");
+ goto finished;
+ }
+
+ r = numa_add_memblk(nid, rsrc.start,
+ rsrc.end - rsrc.start + 1);
+ if (r)
+ goto finished;
}
-
- r = numa_add_memblk(nid, rsrc.start,
- rsrc.end - rsrc.start + 1);
- if (r)
- break;
}
+
+finished:
of_node_put(np);
return r;
--
2.5.0
[toc] | [prev] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2016-05-26 15:20 +0200 |
| Subject | Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block |
| Message-ID | <rD3mF-6TC-9@gated-at.bofh.it> |
| In reply to | #1407360 |
On Thu, May 26, 2016 at 10:43:58AM +0800, Zhen Lei wrote:
> For a normal memory@ devicetree node, its reg property can contains more
> memory blocks.
>
> Because we don't known how many memory blocks maybe contained, so we try
> from index=0, increase 1 until error returned(the end).
>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
> drivers/of/of_numa.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
> index 21d831f..2c5f249 100644
> --- a/drivers/of/of_numa.c
> +++ b/drivers/of/of_numa.c
> @@ -63,7 +63,7 @@ static int __init of_numa_parse_memory_nodes(void)
> struct device_node *np = NULL;
> struct resource rsrc;
> u32 nid;
> - int r = 0;
> + int i, r = 0;
>
> for (;;) {
> np = of_find_node_by_type(np, "memory");
> @@ -82,17 +82,27 @@ static int __init of_numa_parse_memory_nodes(void)
> /* some other error */
> break;
>
> - r = of_address_to_resource(np, 0, &rsrc);
> - if (r) {
> - pr_err("NUMA: bad reg property in memory node\n");
> - break;
> + for (i = 0; ; i++) {
> + r = of_address_to_resource(np, i, &rsrc);
> + if (r) {
> + /* reached the end of of_address */
> + if (i > 0) {
> + r = 0;
> + break;
> + }
> +
> + pr_err("NUMA: bad reg property in memory node\n");
> + goto finished;
> + }
> +
> + r = numa_add_memblk(nid, rsrc.start,
> + rsrc.end - rsrc.start + 1);
> + if (r)
> + goto finished;
> }
> -
> - r = numa_add_memblk(nid, rsrc.start,
> - rsrc.end - rsrc.start + 1);
> - if (r)
> - break;
> }
> +
> +finished:
> of_node_put(np);
This function can be simplified down to:
for_each_node_by_type(np, "memory") {
r = of_property_read_u32(np, "numa-node-id", &nid);
if (r == -EINVAL)
/*
* property doesn't exist if -EINVAL, continue
* looking for more memory nodes with
* "numa-node-id" property
*/
continue;
else if (r)
/* some other error */
break;
r = of_address_to_resource(np, 0, &rsrc);
for (i = 0; !r; i++, r = of_address_to_resource(np, i,
&rsrc)) {
r = numa_add_memblk(nid, rsrc.start,
rsrc.end - rsrc.start + 1);
}
}
of_node_put(np);
return r;
Perhaps with a "if (!i && r) pr_err()" for an error message at the end.
Rob
[toc] | [prev] | [next] | [standalone]
| From | "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> |
|---|---|
| Date | 2016-05-27 05:40 +0200 |
| Subject | Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block |
| Message-ID | <rDgMV-6AR-3@gated-at.bofh.it> |
| In reply to | #1407558 |
On 2016/5/26 21:13, Rob Herring wrote:
> On Thu, May 26, 2016 at 10:43:58AM +0800, Zhen Lei wrote:
>> For a normal memory@ devicetree node, its reg property can contains more
>> memory blocks.
>>
>> Because we don't known how many memory blocks maybe contained, so we try
>> from index=0, increase 1 until error returned(the end).
>>
>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
>> ---
>> drivers/of/of_numa.c | 30 ++++++++++++++++++++----------
>> 1 file changed, 20 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
>> index 21d831f..2c5f249 100644
>> --- a/drivers/of/of_numa.c
>> +++ b/drivers/of/of_numa.c
>> @@ -63,7 +63,7 @@ static int __init of_numa_parse_memory_nodes(void)
>> struct device_node *np = NULL;
>> struct resource rsrc;
>> u32 nid;
>> - int r = 0;
>> + int i, r = 0;
>>
>> for (;;) {
>> np = of_find_node_by_type(np, "memory");
>> @@ -82,17 +82,27 @@ static int __init of_numa_parse_memory_nodes(void)
>> /* some other error */
>> break;
>>
>> - r = of_address_to_resource(np, 0, &rsrc);
>> - if (r) {
>> - pr_err("NUMA: bad reg property in memory node\n");
>> - break;
>> + for (i = 0; ; i++) {
>> + r = of_address_to_resource(np, i, &rsrc);
>> + if (r) {
>> + /* reached the end of of_address */
>> + if (i > 0) {
>> + r = 0;
>> + break;
>> + }
>> +
>> + pr_err("NUMA: bad reg property in memory node\n");
>> + goto finished;
>> + }
>> +
>> + r = numa_add_memblk(nid, rsrc.start,
>> + rsrc.end - rsrc.start + 1);
>> + if (r)
>> + goto finished;
>> }
>> -
>> - r = numa_add_memblk(nid, rsrc.start,
>> - rsrc.end - rsrc.start + 1);
>> - if (r)
>> - break;
>> }
>> +
>> +finished:
>> of_node_put(np);
>
> This function can be simplified down to:
>
> for_each_node_by_type(np, "memory") {
OK, That's good.
> r = of_property_read_u32(np, "numa-node-id", &nid);
> if (r == -EINVAL)
> /*
> * property doesn't exist if -EINVAL, continue
> * looking for more memory nodes with
> * "numa-node-id" property
> */
> continue;
Hi, everybody:
If some "memory" node contains "numa-node-id", but some others missed. Can we simply ignored it?
I think we should break out too, and faking to only have node0.
> else if (r)
> /* some other error */
> break;
>
> r = of_address_to_resource(np, 0, &rsrc);
> for (i = 0; !r; i++, r = of_address_to_resource(np, i,
But r(non-zero) is just break this loop, the original is break the outer for (;;) loop
How about as below?
for_each_node_by_type(np, "memory") {
... ...
for (i = 0; !of_address_to_resource(np, i, &rsrc); i++) {
r = numa_add_memblk(nid, rsrc.start,
rsrc.end - rsrc.start + 1);
if (r)
goto finished;
}
if (!i)
pr_err("NUMA: bad reg property in memory node\n");
}
finished:
> &rsrc)) {
> r = numa_add_memblk(nid, rsrc.start,
> rsrc.end - rsrc.start + 1);
> }
> }
> of_node_put(np);
>
> return r;
>
>
> Perhaps with a "if (!i && r) pr_err()" for an error message at the end.
>
> Rob
>
> .
>
[toc] | [prev] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2016-05-27 06:30 +0200 |
| Subject | Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block |
| Message-ID | <rDhzj-7b0-5@gated-at.bofh.it> |
| In reply to | #1407792 |
On Thu, May 26, 2016 at 10:36 PM, Leizhen (ThunderTown)
<thunder.leizhen@huawei.com> wrote:
>
>
> On 2016/5/26 21:13, Rob Herring wrote:
>> On Thu, May 26, 2016 at 10:43:58AM +0800, Zhen Lei wrote:
>>> For a normal memory@ devicetree node, its reg property can contains more
>>> memory blocks.
>>>
>>> Because we don't known how many memory blocks maybe contained, so we try
>>> from index=0, increase 1 until error returned(the end).
>>>
>>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
>>> ---
>>> drivers/of/of_numa.c | 30 ++++++++++++++++++++----------
>>> 1 file changed, 20 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
>>> index 21d831f..2c5f249 100644
>>> --- a/drivers/of/of_numa.c
>>> +++ b/drivers/of/of_numa.c
>>> @@ -63,7 +63,7 @@ static int __init of_numa_parse_memory_nodes(void)
>>> struct device_node *np = NULL;
>>> struct resource rsrc;
>>> u32 nid;
>>> - int r = 0;
>>> + int i, r = 0;
>>>
>>> for (;;) {
>>> np = of_find_node_by_type(np, "memory");
>>> @@ -82,17 +82,27 @@ static int __init of_numa_parse_memory_nodes(void)
>>> /* some other error */
>>> break;
>>>
>>> - r = of_address_to_resource(np, 0, &rsrc);
>>> - if (r) {
>>> - pr_err("NUMA: bad reg property in memory node\n");
>>> - break;
>>> + for (i = 0; ; i++) {
>>> + r = of_address_to_resource(np, i, &rsrc);
>>> + if (r) {
>>> + /* reached the end of of_address */
>>> + if (i > 0) {
>>> + r = 0;
>>> + break;
>>> + }
>>> +
>>> + pr_err("NUMA: bad reg property in memory node\n");
>>> + goto finished;
>>> + }
>>> +
>>> + r = numa_add_memblk(nid, rsrc.start,
>>> + rsrc.end - rsrc.start + 1);
>>> + if (r)
>>> + goto finished;
>>> }
>>> -
>>> - r = numa_add_memblk(nid, rsrc.start,
>>> - rsrc.end - rsrc.start + 1);
>>> - if (r)
>>> - break;
>>> }
>>> +
>>> +finished:
>>> of_node_put(np);
>>
>> This function can be simplified down to:
>>
>> for_each_node_by_type(np, "memory") {
> OK, That's good.
>
>> r = of_property_read_u32(np, "numa-node-id", &nid);
>> if (r == -EINVAL)
>> /*
>> * property doesn't exist if -EINVAL, continue
>> * looking for more memory nodes with
>> * "numa-node-id" property
>> */
>> continue;
> Hi, everybody:
> If some "memory" node contains "numa-node-id", but some others missed. Can we simply ignored it?
> I think we should break out too, and faking to only have node0.
Continuing to work is probably better than not.
>
>> else if (r)
>> /* some other error */
>> break;
>>
>> r = of_address_to_resource(np, 0, &rsrc);
>> for (i = 0; !r; i++, r = of_address_to_resource(np, i,
>
> But r(non-zero) is just break this loop, the original is break the outer for (;;) loop
It is not really the kernel's job to validate the DT. If there's
random things in it then kernel's behavior is undefined.
>
> How about as below?
>
> for_each_node_by_type(np, "memory") {
> ... ...
>
> for (i = 0; !of_address_to_resource(np, i, &rsrc); i++) {
> r = numa_add_memblk(nid, rsrc.start,
> rsrc.end - rsrc.start + 1);
> if (r)
> goto finished;
> }
>
> if (!i)
> pr_err("NUMA: bad reg property in memory node\n");
> }
>
> finished:
Please try to avoid the goto. You can check r in the outer loop too.
Rob
[toc] | [prev] | [next] | [standalone]
| From | "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> |
|---|---|
| Date | 2016-05-27 09:10 +0200 |
| Subject | Re: [PATCH 2/3] of/numa: fix a memory@ dt node can only contains one memory block |
| Message-ID | <rDk49-kZ-1@gated-at.bofh.it> |
| In reply to | #1407805 |
On 2016/5/27 12:20, Rob Herring wrote:
> On Thu, May 26, 2016 at 10:36 PM, Leizhen (ThunderTown)
> <thunder.leizhen@huawei.com> wrote:
>>
>>
>> On 2016/5/26 21:13, Rob Herring wrote:
>>> On Thu, May 26, 2016 at 10:43:58AM +0800, Zhen Lei wrote:
>>>> For a normal memory@ devicetree node, its reg property can contains more
>>>> memory blocks.
>>>>
>>>> Because we don't known how many memory blocks maybe contained, so we try
>>>> from index=0, increase 1 until error returned(the end).
>>>>
>>>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
>>>> ---
>>>> drivers/of/of_numa.c | 30 ++++++++++++++++++++----------
>>>> 1 file changed, 20 insertions(+), 10 deletions(-)
>>>>
>>>> diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
>>>> index 21d831f..2c5f249 100644
>>>> --- a/drivers/of/of_numa.c
>>>> +++ b/drivers/of/of_numa.c
>>>> @@ -63,7 +63,7 @@ static int __init of_numa_parse_memory_nodes(void)
>>>> struct device_node *np = NULL;
>>>> struct resource rsrc;
>>>> u32 nid;
>>>> - int r = 0;
>>>> + int i, r = 0;
>>>>
>>>> for (;;) {
>>>> np = of_find_node_by_type(np, "memory");
>>>> @@ -82,17 +82,27 @@ static int __init of_numa_parse_memory_nodes(void)
>>>> /* some other error */
>>>> break;
>>>>
>>>> - r = of_address_to_resource(np, 0, &rsrc);
>>>> - if (r) {
>>>> - pr_err("NUMA: bad reg property in memory node\n");
>>>> - break;
>>>> + for (i = 0; ; i++) {
>>>> + r = of_address_to_resource(np, i, &rsrc);
>>>> + if (r) {
>>>> + /* reached the end of of_address */
>>>> + if (i > 0) {
>>>> + r = 0;
>>>> + break;
>>>> + }
>>>> +
>>>> + pr_err("NUMA: bad reg property in memory node\n");
>>>> + goto finished;
>>>> + }
>>>> +
>>>> + r = numa_add_memblk(nid, rsrc.start,
>>>> + rsrc.end - rsrc.start + 1);
>>>> + if (r)
>>>> + goto finished;
>>>> }
>>>> -
>>>> - r = numa_add_memblk(nid, rsrc.start,
>>>> - rsrc.end - rsrc.start + 1);
>>>> - if (r)
>>>> - break;
>>>> }
>>>> +
>>>> +finished:
>>>> of_node_put(np);
>>>
>>> This function can be simplified down to:
>>>
>>> for_each_node_by_type(np, "memory") {
>> OK, That's good.
>>
>>> r = of_property_read_u32(np, "numa-node-id", &nid);
>>> if (r == -EINVAL)
>>> /*
>>> * property doesn't exist if -EINVAL, continue
>>> * looking for more memory nodes with
>>> * "numa-node-id" property
>>> */
>>> continue;
>> Hi, everybody:
>> If some "memory" node contains "numa-node-id", but some others missed. Can we simply ignored it?
>> I think we should break out too, and faking to only have node0.
>
> Continuing to work is probably better than not.
>
>>
>>> else if (r)
>>> /* some other error */
>>> break;
>>>
>>> r = of_address_to_resource(np, 0, &rsrc);
>>> for (i = 0; !r; i++, r = of_address_to_resource(np, i,
>>
>> But r(non-zero) is just break this loop, the original is break the outer for (;;) loop
>
> It is not really the kernel's job to validate the DT. If there's
> random things in it then kernel's behavior is undefined.
>
>>
>> How about as below?
>>
>> for_each_node_by_type(np, "memory") {
>> ... ...
>>
>> for (i = 0; !of_address_to_resource(np, i, &rsrc); i++) {
>> r = numa_add_memblk(nid, rsrc.start,
>> rsrc.end - rsrc.start + 1);
>> if (r)
>> goto finished;
>> }
>>
>> if (!i)
>> pr_err("NUMA: bad reg property in memory node\n");
>> }
>>
>> finished:
>
> Please try to avoid the goto. You can check r in the outer loop too.
OK. I have rewritten this function according to your advice.
for_each_node_by_type(np, "memory") {
r = of_property_read_u32(np, "numa-node-id", &nid);
if (r == -EINVAL)
/*
* property doesn't exist if -EINVAL, continue
* looking for more memory nodes with
* "numa-node-id" property
*/
continue;
//I deleted the break of "some other error", and it will break in below "if (!i || r)" branch
for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++)
r = numa_add_memblk(nid, rsrc.start,
rsrc.end - rsrc.start + 1);
if (!i || r) {
of_node_put(np); //I moved here, so that it looks more clear. Because in the normal use of for_each_node_by_type, of_node_put is not required
pr_err("NUMA: bad property in memory node\n"); //Deleted "reg", so that it's suitable or harmless for other error cases
break;
}
}
return r;
>
> Rob
>
> .
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web