From: "Jan Beulich" <JBeulich@novell.com>
To: Keir Fraser <keir.fraser@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [PATCH] Re: Re: [PATCH] to fix ACPI slit table access at runtime
Date: Thu, 25 Feb 2010 13:35:45 +0000 [thread overview]
Message-ID: <4B868AC102000078000314BB@vpn.id2.novell.com> (raw)
In-Reply-To: <C7AC28BA.B5D0%keir.fraser@eu.citrix.com>
[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]
>>> Keir Fraser <keir.fraser@eu.citrix.com> 25.02.10 14:16 >>>
>Given we agree the current situation is a bug, could you make up a patch
>along the lines of what you prefer to see? Because my default action will be
>simply to ifdef the code, as NUMA-on-i386 is not much a concern of mine.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- 2010-02-19.orig/xen/arch/x86/numa.c 2010-01-13 18:58:11.000000000 +0100
+++ 2010-02-19/xen/arch/x86/numa.c 2010-02-25 14:27:14.000000000 +0100
@@ -30,7 +30,7 @@ struct node_data node_data[MAX_NUMNODES]
/* Mapping from pdx to node id */
int memnode_shift;
-static typeof(*memnodemap) _memnodemap[2];
+static typeof(*memnodemap) _memnodemap[64];
unsigned long memnodemapsize;
u8 *memnodemap;
@@ -90,6 +90,7 @@ static int __init populate_memnodemap(co
static int __init allocate_cachealigned_memnodemap(void)
{
+#ifndef __i386__
unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap));
unsigned long mfn = alloc_boot_pages(size, 1);
@@ -108,6 +109,13 @@ static int __init allocate_cachealigned_
memnodemapsize = size / sizeof(*memnodemap);
return 0;
+#else
+ printk(KERN_ERR
+ "Memory to Node hash needs %lu entries, got only %zu\n",
+ memnodemapsize, ARRAY_SIZE(_memnodemap));
+ memnodemapsize = 0;
+ return -1;
+#endif
}
/*
[-- Attachment #2: i386-numa-not-boot-alloc.patch --]
[-- Type: text/plain, Size: 1064 bytes --]
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- 2010-02-19.orig/xen/arch/x86/numa.c 2010-01-13 18:58:11.000000000 +0100
+++ 2010-02-19/xen/arch/x86/numa.c 2010-02-25 14:27:14.000000000 +0100
@@ -30,7 +30,7 @@ struct node_data node_data[MAX_NUMNODES]
/* Mapping from pdx to node id */
int memnode_shift;
-static typeof(*memnodemap) _memnodemap[2];
+static typeof(*memnodemap) _memnodemap[64];
unsigned long memnodemapsize;
u8 *memnodemap;
@@ -90,6 +90,7 @@ static int __init populate_memnodemap(co
static int __init allocate_cachealigned_memnodemap(void)
{
+#ifndef __i386__
unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap));
unsigned long mfn = alloc_boot_pages(size, 1);
@@ -108,6 +109,13 @@ static int __init allocate_cachealigned_
memnodemapsize = size / sizeof(*memnodemap);
return 0;
+#else
+ printk(KERN_ERR
+ "Memory to Node hash needs %lu entries, got only %zu\n",
+ memnodemapsize, ARRAY_SIZE(_memnodemap));
+ memnodemapsize = 0;
+ return -1;
+#endif
}
/*
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
next prev parent reply other threads:[~2010-02-25 13:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-25 0:06 [PATCH] to fix ACPI slit table access at runtime Kamble, Nitin A
2010-02-25 12:13 ` Keir Fraser
2010-02-25 13:03 ` Jan Beulich
2010-02-25 13:16 ` Keir Fraser
2010-02-25 13:35 ` Jan Beulich [this message]
2010-02-25 17:50 ` Kamble, Nitin A
2010-02-25 18:01 ` Keir Fraser
2010-02-25 18:47 ` Kamble, Nitin A
2010-02-25 21:53 ` Warning in current pv_ops Kernel Carsten Schiers
2010-02-25 21:57 ` Pasi Kärkkäinen
2010-02-25 19:31 ` [PATCH] to fix ACPI slit table access at runtime Kamble, Nitin A
2010-02-26 8:36 ` Jan Beulich
2010-02-26 18:37 ` Kamble, Nitin A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B868AC102000078000314BB@vpn.id2.novell.com \
--to=jbeulich@novell.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=keir.fraser@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).