TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: snmp: fix 64bit stats on 32bit arches

Browse Source 
I accidentally replaced BH disabling by preemption disabling
in SNMP_ADD_STATS64() and SNMP_UPD_PO_STATS64() on 32bit builds.

For 64bit stats on 32bit arch, we really need to disable BH,
since the "struct u64_stats_sync syncp" might be manipulated
both from process and BH contexts.

Fixes: 6aef70a851 ("net: snmp: kill various STATS_USER() helpers")
Reported-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Tested-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2016-04-28 06:33:24 -07:00
committed by David S. Miller
parent 8be2748a40
commit ba7863f4d3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/net/snmp.h
+4 -4
View File
@@ -166,9 +166,9 @@ struct linux_xfrm_mib {
#define SNMP_ADD_STATS64(mib, field, addend) \ #define SNMP_ADD_STATS64(mib, field, addend) \
do { \ do { \
preempt_disable(); \ local_bh_disable(); \
__SNMP_ADD_STATS64(mib, field, addend); \ __SNMP_ADD_STATS64(mib, field, addend); \
preempt_enable(); \ local_bh_enable(); \
} while (0) } while (0)
#define __SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1) #define __SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)
@@ -184,9 +184,9 @@ struct linux_xfrm_mib {
} while (0) } while (0)
#define SNMP_UPD_PO_STATS64(mib, basefield, addend) \ #define SNMP_UPD_PO_STATS64(mib, basefield, addend) \
do { \ do { \
preempt_disable(); \ local_bh_disable(); \
__SNMP_UPD_PO_STATS64(mib, basefield, addend); \ __SNMP_UPD_PO_STATS64(mib, basefield, addend); \
preempt_enable(); \ local_bh_enable(); \
} while (0) } while (0)
#else #else
#define __SNMP_INC_STATS64(mib, field) __SNMP_INC_STATS(mib, field) #define __SNMP_INC_STATS64(mib, field) __SNMP_INC_STATS(mib, field)