lkml.org 
[lkml]   [2008]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.26-rc2-mm1
On Wed, 14 May 2008 21:12:13 +0200
"Torsten Kaiser" <just.for.lkml@googlemail.com> wrote:

> On Wed, May 14, 2008 at 10:01 AM, Andrew Morton
> <akpm@linux-foundation.org> wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.26-rc2/2.6.26-rc2-mm1/
>
> Nice! This one works for me again.

Thanks.

> But somehow the NUMAness of my system is gone.
>
> ...
>
>
> The system is a dual socket Opteron system, each processor has 2 GB of RAM.
>
> I will try to debug this more tomorrow, but except the kernel now
> thinks there is only one NUMA node the system works correct. It is
> detecting the full 4GB of RAM.
>
> This line from 2.6.26-rc2-mm1 really looks like the source of this:
> [ 0.000000] SRAT: PXMs only cover 0MB of your 4608MB e820 RAM. Not used.
> There is no more than 4GB of RAM (but part of it is remapped...)

I suspect that this might be caused by the below.

That patch no longer seems to be necessary so I'll drop it. Perhaps
you could try reverting it, please?



From: Ingo Molnar <mingo@elte.hu>

x86.git testing found the following build error on latest -git:

drivers/acpi/numa.c: In function 'acpi_numa_init':
drivers/acpi/numa.c:226: error: 'NR_NODE_MEMBLKS' undeclared (first use in this function)
drivers/acpi/numa.c:226: error: (Each undeclared identifier is reported only once
drivers/acpi/numa.c:226: error: for each function it appears in.)

with this config:

http://redhat.com/~mingo/misc/config-Wed_Apr_30_22_42_42_CEST_2008.bad

i suspect we dont want SRAT parsing when CONFIG_HAVE_ARCH_PARSE_SRAT
is unset - but the fix looks a bit ugly. Perhaps we should define
NR_NODE_MEMBLKS even in this case and just let the code fall back
to some sane behavior?

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/acpi/numa.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN drivers/acpi/numa.c~acpi-acpi_numa_init-build-fix drivers/acpi/numa.c
--- a/drivers/acpi/numa.c~acpi-acpi_numa_init-build-fix
+++ a/drivers/acpi/numa.c
@@ -176,6 +176,7 @@ acpi_parse_processor_affinity(struct acp
return 0;
}

+#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
static int __init
acpi_parse_memory_affinity(struct acpi_subtable_header * header,
const unsigned long end)
@@ -193,6 +194,7 @@ acpi_parse_memory_affinity(struct acpi_s

return 0;
}
+#endif

static int __init acpi_parse_srat(struct acpi_table_header *table)
{
@@ -221,9 +223,11 @@ int __init acpi_numa_init(void)
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
acpi_parse_processor_affinity, NR_CPUS);
+#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
acpi_parse_memory_affinity,
NR_NODE_MEMBLKS);
+#endif
}

/* SLIT: System Locality Information Table */
_


\
 
 \ /
  Last update: 2008-05-14 21:39    [from the cache]
©2003-2011 Jasper Spaans