svn commit: r208251 - in stable/8/sys: kern net

[Bjoern A. Zeeb]

Author: bz
Date: Tue May 18 04:20:35 2010
New Revision: 208251
URL: http://svn.freebsd.org/changeset/base/208251

Log:
  MFC r208100:
    Fix an issue with the dynamic pcpu/vnet data allocators.
  
    We cannot expect that modspace is the last entry in the linker
    set and thus that modspace + possible extra space up to PAGE_SIZE
    would be contiguous.  For the moment do not support more than
    *_MODMIN space and ignore the extra space.
  
  Discussed with:	jeff, rwatson (briefly)
  Reviewed by:	jeff
  Sponsored by:	The FreeBSD Foundation
  Sponsored by:	CK Software GmbH

Modified:
  stable/8/sys/kern/subr_pcpu.c
  stable/8/sys/net/vnet.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/kern/subr_pcpu.c
==============================================================================
--- stable/8/sys/kern/subr_pcpu.c	Tue May 18 04:08:58 2010	(r208250)
+++ stable/8/sys/kern/subr_pcpu.c	Tue May 18 04:20:35 2010	(r208251)
@@ -125,7 +125,7 @@ dpcpu_startup(void *dummy __unused)
 
 	df = malloc(sizeof(*df), M_PCPU, M_WAITOK | M_ZERO);
 	df->df_start = (uintptr_t)&DPCPU_NAME(modspace);
-	df->df_len = DPCPU_MODSIZE;
+	df->df_len = DPCPU_MODMIN;
 	TAILQ_INSERT_HEAD(&dpcpu_head, df, df_link);
 	sx_init(&dpcpu_lock, "dpcpu alloc lock");
 }

Modified: stable/8/sys/net/vnet.c
==============================================================================
--- stable/8/sys/net/vnet.c	Tue May 18 04:08:58 2010	(r208250)
+++ stable/8/sys/net/vnet.c	Tue May 18 04:20:35 2010	(r208251)
@@ -357,7 +357,7 @@ vnet_data_startup(void *dummy __unused)
 
 	df = malloc(sizeof(*df), M_VNET_DATA_FREE, M_WAITOK | M_ZERO);
 	df->vnd_start = (uintptr_t)&VNET_NAME(modspace);
-	df->vnd_len = VNET_MODSIZE;
+	df->vnd_len = VNET_MODMIN;
 	TAILQ_INSERT_HEAD(&vnet_data_free_head, df, vnd_link);
 	sx_init(&vnet_data_free_lock, "vnet_data alloc lock");
 }