If we fall into that branch it means that there is a range fully covering the
subtract range, so it's suffice to return there if there isn't any other
overlapping ranges.
Also fix the broken phrase issued by printk.
Cc: Yinghai Lu <[email protected]>
Signed-off-by: Lin Feng <[email protected]>
---
kernel/range.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/range.c b/kernel/range.c
index 9b8ae2d..223c6fe 100644
--- a/kernel/range.c
+++ b/kernel/range.c
@@ -97,10 +97,10 @@ void subtract_range(struct range *range, int az, u64 start, u64 end)
range[i].end = range[j].end;
range[i].start = end;
} else {
- printk(KERN_ERR "run of slot in ranges\n");
+ printk(KERN_ERR "run out of slot in ranges\n");
}
range[j].end = start;
- continue;
+ return;
}
}
}
--
1.8.0.1
On Mon, Mar 18, 2013 at 3:21 AM, Lin Feng <[email protected]> wrote:
> If we fall into that branch it means that there is a range fully covering the
> subtract range, so it's suffice to return there if there isn't any other
> overlapping ranges.
>
> Also fix the broken phrase issued by printk.
>
> Cc: Yinghai Lu <[email protected]>
> Signed-off-by: Lin Feng <[email protected]>
> ---
> kernel/range.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/range.c b/kernel/range.c
> index 9b8ae2d..223c6fe 100644
> --- a/kernel/range.c
> +++ b/kernel/range.c
> @@ -97,10 +97,10 @@ void subtract_range(struct range *range, int az, u64 start, u64 end)
> range[i].end = range[j].end;
> range[i].start = end;
> } else {
> - printk(KERN_ERR "run of slot in ranges\n");
> + printk(KERN_ERR "run out of slot in ranges\n");
maybe could change to pr_err at the same time.
> }
> range[j].end = start;
> - continue;
> + return;
We don't say that ranges can not be overlapped in the array.
Thanks
Yinghai
Also replace deprecated printk(KERN_ERR...) with pr_err() as suggested
by Yinghai, attaching the function name to provide plenty info.
Cc: Yinghai Lu <[email protected]>
Signed-off-by: Lin Feng <[email protected]>
---
kernel/range.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/range.c b/kernel/range.c
index 9b8ae2d..071b0ab 100644
--- a/kernel/range.c
+++ b/kernel/range.c
@@ -97,7 +97,8 @@ void subtract_range(struct range *range, int az, u64 start, u64 end)
range[i].end = range[j].end;
range[i].start = end;
} else {
- printk(KERN_ERR "run of slot in ranges\n");
+ pr_err("%s: run out of slot in ranges\n",
+ __func__);
}
range[j].end = start;
continue;
--
1.8.0.1
On Mon, Mar 18, 2013 at 9:54 PM, Lin Feng <[email protected]> wrote:
> Also replace deprecated printk(KERN_ERR...) with pr_err() as suggested
> by Yinghai, attaching the function name to provide plenty info.
>
> Cc: Yinghai Lu <[email protected]>
> Signed-off-by: Lin Feng <[email protected]>
> ---
> kernel/range.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/range.c b/kernel/range.c
> index 9b8ae2d..071b0ab 100644
> --- a/kernel/range.c
> +++ b/kernel/range.c
> @@ -97,7 +97,8 @@ void subtract_range(struct range *range, int az, u64 start, u64 end)
> range[i].end = range[j].end;
> range[i].start = end;
> } else {
> - printk(KERN_ERR "run of slot in ranges\n");
> + pr_err("%s: run out of slot in ranges\n",
> + __func__);
> }
> range[j].end = start;
> continue;
So now the user might see:
subtract_range: run out of slot in ranges
What is the user supposed to do when he sees that? If he happens to
mention it on LKML, what are we going to do about it? If he attaches
the complete dmesg log, is there enough information to do something?
IMHO, that message is still totally useless.
On Wed, Mar 27, 2013 at 10:27 AM, Bjorn Helgaas <[email protected]> wrote:
> So now the user might see:
>
> subtract_range: run out of slot in ranges
>
> What is the user supposed to do when he sees that? If he happens to
> mention it on LKML, what are we going to do about it? If he attaches
> the complete dmesg log, is there enough information to do something?
>
> IMHO, that message is still totally useless.
Change to WARN_ONCE?
Yinghai
Hi Bjorn and others,
On 03/28/2013 01:27 AM, Bjorn Helgaas wrote:
>> - printk(KERN_ERR "run of slot in ranges\n");
>> > + pr_err("%s: run out of slot in ranges\n",
>> > + __func__);
>> > }
>> > range[j].end = start;
>> > continue;
> So now the user might see:
>
> subtract_range: run out of slot in ranges
>
> What is the user supposed to do when he sees that? If he happens to
> mention it on LKML, what are we going to do about it? If he attaches
> the complete dmesg log, is there enough information to do something?
>
> IMHO, that message is still totally useless.
>
Yes, we need to issue some useful message.
How about dump_stack() there so that we can find some clues more since
subtract_range() is called mtrr_bp_init path and pci relative path, then
it may help to instruct us to do something ;-) ?
thanks,
linfeng