cvs commit: src/sys/i386/i386 pmap.c src/sys/kern kern_mbuf.c src/sys/vm uma.h uma_core.c

[Kip Macy]

kmacy       2008-08-19 01:16:12 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/i386/i386        pmap.c 
    sys/kern             kern_mbuf.c 
    sys/vm               uma.h uma_core.c 
  Log:
  SVN rev 181859 on 2008-08-19 01:16:12Z by kmacy
  
  In anticipation of MFCing physically contiguous jumbo frames MFC r177921:
   Reintroduce UMA_SLAB_KMAP; however, change its spelling to
   UMA_SLAB_KERNEL for consistency with its sibling UMA_SLAB_KMEM.
   (UMA_SLAB_KMAP met its original demise in revision 1.30 of
   vm/uma_core.c.)  UMA_SLAB_KERNEL is now required by the jumbo frame
   allocators.  Without it, UMA cannot correctly return pages from the
   jumbo frame zones to the VM system because it resets the pages' object
   field to NULL instead of the kernel object.  In more detail, the jumbo
   frame zones are created with the option UMA_ZONE_REFCNT.  This causes
   UMA to overwrite the pages' object field with the address of the slab.
   However, when UMA wants to release these pages, it doesn't know how to
   restore the object field, so it sets it to NULL.  This change teaches
   UMA how to reset the object field to the kernel object.
  
  Crashes reported by: kris
  Fix tested by: kris
  
  Approved by:    alc
  
  Revision   Changes    Path
  1.594.2.8  +3 -1      src/sys/i386/i386/pmap.c
  1.32.2.3   +30 -0     src/sys/kern/kern_mbuf.c
  1.31.2.1   +1 -0      src/sys/vm/uma.h
  1.147.2.2  +4 -0      src/sys/vm/uma_core.c