svn commit: r285627 - in head/sys: arm/arm arm/at91 arm/cavium/cns11xx arm/samsung/s3c2xx0 arm/xscale/i80321 arm/xscale/i8134x arm/xscale/ixp425 arm/xscale/pxa arm64/arm64 ddb i386/i386 powerpc/boo...

Zbigniew Bodek zbb at FreeBSD.org
Thu Jul 16 10:47:01 UTC 2015


Author: zbb
Date: Thu Jul 16 10:46:52 2015
New Revision: 285627
URL: https://svnweb.freebsd.org/changeset/base/285627

Log:
  Fix KSTACK_PAGES issue when the default value was changed in KERNCONF
  
  If KSTACK_PAGES was changed to anything alse than the default,
  the value from param.h was taken instead in some places and
  the value from KENRCONF in some others. This resulted in
  inconsistency which caused corruption in SMP envorinment.
  
  Ensure all places where KSTACK_PAGES are used the opt_kstack_pages.h
  is included.
  
  The file opt_kstack_pages.h could not be included in param.h
  because was breaking the toolchain compilation.
  
  Reviewed by:   kib
  Obtained from: Semihalf
  Sponsored by:  The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D3094

Modified:
  head/sys/arm/arm/machdep.c
  head/sys/arm/at91/at91_machdep.c
  head/sys/arm/cavium/cns11xx/econa_machdep.c
  head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
  head/sys/arm/xscale/i80321/ep80219_machdep.c
  head/sys/arm/xscale/i80321/iq31244_machdep.c
  head/sys/arm/xscale/i8134x/crb_machdep.c
  head/sys/arm/xscale/ixp425/avila_machdep.c
  head/sys/arm/xscale/pxa/pxa_machdep.c
  head/sys/arm64/arm64/locore.S
  head/sys/arm64/arm64/mp_machdep.c
  head/sys/arm64/arm64/swtch.S
  head/sys/ddb/db_ps.c
  head/sys/ddb/db_sym.c
  head/sys/i386/i386/locore.s
  head/sys/powerpc/booke/pmap.c
  head/sys/sparc64/sparc64/exception.S
  head/sys/sparc64/sparc64/stack_machdep.c
  head/sys/sparc64/sparc64/support.S
  head/sys/x86/xen/pv.c

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/arm/machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -44,6 +44,7 @@
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 #include "opt_platform.h"
 #include "opt_sched.h"
 #include "opt_timer.h"

Modified: head/sys/arm/at91/at91_machdep.c
==============================================================================
--- head/sys/arm/at91/at91_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/at91/at91_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -43,6 +43,7 @@
  * Created      : 17/09/94
  */
 
+#include "opt_kstack_pages.h"
 #include "opt_platform.h"
 
 #include <sys/cdefs.h>

Modified: head/sys/arm/cavium/cns11xx/econa_machdep.c
==============================================================================
--- head/sys/arm/cavium/cns11xx/econa_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/cavium/cns11xx/econa_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -38,6 +38,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
==============================================================================
--- head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -44,6 +44,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c
==============================================================================
--- head/sys/arm/xscale/i80321/ep80219_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/xscale/i80321/ep80219_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -48,6 +48,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/arm/xscale/i80321/iq31244_machdep.c
==============================================================================
--- head/sys/arm/xscale/i80321/iq31244_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/xscale/i80321/iq31244_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -48,6 +48,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/arm/xscale/i8134x/crb_machdep.c
==============================================================================
--- head/sys/arm/xscale/i8134x/crb_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/xscale/i8134x/crb_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -48,6 +48,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/arm/xscale/ixp425/avila_machdep.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/xscale/ixp425/avila_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -48,6 +48,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/arm/xscale/pxa/pxa_machdep.c
==============================================================================
--- head/sys/arm/xscale/pxa/pxa_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm/xscale/pxa/pxa_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -46,6 +46,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

Modified: head/sys/arm64/arm64/locore.S
==============================================================================
--- head/sys/arm64/arm64/locore.S	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm64/arm64/locore.S	Thu Jul 16 10:46:52 2015	(r285627)
@@ -27,6 +27,7 @@
  */
 
 #include "assym.s"
+#include "opt_kstack_pages.h"
 #include <sys/syscall.h>
 #include <machine/asm.h>
 #include <machine/armreg.h>
@@ -51,8 +52,6 @@
  *  We are loaded at a 2MiB aligned address
  */
 
-#define	INIT_STACK_SIZE	(PAGE_SIZE * 4)
-
 	.text
 	.globl _start
 _start:

Modified: head/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- head/sys/arm64/arm64/mp_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm64/arm64/mp_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -28,6 +28,7 @@
  *
  */
 
+#include "opt_kstack_pages.h"
 #include "opt_platform.h"
 
 #include <sys/cdefs.h>

Modified: head/sys/arm64/arm64/swtch.S
==============================================================================
--- head/sys/arm64/arm64/swtch.S	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/arm64/arm64/swtch.S	Thu Jul 16 10:46:52 2015	(r285627)
@@ -30,6 +30,7 @@
  */
 
 #include "assym.s"
+#include "opt_kstack_pages.h"
 #include "opt_sched.h"
 
 #include <machine/asm.h>

Modified: head/sys/ddb/db_ps.c
==============================================================================
--- head/sys/ddb/db_ps.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/ddb/db_ps.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -30,6 +30,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #include <sys/param.h>
 #include <sys/cons.h>
 #include <sys/jail.h>

Modified: head/sys/ddb/db_sym.c
==============================================================================
--- head/sys/ddb/db_sym.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/ddb/db_sym.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -31,6 +31,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #include <sys/param.h>
 #include <sys/pcpu.h>
 #include <sys/smp.h>

Modified: head/sys/i386/i386/locore.s
==============================================================================
--- head/sys/i386/i386/locore.s	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/i386/i386/locore.s	Thu Jul 16 10:46:52 2015	(r285627)
@@ -41,6 +41,7 @@
 
 #include "opt_bootp.h"
 #include "opt_compat.h"
+#include "opt_kstack_pages.h"
 #include "opt_nfsroot.h"
 #include "opt_pmap.h"
 

Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/powerpc/booke/pmap.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -51,6 +51,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>

Modified: head/sys/sparc64/sparc64/exception.S
==============================================================================
--- head/sys/sparc64/sparc64/exception.S	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/sparc64/sparc64/exception.S	Thu Jul 16 10:46:52 2015	(r285627)
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>

Modified: head/sys/sparc64/sparc64/stack_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/stack_machdep.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/sparc64/sparc64/stack_machdep.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/stack.h>

Modified: head/sys/sparc64/sparc64/support.S
==============================================================================
--- head/sys/sparc64/sparc64/support.S	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/sparc64/sparc64/support.S	Thu Jul 16 10:46:52 2015	(r285627)
@@ -27,6 +27,8 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kstack_pages.h"
+
 #include <sys/errno.h>
 
 #include <machine/asi.h>

Modified: head/sys/x86/xen/pv.c
==============================================================================
--- head/sys/x86/xen/pv.c	Thu Jul 16 10:22:57 2015	(r285626)
+++ head/sys/x86/xen/pv.c	Thu Jul 16 10:46:52 2015	(r285627)
@@ -31,6 +31,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>


More information about the svn-src-all mailing list