Re: [patch 01/10] mm: vmstat: fix UP zone state accounting
On Mon, 3 Feb 2014 19:53:33 -0500 Johannes Weiner wrote:
> Fengguang Wu's build testing spotted problems with inc_zone_state()
> and dec_zone_state() on UP configurations in out-of-tree patches.
>
> inc_zone_state() is declared but not defined, dec_zone_state() is
> missing entirely.
>
> Just like with *_zone_page_state(), they can be defined like their
> preemption-unsafe counterparts on UP.
um,
In file included from include/linux/mm.h:876,
from include/linux/suspend.h:8,
from arch/x86/kernel/asm-offsets.c:12:
include/linux/vmstat.h: In function '__inc_zone_page_state':
include/linux/vmstat.h:228: error: implicit declaration of function
'__inc_zone_state'
include/linux/vmstat.h: In function '__dec_zone_page_state':
include/linux/vmstat.h:234: error: implicit declaration of function
'__dec_zone_state'
include/linux/vmstat.h: At top level:
include/linux/vmstat.h:245: warning: conflicting types for '__inc_zone_state'
include/linux/vmstat.h:245: error: static declaration of '__inc_zone_state'
follows non-static declaration
include/linux/vmstat.h:228: note: previous implicit declaration of
'__inc_zone_state' was here
include/linux/vmstat.h:251: warning: conflicting types for '__dec_zone_state'
include/linux/vmstat.h:251: error: static declaration of '__dec_zone_state'
follows non-static declaration
include/linux/vmstat.h:234: note: previous implicit declaration of
'__dec_zone_state' was here
I shuffled them around:
--- a/include/linux/vmstat.h~mm-vmstat-fix-up-zone-state-accounting-fix
+++ a/include/linux/vmstat.h
@@ -214,6 +214,18 @@ static inline void __mod_zone_page_state
zone_page_state_add(delta, zone, item);
}
+static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_inc(>vm_stat[item]);
+ atomic_long_inc(_stat[item]);
+}
+
+static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_dec(>vm_stat[item]);
+ atomic_long_dec(_stat[item]);
+}
+
static inline void __inc_zone_page_state(struct page *page,
enum zone_stat_item item)
{
@@ -234,18 +246,6 @@ static inline void __dec_zone_page_state
#define dec_zone_page_state __dec_zone_page_state
#define mod_zone_page_state __mod_zone_page_state
-static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_inc(>vm_stat[item]);
- atomic_long_inc(_stat[item]);
-}
-
-static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_dec(>vm_stat[item]);
- atomic_long_dec(_stat[item]);
-}
-
#define inc_zone_state __inc_zone_state
#define dec_zone_state __dec_zone_state
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [patch 01/10] mm: vmstat: fix UP zone state accounting
On Mon, 3 Feb 2014 19:53:33 -0500 Johannes Weiner han...@cmpxchg.org wrote:
Fengguang Wu's build testing spotted problems with inc_zone_state()
and dec_zone_state() on UP configurations in out-of-tree patches.
inc_zone_state() is declared but not defined, dec_zone_state() is
missing entirely.
Just like with *_zone_page_state(), they can be defined like their
preemption-unsafe counterparts on UP.
um,
In file included from include/linux/mm.h:876,
from include/linux/suspend.h:8,
from arch/x86/kernel/asm-offsets.c:12:
include/linux/vmstat.h: In function '__inc_zone_page_state':
include/linux/vmstat.h:228: error: implicit declaration of function
'__inc_zone_state'
include/linux/vmstat.h: In function '__dec_zone_page_state':
include/linux/vmstat.h:234: error: implicit declaration of function
'__dec_zone_state'
include/linux/vmstat.h: At top level:
include/linux/vmstat.h:245: warning: conflicting types for '__inc_zone_state'
include/linux/vmstat.h:245: error: static declaration of '__inc_zone_state'
follows non-static declaration
include/linux/vmstat.h:228: note: previous implicit declaration of
'__inc_zone_state' was here
include/linux/vmstat.h:251: warning: conflicting types for '__dec_zone_state'
include/linux/vmstat.h:251: error: static declaration of '__dec_zone_state'
follows non-static declaration
include/linux/vmstat.h:234: note: previous implicit declaration of
'__dec_zone_state' was here
I shuffled them around:
--- a/include/linux/vmstat.h~mm-vmstat-fix-up-zone-state-accounting-fix
+++ a/include/linux/vmstat.h
@@ -214,6 +214,18 @@ static inline void __mod_zone_page_state
zone_page_state_add(delta, zone, item);
}
+static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_inc(zone-vm_stat[item]);
+ atomic_long_inc(vm_stat[item]);
+}
+
+static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_dec(zone-vm_stat[item]);
+ atomic_long_dec(vm_stat[item]);
+}
+
static inline void __inc_zone_page_state(struct page *page,
enum zone_stat_item item)
{
@@ -234,18 +246,6 @@ static inline void __dec_zone_page_state
#define dec_zone_page_state __dec_zone_page_state
#define mod_zone_page_state __mod_zone_page_state
-static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_inc(zone-vm_stat[item]);
- atomic_long_inc(vm_stat[item]);
-}
-
-static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_dec(zone-vm_stat[item]);
- atomic_long_dec(vm_stat[item]);
-}
-
#define inc_zone_state __inc_zone_state
#define dec_zone_state __dec_zone_state
_
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[patch 01/10] mm: vmstat: fix UP zone state accounting
Fengguang Wu's build testing spotted problems with inc_zone_state()
and dec_zone_state() on UP configurations in out-of-tree patches.
inc_zone_state() is declared but not defined, dec_zone_state() is
missing entirely.
Just like with *_zone_page_state(), they can be defined like their
preemption-unsafe counterparts on UP.
Signed-off-by: Johannes Weiner
---
include/linux/vmstat.h | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index a67b38415768..a32dbd2c2155 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -179,8 +179,6 @@ extern void zone_statistics(struct zone *, struct zone *,
gfp_t gfp);
#define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d)
#define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i,
-(__d))
-extern void inc_zone_state(struct zone *, enum zone_stat_item);
-
#ifdef CONFIG_SMP
void __mod_zone_page_state(struct zone *, enum zone_stat_item item, int);
void __inc_zone_page_state(struct page *, enum zone_stat_item);
@@ -216,24 +214,12 @@ static inline void __mod_zone_page_state(struct zone
*zone,
zone_page_state_add(delta, zone, item);
}
-static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_inc(>vm_stat[item]);
- atomic_long_inc(_stat[item]);
-}
-
static inline void __inc_zone_page_state(struct page *page,
enum zone_stat_item item)
{
__inc_zone_state(page_zone(page), item);
}
-static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_dec(>vm_stat[item]);
- atomic_long_dec(_stat[item]);
-}
-
static inline void __dec_zone_page_state(struct page *page,
enum zone_stat_item item)
{
@@ -248,6 +234,21 @@ static inline void __dec_zone_page_state(struct page *page,
#define dec_zone_page_state __dec_zone_page_state
#define mod_zone_page_state __mod_zone_page_state
+static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_inc(>vm_stat[item]);
+ atomic_long_inc(_stat[item]);
+}
+
+static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_dec(>vm_stat[item]);
+ atomic_long_dec(_stat[item]);
+}
+
+#define inc_zone_state __inc_zone_state
+#define dec_zone_state __dec_zone_state
+
#define set_pgdat_percpu_threshold(pgdat, callback) { }
static inline void refresh_cpu_vm_stats(int cpu) { }
--
1.8.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[patch 01/10] mm: vmstat: fix UP zone state accounting
Fengguang Wu's build testing spotted problems with inc_zone_state()
and dec_zone_state() on UP configurations in out-of-tree patches.
inc_zone_state() is declared but not defined, dec_zone_state() is
missing entirely.
Just like with *_zone_page_state(), they can be defined like their
preemption-unsafe counterparts on UP.
Signed-off-by: Johannes Weiner han...@cmpxchg.org
---
include/linux/vmstat.h | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index a67b38415768..a32dbd2c2155 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -179,8 +179,6 @@ extern void zone_statistics(struct zone *, struct zone *,
gfp_t gfp);
#define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d)
#define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i,
-(__d))
-extern void inc_zone_state(struct zone *, enum zone_stat_item);
-
#ifdef CONFIG_SMP
void __mod_zone_page_state(struct zone *, enum zone_stat_item item, int);
void __inc_zone_page_state(struct page *, enum zone_stat_item);
@@ -216,24 +214,12 @@ static inline void __mod_zone_page_state(struct zone
*zone,
zone_page_state_add(delta, zone, item);
}
-static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_inc(zone-vm_stat[item]);
- atomic_long_inc(vm_stat[item]);
-}
-
static inline void __inc_zone_page_state(struct page *page,
enum zone_stat_item item)
{
__inc_zone_state(page_zone(page), item);
}
-static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
-{
- atomic_long_dec(zone-vm_stat[item]);
- atomic_long_dec(vm_stat[item]);
-}
-
static inline void __dec_zone_page_state(struct page *page,
enum zone_stat_item item)
{
@@ -248,6 +234,21 @@ static inline void __dec_zone_page_state(struct page *page,
#define dec_zone_page_state __dec_zone_page_state
#define mod_zone_page_state __mod_zone_page_state
+static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_inc(zone-vm_stat[item]);
+ atomic_long_inc(vm_stat[item]);
+}
+
+static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item
item)
+{
+ atomic_long_dec(zone-vm_stat[item]);
+ atomic_long_dec(vm_stat[item]);
+}
+
+#define inc_zone_state __inc_zone_state
+#define dec_zone_state __dec_zone_state
+
#define set_pgdat_percpu_threshold(pgdat, callback) { }
static inline void refresh_cpu_vm_stats(int cpu) { }
--
1.8.5.3
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
