svn commit: r351495 - head/sys/amd64/amd64

Konstantin Belousov kib at FreeBSD.org
Sun Aug 25 21:01:41 UTC 2019


Author: kib
Date: Sun Aug 25 21:01:40 2019
New Revision: 351495
URL: https://svnweb.freebsd.org/changeset/base/351495

Log:
  amd64: loose constraints on the APs dpcpu and nmi/dbg stack allocations.
  
  Use DOMAINSET_PREF() instead of DOMAINSET_FIXED(), to gracefully
  fallback in case of memory-less domain.
  
  Reported and tested by:	bcran
  Reviewed by:	markj
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/amd64/amd64/mp_machdep.c

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Sun Aug 25 20:57:39 2019	(r351494)
+++ head/sys/amd64/amd64/mp_machdep.c	Sun Aug 25 21:01:40 2019	(r351495)
@@ -483,10 +483,10 @@ native_start_all_aps(void)
 		    M_ZERO);
 		mce_stack = (char *)kmem_malloc(PAGE_SIZE, M_WAITOK | M_ZERO);
 		nmi_stack = (char *)kmem_malloc_domainset(
-		    DOMAINSET_FIXED(domain), PAGE_SIZE, M_WAITOK | M_ZERO);
+		    DOMAINSET_PREF(domain), PAGE_SIZE, M_WAITOK | M_ZERO);
 		dbg_stack = (char *)kmem_malloc_domainset(
-		    DOMAINSET_FIXED(domain), PAGE_SIZE, M_WAITOK | M_ZERO);
-		dpcpu = (void *)kmem_malloc_domainset(DOMAINSET_FIXED(domain),
+		    DOMAINSET_PREF(domain), PAGE_SIZE, M_WAITOK | M_ZERO);
+		dpcpu = (void *)kmem_malloc_domainset(DOMAINSET_PREF(domain),
 		    DPCPU_SIZE, M_WAITOK | M_ZERO);
 
 		bootSTK = (char *)bootstacks[cpu] +


More information about the svn-src-head mailing list