* [PATCH] x86: set_highmem_pages_init() cleanup
@ 2009-03-03 12:10 Pekka Enberg
2009-03-03 12:15 ` Ingo Molnar
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Pekka Enberg @ 2009-03-03 12:10 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, x86
From: Pekka Enberg <penberg@cs.helsinki.fi>
Impact: cleanup
This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c. The
declaration of the function is kept in asm/numa_32.h because asm/highmem.h is
included only CONFIG_HIGHMEM is enabled so we can't put the empty static inline
function there.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
arch/x86/include/asm/numa_32.h | 6 +++++-
arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++
arch/x86/mm/init_32.c | 12 ------------
arch/x86/mm/numa_32.c | 26 --------------------------
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
index e9f5db7..a372290 100644
--- a/arch/x86/include/asm/numa_32.h
+++ b/arch/x86/include/asm/numa_32.h
@@ -4,8 +4,12 @@
extern int pxm_to_nid(int pxm);
extern void numa_remove_cpu(int cpu);
-#ifdef CONFIG_NUMA
+#ifdef CONFIG_HIGHMEM
extern void set_highmem_pages_init(void);
+#else
+static inline void set_highmem_pages_init(void)
+{
+}
#endif
#endif /* _ASM_X86_NUMA_32_H */
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index bcc079c..13a823c 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -1,5 +1,6 @@
#include <linux/highmem.h>
#include <linux/module.h>
+#include <linux/swap.h> /* for totalram_pages */
void *kmap(struct page *page)
{
@@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap);
EXPORT_SYMBOL(kunmap);
EXPORT_SYMBOL(kmap_atomic);
EXPORT_SYMBOL(kunmap_atomic);
+
+#ifdef CONFIG_NUMA
+void __init set_highmem_pages_init(void)
+{
+ struct zone *zone;
+ int nid;
+
+ for_each_zone(zone) {
+ unsigned long zone_start_pfn, zone_end_pfn;
+
+ if (!is_highmem(zone))
+ continue;
+
+ zone_start_pfn = zone->zone_start_pfn;
+ zone_end_pfn = zone_start_pfn + zone->spanned_pages;
+
+ nid = zone_to_nid(zone);
+ printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
+ zone->name, nid, zone_start_pfn, zone_end_pfn);
+
+ add_highpages_with_active_regions(nid, zone_start_pfn,
+ zone_end_pfn);
+ }
+ totalram_pages += totalhigh_pages;
+}
+#else
+static void __init set_highmem_pages_init(void)
+{
+ add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
+
+ totalram_pages += totalhigh_pages;
+}
+#endif /* CONFIG_NUMA */
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 6fbf39f..11b827d 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -468,22 +468,10 @@ void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
work_with_active_regions(nid, add_highpages_work_fn, &data);
}
-#ifndef CONFIG_NUMA
-static void __init set_highmem_pages_init(void)
-{
- add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
-
- totalram_pages += totalhigh_pages;
-}
-#endif /* !CONFIG_NUMA */
-
#else
static inline void permanent_kmaps_init(pgd_t *pgd_base)
{
}
-static inline void set_highmem_pages_init(void)
-{
-}
#endif /* CONFIG_HIGHMEM */
void __init native_pagetable_setup_start(pgd_t *base)
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index d1f7439..a04092a 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -423,32 +423,6 @@ void __init initmem_init(unsigned long start_pfn,
setup_bootmem_allocator();
}
-void __init set_highmem_pages_init(void)
-{
-#ifdef CONFIG_HIGHMEM
- struct zone *zone;
- int nid;
-
- for_each_zone(zone) {
- unsigned long zone_start_pfn, zone_end_pfn;
-
- if (!is_highmem(zone))
- continue;
-
- zone_start_pfn = zone->zone_start_pfn;
- zone_end_pfn = zone_start_pfn + zone->spanned_pages;
-
- nid = zone_to_nid(zone);
- printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
- zone->name, nid, zone_start_pfn, zone_end_pfn);
-
- add_highpages_with_active_regions(nid, zone_start_pfn,
- zone_end_pfn);
- }
- totalram_pages += totalhigh_pages;
-#endif
-}
-
#ifdef CONFIG_MEMORY_HOTPLUG
static int paddr_to_nid(u64 addr)
{
--
1.5.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] x86: set_highmem_pages_init() cleanup
2009-03-03 12:10 [PATCH] x86: set_highmem_pages_init() cleanup Pekka Enberg
@ 2009-03-03 12:15 ` Ingo Molnar
2009-03-04 8:16 ` Pekka Enberg
2009-03-03 12:15 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup Pekka Enberg
2009-03-03 14:36 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y Ingo Molnar
2 siblings, 1 reply; 9+ messages in thread
From: Ingo Molnar @ 2009-03-03 12:15 UTC (permalink / raw)
To: Pekka Enberg; +Cc: linux-kernel, x86
* Pekka Enberg <penberg@cs.helsinki.fi> wrote:
> From: Pekka Enberg <penberg@cs.helsinki.fi>
>
> Impact: cleanup
>
> This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c. The
> declaration of the function is kept in asm/numa_32.h because asm/highmem.h is
> included only CONFIG_HIGHMEM is enabled so we can't put the empty static inline
> function there.
>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> ---
> arch/x86/include/asm/numa_32.h | 6 +++++-
> arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++
> arch/x86/mm/init_32.c | 12 ------------
> arch/x86/mm/numa_32.c | 26 --------------------------
> 4 files changed, 39 insertions(+), 39 deletions(-)
Applied, thanks!
One question:
> diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
> index e9f5db7..a372290 100644
> --- a/arch/x86/include/asm/numa_32.h
> +++ b/arch/x86/include/asm/numa_32.h
> @@ -4,8 +4,12 @@
> extern int pxm_to_nid(int pxm);
> extern void numa_remove_cpu(int cpu);
>
> -#ifdef CONFIG_NUMA
> +#ifdef CONFIG_HIGHMEM
> extern void set_highmem_pages_init(void);
> +#else
> +static inline void set_highmem_pages_init(void)
> +{
> +}
> #endif
>
> #endif /* _ASM_X86_NUMA_32_H */
> diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
> index bcc079c..13a823c 100644
> --- a/arch/x86/mm/highmem_32.c
> +++ b/arch/x86/mm/highmem_32.c
> @@ -1,5 +1,6 @@
> #include <linux/highmem.h>
> #include <linux/module.h>
> +#include <linux/swap.h> /* for totalram_pages */
>
> void *kmap(struct page *page)
> {
> @@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap);
> EXPORT_SYMBOL(kunmap);
> EXPORT_SYMBOL(kmap_atomic);
> EXPORT_SYMBOL(kunmap_atomic);
> +
> +#ifdef CONFIG_NUMA
> +void __init set_highmem_pages_init(void)
> +{
> + struct zone *zone;
> + int nid;
> +
> + for_each_zone(zone) {
> + unsigned long zone_start_pfn, zone_end_pfn;
> +
> + if (!is_highmem(zone))
> + continue;
> +
> + zone_start_pfn = zone->zone_start_pfn;
> + zone_end_pfn = zone_start_pfn + zone->spanned_pages;
> +
> + nid = zone_to_nid(zone);
> + printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
> + zone->name, nid, zone_start_pfn, zone_end_pfn);
> +
> + add_highpages_with_active_regions(nid, zone_start_pfn,
> + zone_end_pfn);
> + }
> + totalram_pages += totalhigh_pages;
> +}
> +#else
> +static void __init set_highmem_pages_init(void)
> +{
> + add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
> +
> + totalram_pages += totalhigh_pages;
> +}
> +#endif /* CONFIG_NUMA */
Couldnt we just wrap the !NUMA case into the NUMA case and just
have the NUMA function present, by making for_each_zone() a
two-entries matter and making the second entry contain:
zone->zone_start_pfn := highstart_pfn
zone->spanned_pages := highend_pfn-highstart_pfn
?
Ingo
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] x86: set_highmem_pages_init() cleanup
2009-03-03 12:15 ` Ingo Molnar
@ 2009-03-04 8:16 ` Pekka Enberg
2009-03-04 17:59 ` Ingo Molnar
2009-03-04 19:21 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, #2 Pekka Enberg
0 siblings, 2 replies; 9+ messages in thread
From: Pekka Enberg @ 2009-03-04 8:16 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-kernel, x86, Mel Gorman
On Tue, 2009-03-03 at 13:15 +0100, Ingo Molnar wrote:
> * Pekka Enberg <penberg@cs.helsinki.fi> wrote:
>
> > From: Pekka Enberg <penberg@cs.helsinki.fi>
> >
> > Impact: cleanup
> >
> > This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c. The
> > declaration of the function is kept in asm/numa_32.h because asm/highmem.h is
> > included only CONFIG_HIGHMEM is enabled so we can't put the empty static inline
> > function there.
> >
> > Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> > ---
> > arch/x86/include/asm/numa_32.h | 6 +++++-
> > arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++
> > arch/x86/mm/init_32.c | 12 ------------
> > arch/x86/mm/numa_32.c | 26 --------------------------
> > 4 files changed, 39 insertions(+), 39 deletions(-)
>
> Applied, thanks!
>
> One question:
>
> > diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
> > index e9f5db7..a372290 100644
> > --- a/arch/x86/include/asm/numa_32.h
> > +++ b/arch/x86/include/asm/numa_32.h
> > @@ -4,8 +4,12 @@
> > extern int pxm_to_nid(int pxm);
> > extern void numa_remove_cpu(int cpu);
> >
> > -#ifdef CONFIG_NUMA
> > +#ifdef CONFIG_HIGHMEM
> > extern void set_highmem_pages_init(void);
> > +#else
> > +static inline void set_highmem_pages_init(void)
> > +{
> > +}
> > #endif
> >
> > #endif /* _ASM_X86_NUMA_32_H */
> > diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
> > index bcc079c..13a823c 100644
> > --- a/arch/x86/mm/highmem_32.c
> > +++ b/arch/x86/mm/highmem_32.c
> > @@ -1,5 +1,6 @@
> > #include <linux/highmem.h>
> > #include <linux/module.h>
> > +#include <linux/swap.h> /* for totalram_pages */
> >
> > void *kmap(struct page *page)
> > {
> > @@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap);
> > EXPORT_SYMBOL(kunmap);
> > EXPORT_SYMBOL(kmap_atomic);
> > EXPORT_SYMBOL(kunmap_atomic);
> > +
> > +#ifdef CONFIG_NUMA
> > +void __init set_highmem_pages_init(void)
> > +{
> > + struct zone *zone;
> > + int nid;
> > +
> > + for_each_zone(zone) {
> > + unsigned long zone_start_pfn, zone_end_pfn;
> > +
> > + if (!is_highmem(zone))
> > + continue;
> > +
> > + zone_start_pfn = zone->zone_start_pfn;
> > + zone_end_pfn = zone_start_pfn + zone->spanned_pages;
> > +
> > + nid = zone_to_nid(zone);
> > + printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
> > + zone->name, nid, zone_start_pfn, zone_end_pfn);
> > +
> > + add_highpages_with_active_regions(nid, zone_start_pfn,
> > + zone_end_pfn);
> > + }
> > + totalram_pages += totalhigh_pages;
> > +}
> > +#else
> > +static void __init set_highmem_pages_init(void)
> > +{
> > + add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
> > +
> > + totalram_pages += totalhigh_pages;
> > +}
> > +#endif /* CONFIG_NUMA */
>
> Couldnt we just wrap the !NUMA case into the NUMA case and just
> have the NUMA function present, by making for_each_zone() a
> two-entries matter and making the second entry contain:
>
> zone->zone_start_pfn := highstart_pfn
> zone->spanned_pages := highend_pfn-highstart_pfn
OK, I don't quite understand your suggestion here. The zones are set up
completely at this stage so AFAICT, even for the UMA case, there should
be a highmem zone there. So unless I am missing something here, I think
we can get away with something as simple as the following.
I don't have any highmem machines to test this but some printk()'s seem
to confirm this (although for machines that don't have any highmem
available, ->zone_start_pfn is zero (whereas highstart_pfn is non-zero).
I think that's because of the !size test in free_area_init_core() but
AFAICT, it's fine as add_highpages_with_active_regions() takes care of
that nicely.
But I'll cc Mel just in case... :-)
Pekka
>From 29c85778896d263ce5c59c496c13548488b7593c Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 4 Mar 2009 10:10:53 +0200
Subject: [PATCH] x86: unify uma and numa copies of set_highmem_pages_init()
Impact: cleanup
The zones are set up at this stage so there's a highmem zone available even for
the UMA case. The only difference there is that for machines that have
CONFIG_HIGHMEM enabled but don't have any highmem available, ->zone_start_pfn
is zero whereas highstart_pfn is non-zero). The field is left zeroed because of
the !size test in free_area_init_core() but shouldn't be a problem because
add_highpages_with_active_regions() handles empty ranges just fine.
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
arch/x86/mm/highmem_32.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 00f127c..d117453 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -158,7 +158,6 @@ EXPORT_SYMBOL(kunmap);
EXPORT_SYMBOL(kmap_atomic);
EXPORT_SYMBOL(kunmap_atomic);
-#ifdef CONFIG_NUMA
void __init set_highmem_pages_init(void)
{
struct zone *zone;
@@ -182,11 +181,3 @@ void __init set_highmem_pages_init(void)
}
totalram_pages += totalhigh_pages;
}
-#else
-void __init set_highmem_pages_init(void)
-{
- add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
-
- totalram_pages += totalhigh_pages;
-}
-#endif /* CONFIG_NUMA */
--
1.5.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] x86: set_highmem_pages_init() cleanup
2009-03-04 8:16 ` Pekka Enberg
@ 2009-03-04 17:59 ` Ingo Molnar
2009-03-04 18:01 ` Ingo Molnar
2009-03-04 19:21 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, #2 Pekka Enberg
1 sibling, 1 reply; 9+ messages in thread
From: Ingo Molnar @ 2009-03-04 17:59 UTC (permalink / raw)
To: Pekka Enberg; +Cc: linux-kernel, x86, Mel Gorman
* Pekka Enberg <penberg@cs.helsinki.fi> wrote:
> On Tue, 2009-03-03 at 13:15 +0100, Ingo Molnar wrote:
> > * Pekka Enberg <penberg@cs.helsinki.fi> wrote:
> >
> > > From: Pekka Enberg <penberg@cs.helsinki.fi>
> > >
> > > Impact: cleanup
> > >
> > > This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c. The
> > > declaration of the function is kept in asm/numa_32.h because asm/highmem.h is
> > > included only CONFIG_HIGHMEM is enabled so we can't put the empty static inline
> > > function there.
> > >
> > > Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> > > ---
> > > arch/x86/include/asm/numa_32.h | 6 +++++-
> > > arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++
> > > arch/x86/mm/init_32.c | 12 ------------
> > > arch/x86/mm/numa_32.c | 26 --------------------------
> > > 4 files changed, 39 insertions(+), 39 deletions(-)
> >
> > Applied, thanks!
> >
> > One question:
> >
> > > diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
> > > index e9f5db7..a372290 100644
> > > --- a/arch/x86/include/asm/numa_32.h
> > > +++ b/arch/x86/include/asm/numa_32.h
> > > @@ -4,8 +4,12 @@
> > > extern int pxm_to_nid(int pxm);
> > > extern void numa_remove_cpu(int cpu);
> > >
> > > -#ifdef CONFIG_NUMA
> > > +#ifdef CONFIG_HIGHMEM
> > > extern void set_highmem_pages_init(void);
> > > +#else
> > > +static inline void set_highmem_pages_init(void)
> > > +{
> > > +}
> > > #endif
> > >
> > > #endif /* _ASM_X86_NUMA_32_H */
> > > diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
> > > index bcc079c..13a823c 100644
> > > --- a/arch/x86/mm/highmem_32.c
> > > +++ b/arch/x86/mm/highmem_32.c
> > > @@ -1,5 +1,6 @@
> > > #include <linux/highmem.h>
> > > #include <linux/module.h>
> > > +#include <linux/swap.h> /* for totalram_pages */
> > >
> > > void *kmap(struct page *page)
> > > {
> > > @@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap);
> > > EXPORT_SYMBOL(kunmap);
> > > EXPORT_SYMBOL(kmap_atomic);
> > > EXPORT_SYMBOL(kunmap_atomic);
> > > +
> > > +#ifdef CONFIG_NUMA
> > > +void __init set_highmem_pages_init(void)
> > > +{
> > > + struct zone *zone;
> > > + int nid;
> > > +
> > > + for_each_zone(zone) {
> > > + unsigned long zone_start_pfn, zone_end_pfn;
> > > +
> > > + if (!is_highmem(zone))
> > > + continue;
> > > +
> > > + zone_start_pfn = zone->zone_start_pfn;
> > > + zone_end_pfn = zone_start_pfn + zone->spanned_pages;
> > > +
> > > + nid = zone_to_nid(zone);
> > > + printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
> > > + zone->name, nid, zone_start_pfn, zone_end_pfn);
> > > +
> > > + add_highpages_with_active_regions(nid, zone_start_pfn,
> > > + zone_end_pfn);
> > > + }
> > > + totalram_pages += totalhigh_pages;
> > > +}
> > > +#else
> > > +static void __init set_highmem_pages_init(void)
> > > +{
> > > + add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
> > > +
> > > + totalram_pages += totalhigh_pages;
> > > +}
> > > +#endif /* CONFIG_NUMA */
> >
> > Couldnt we just wrap the !NUMA case into the NUMA case and just
> > have the NUMA function present, by making for_each_zone() a
> > two-entries matter and making the second entry contain:
> >
> > zone->zone_start_pfn := highstart_pfn
> > zone->spanned_pages := highend_pfn-highstart_pfn
>
> OK, I don't quite understand your suggestion here. The zones
> are set up completely at this stage so AFAICT, even for the
> UMA case, there should be a highmem zone there. So unless I am
> missing something here, I think we can get away with something
> as simple as the following.
ok, good - it is an easier cleanup than i hoped it would be :-)
Ingo
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] x86: set_highmem_pages_init() cleanup
2009-03-04 17:59 ` Ingo Molnar
@ 2009-03-04 18:01 ` Ingo Molnar
0 siblings, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2009-03-04 18:01 UTC (permalink / raw)
To: Pekka Enberg; +Cc: linux-kernel, x86, Mel Gorman
* Ingo Molnar <mingo@elte.hu> wrote:
>
> * Pekka Enberg <penberg@cs.helsinki.fi> wrote:
>
> > On Tue, 2009-03-03 at 13:15 +0100, Ingo Molnar wrote:
> > > * Pekka Enberg <penberg@cs.helsinki.fi> wrote:
> > >
> > > > From: Pekka Enberg <penberg@cs.helsinki.fi>
> > > >
> > > > Impact: cleanup
> > > >
> > > > This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c. The
> > > > declaration of the function is kept in asm/numa_32.h because asm/highmem.h is
> > > > included only CONFIG_HIGHMEM is enabled so we can't put the empty static inline
> > > > function there.
> > > >
> > > > Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> > > > ---
> > > > arch/x86/include/asm/numa_32.h | 6 +++++-
> > > > arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++
> > > > arch/x86/mm/init_32.c | 12 ------------
> > > > arch/x86/mm/numa_32.c | 26 --------------------------
> > > > 4 files changed, 39 insertions(+), 39 deletions(-)
> > >
> > > Applied, thanks!
> > >
> > > One question:
> > >
> > > > diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
> > > > index e9f5db7..a372290 100644
> > > > --- a/arch/x86/include/asm/numa_32.h
> > > > +++ b/arch/x86/include/asm/numa_32.h
> > > > @@ -4,8 +4,12 @@
> > > > extern int pxm_to_nid(int pxm);
> > > > extern void numa_remove_cpu(int cpu);
> > > >
> > > > -#ifdef CONFIG_NUMA
> > > > +#ifdef CONFIG_HIGHMEM
> > > > extern void set_highmem_pages_init(void);
> > > > +#else
> > > > +static inline void set_highmem_pages_init(void)
> > > > +{
> > > > +}
> > > > #endif
> > > >
> > > > #endif /* _ASM_X86_NUMA_32_H */
> > > > diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
> > > > index bcc079c..13a823c 100644
> > > > --- a/arch/x86/mm/highmem_32.c
> > > > +++ b/arch/x86/mm/highmem_32.c
> > > > @@ -1,5 +1,6 @@
> > > > #include <linux/highmem.h>
> > > > #include <linux/module.h>
> > > > +#include <linux/swap.h> /* for totalram_pages */
> > > >
> > > > void *kmap(struct page *page)
> > > > {
> > > > @@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap);
> > > > EXPORT_SYMBOL(kunmap);
> > > > EXPORT_SYMBOL(kmap_atomic);
> > > > EXPORT_SYMBOL(kunmap_atomic);
> > > > +
> > > > +#ifdef CONFIG_NUMA
> > > > +void __init set_highmem_pages_init(void)
> > > > +{
> > > > + struct zone *zone;
> > > > + int nid;
> > > > +
> > > > + for_each_zone(zone) {
> > > > + unsigned long zone_start_pfn, zone_end_pfn;
> > > > +
> > > > + if (!is_highmem(zone))
> > > > + continue;
> > > > +
> > > > + zone_start_pfn = zone->zone_start_pfn;
> > > > + zone_end_pfn = zone_start_pfn + zone->spanned_pages;
> > > > +
> > > > + nid = zone_to_nid(zone);
> > > > + printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
> > > > + zone->name, nid, zone_start_pfn, zone_end_pfn);
> > > > +
> > > > + add_highpages_with_active_regions(nid, zone_start_pfn,
> > > > + zone_end_pfn);
> > > > + }
> > > > + totalram_pages += totalhigh_pages;
> > > > +}
> > > > +#else
> > > > +static void __init set_highmem_pages_init(void)
> > > > +{
> > > > + add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
> > > > +
> > > > + totalram_pages += totalhigh_pages;
> > > > +}
> > > > +#endif /* CONFIG_NUMA */
> > >
> > > Couldnt we just wrap the !NUMA case into the NUMA case and just
> > > have the NUMA function present, by making for_each_zone() a
> > > two-entries matter and making the second entry contain:
> > >
> > > zone->zone_start_pfn := highstart_pfn
> > > zone->spanned_pages := highend_pfn-highstart_pfn
> >
> > OK, I don't quite understand your suggestion here. The zones
> > are set up completely at this stage so AFAICT, even for the
> > UMA case, there should be a highmem zone there. So unless I am
> > missing something here, I think we can get away with something
> > as simple as the following.
>
> ok, good - it is an easier cleanup than i hoped it would be :-)
s/hoped/thought
Ingo
^ permalink raw reply [flat|nested] 9+ messages in thread
* [tip:x86/mm] x86: set_highmem_pages_init() cleanup, #2
2009-03-04 8:16 ` Pekka Enberg
2009-03-04 17:59 ` Ingo Molnar
@ 2009-03-04 19:21 ` Pekka Enberg
1 sibling, 0 replies; 9+ messages in thread
From: Pekka Enberg @ 2009-03-04 19:21 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, penberg, mel, tglx, mingo
Commit-ID: 6298e719cf388f43b674f43799af467d3e4e5aa7
Gitweb: http://git.kernel.org/tip/6298e719cf388f43b674f43799af467d3e4e5aa7
Author: "Pekka Enberg" <penberg@cs.helsinki.fi>
AuthorDate: Wed, 4 Mar 2009 10:16:07 +0200
Commit: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 4 Mar 2009 19:00:51 +0100
x86: set_highmem_pages_init() cleanup, #2
Impact: cleanup
The zones are set up at this stage so there's a highmem zone
available even for the UMA case.
The only difference there is that for machines that have
CONFIG_HIGHMEM enabled but don't have any highmem available,
->zone_start_pfn is zero whereas highstart_pfn is non-zero).
The field is left zeroed because of the !size test in
free_area_init_core() but shouldn't be a problem because
add_highpages_with_active_regions() handles empty ranges just
fine.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Mel Gorman <mel@csn.ul.ie>
LKML-Reference: <1236154567.29024.23.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/mm/highmem_32.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 00f127c..d117453 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -158,7 +158,6 @@ EXPORT_SYMBOL(kunmap);
EXPORT_SYMBOL(kmap_atomic);
EXPORT_SYMBOL(kunmap_atomic);
-#ifdef CONFIG_NUMA
void __init set_highmem_pages_init(void)
{
struct zone *zone;
@@ -182,11 +181,3 @@ void __init set_highmem_pages_init(void)
}
totalram_pages += totalhigh_pages;
}
-#else
-void __init set_highmem_pages_init(void)
-{
- add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
-
- totalram_pages += totalhigh_pages;
-}
-#endif /* CONFIG_NUMA */
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [tip:x86/mm] x86: set_highmem_pages_init() cleanup
2009-03-03 12:10 [PATCH] x86: set_highmem_pages_init() cleanup Pekka Enberg
2009-03-03 12:15 ` Ingo Molnar
@ 2009-03-03 12:15 ` Pekka Enberg
2009-03-03 14:36 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y Ingo Molnar
2 siblings, 0 replies; 9+ messages in thread
From: Pekka Enberg @ 2009-03-03 12:15 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, penberg, tglx, mingo
Commit-ID: 867c5b5292583b1e474cbbcb4c77f09bfca3903c
Gitweb: http://git.kernel.org/tip/867c5b5292583b1e474cbbcb4c77f09bfca3903c
Author: "Pekka Enberg" <penberg@cs.helsinki.fi>
AuthorDate: Tue, 3 Mar 2009 14:10:12 +0200
Commit: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 3 Mar 2009 13:13:15 +0100
x86: set_highmem_pages_init() cleanup
Impact: cleanup
This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c.
The declaration of the function is kept in asm/numa_32.h because
asm/highmem.h is included only if CONFIG_HIGHMEM is enabled so we
can't put the empty static inline function there.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236082212.2675.24.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/numa_32.h | 6 +++++-
arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++
arch/x86/mm/init_32.c | 12 ------------
arch/x86/mm/numa_32.c | 26 --------------------------
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
index e9f5db7..a372290 100644
--- a/arch/x86/include/asm/numa_32.h
+++ b/arch/x86/include/asm/numa_32.h
@@ -4,8 +4,12 @@
extern int pxm_to_nid(int pxm);
extern void numa_remove_cpu(int cpu);
-#ifdef CONFIG_NUMA
+#ifdef CONFIG_HIGHMEM
extern void set_highmem_pages_init(void);
+#else
+static inline void set_highmem_pages_init(void)
+{
+}
#endif
#endif /* _ASM_X86_NUMA_32_H */
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index bcc079c..13a823c 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -1,5 +1,6 @@
#include <linux/highmem.h>
#include <linux/module.h>
+#include <linux/swap.h> /* for totalram_pages */
void *kmap(struct page *page)
{
@@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap);
EXPORT_SYMBOL(kunmap);
EXPORT_SYMBOL(kmap_atomic);
EXPORT_SYMBOL(kunmap_atomic);
+
+#ifdef CONFIG_NUMA
+void __init set_highmem_pages_init(void)
+{
+ struct zone *zone;
+ int nid;
+
+ for_each_zone(zone) {
+ unsigned long zone_start_pfn, zone_end_pfn;
+
+ if (!is_highmem(zone))
+ continue;
+
+ zone_start_pfn = zone->zone_start_pfn;
+ zone_end_pfn = zone_start_pfn + zone->spanned_pages;
+
+ nid = zone_to_nid(zone);
+ printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
+ zone->name, nid, zone_start_pfn, zone_end_pfn);
+
+ add_highpages_with_active_regions(nid, zone_start_pfn,
+ zone_end_pfn);
+ }
+ totalram_pages += totalhigh_pages;
+}
+#else
+static void __init set_highmem_pages_init(void)
+{
+ add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
+
+ totalram_pages += totalhigh_pages;
+}
+#endif /* CONFIG_NUMA */
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index cd8d673..0b087dc 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -467,22 +467,10 @@ void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
work_with_active_regions(nid, add_highpages_work_fn, &data);
}
-#ifndef CONFIG_NUMA
-static void __init set_highmem_pages_init(void)
-{
- add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
-
- totalram_pages += totalhigh_pages;
-}
-#endif /* !CONFIG_NUMA */
-
#else
static inline void permanent_kmaps_init(pgd_t *pgd_base)
{
}
-static inline void set_highmem_pages_init(void)
-{
-}
#endif /* CONFIG_HIGHMEM */
void __init native_pagetable_setup_start(pgd_t *base)
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index d1f7439..a04092a 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -423,32 +423,6 @@ void __init initmem_init(unsigned long start_pfn,
setup_bootmem_allocator();
}
-void __init set_highmem_pages_init(void)
-{
-#ifdef CONFIG_HIGHMEM
- struct zone *zone;
- int nid;
-
- for_each_zone(zone) {
- unsigned long zone_start_pfn, zone_end_pfn;
-
- if (!is_highmem(zone))
- continue;
-
- zone_start_pfn = zone->zone_start_pfn;
- zone_end_pfn = zone_start_pfn + zone->spanned_pages;
-
- nid = zone_to_nid(zone);
- printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
- zone->name, nid, zone_start_pfn, zone_end_pfn);
-
- add_highpages_with_active_regions(nid, zone_start_pfn,
- zone_end_pfn);
- }
- totalram_pages += totalhigh_pages;
-#endif
-}
-
#ifdef CONFIG_MEMORY_HOTPLUG
static int paddr_to_nid(u64 addr)
{
^ permalink raw reply related [flat|nested] 9+ messages in thread* [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
2009-03-03 12:10 [PATCH] x86: set_highmem_pages_init() cleanup Pekka Enberg
2009-03-03 12:15 ` Ingo Molnar
2009-03-03 12:15 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup Pekka Enberg
@ 2009-03-03 14:36 ` Ingo Molnar
2009-03-03 19:17 ` Pekka Enberg
2 siblings, 1 reply; 9+ messages in thread
From: Ingo Molnar @ 2009-03-03 14:36 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, penberg, tglx, mingo
Commit-ID: 03787ceed8f7bf06af29f3b213017d89f8e9423d
Gitweb: http://git.kernel.org/tip/03787ceed8f7bf06af29f3b213017d89f8e9423d
Author: "Ingo Molnar" <mingo@elte.hu>
AuthorDate: Tue, 3 Mar 2009 15:32:24 +0100
Commit: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 3 Mar 2009 15:32:24 +0100
x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
Impact: build fix
arch/x86/mm/highmem_32.c:187: error: static declaration of 'set_highmem_pages_init' follows non-static declaration
arch/x86/include/asm/numa_32.h:8: error: previous declaration of 'set_highmem_pages_init' was here
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236082212.2675.24.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/mm/highmem_32.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 13a823c..00f127c 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -183,7 +183,7 @@ void __init set_highmem_pages_init(void)
totalram_pages += totalhigh_pages;
}
#else
-static void __init set_highmem_pages_init(void)
+void __init set_highmem_pages_init(void)
{
add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
2009-03-03 14:36 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y Ingo Molnar
@ 2009-03-03 19:17 ` Pekka Enberg
0 siblings, 0 replies; 9+ messages in thread
From: Pekka Enberg @ 2009-03-03 19:17 UTC (permalink / raw)
To: mingo, hpa, linux-kernel, penberg, tglx, mingo; +Cc: linux-tip-commits
Ingo Molnar wrote:
> Commit-ID: 03787ceed8f7bf06af29f3b213017d89f8e9423d
> Gitweb: http://git.kernel.org/tip/03787ceed8f7bf06af29f3b213017d89f8e9423d
> Author: "Ingo Molnar" <mingo@elte.hu>
> AuthorDate: Tue, 3 Mar 2009 15:32:24 +0100
> Commit: Ingo Molnar <mingo@elte.hu>
> CommitDate: Tue, 3 Mar 2009 15:32:24 +0100
>
> x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
>
> Impact: build fix
>
> arch/x86/mm/highmem_32.c:187: error: static declaration of 'set_highmem_pages_init' follows non-static declaration
> arch/x86/include/asm/numa_32.h:8: error: previous declaration of 'set_highmem_pages_init' was here
>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> LKML-Reference: <1236082212.2675.24.camel@penberg-laptop>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
>
>
> ---
> arch/x86/mm/highmem_32.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
> index 13a823c..00f127c 100644
> --- a/arch/x86/mm/highmem_32.c
> +++ b/arch/x86/mm/highmem_32.c
> @@ -183,7 +183,7 @@ void __init set_highmem_pages_init(void)
> totalram_pages += totalhigh_pages;
> }
> #else
> -static void __init set_highmem_pages_init(void)
> +void __init set_highmem_pages_init(void)
> {
> add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
>
I thought I tested that... The patch looks good. Thanks, Ingo!
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-03-04 19:22 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-03 12:10 [PATCH] x86: set_highmem_pages_init() cleanup Pekka Enberg
2009-03-03 12:15 ` Ingo Molnar
2009-03-04 8:16 ` Pekka Enberg
2009-03-04 17:59 ` Ingo Molnar
2009-03-04 18:01 ` Ingo Molnar
2009-03-04 19:21 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, #2 Pekka Enberg
2009-03-03 12:15 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup Pekka Enberg
2009-03-03 14:36 ` [tip:x86/mm] x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y Ingo Molnar
2009-03-03 19:17 ` Pekka Enberg
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).