| uma_machdep.c (121081) | uma_machdep.c (157908) |
|---|---|
| 1/*- 2 * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/amd64/amd64/uma_machdep.c 121081 2003-10-14 05:51:31Z alc $"); | 28__FBSDID("$FreeBSD: head/sys/amd64/amd64/uma_machdep.c 157908 2006-04-21 04:24:50Z peter $"); |
| 29 30#include <sys/param.h> 31#include <sys/lock.h> 32#include <sys/mutex.h> 33#include <sys/systm.h> 34#include <vm/vm.h> 35#include <vm/vm_page.h> 36#include <vm/vm_pageout.h> 37#include <vm/uma.h> 38#include <vm/uma_int.h> 39#include <machine/md_var.h> 40#include <machine/vmparam.h> 41 42void * 43uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) 44{ 45 static vm_pindex_t colour; 46 vm_page_t m; | 29 30#include <sys/param.h> 31#include <sys/lock.h> 32#include <sys/mutex.h> 33#include <sys/systm.h> 34#include <vm/vm.h> 35#include <vm/vm_page.h> 36#include <vm/vm_pageout.h> 37#include <vm/uma.h> 38#include <vm/uma_int.h> 39#include <machine/md_var.h> 40#include <machine/vmparam.h> 41 42void * 43uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) 44{ 45 static vm_pindex_t colour; 46 vm_page_t m; |
| 47 vm_paddr_t pa; |
|
| 47 void *va; 48 int pflags; 49 50 *flags = UMA_SLAB_PRIV; 51 if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) 52 pflags = VM_ALLOC_INTERRUPT; 53 else 54 pflags = VM_ALLOC_SYSTEM; --- 4 unchanged lines hidden (view full) --- 59 if (m == NULL) { 60 if (wait & M_NOWAIT) 61 return (NULL); 62 else 63 VM_WAIT; 64 } else 65 break; 66 } | 48 void *va; 49 int pflags; 50 51 *flags = UMA_SLAB_PRIV; 52 if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) 53 pflags = VM_ALLOC_INTERRUPT; 54 else 55 pflags = VM_ALLOC_SYSTEM; --- 4 unchanged lines hidden (view full) --- 60 if (m == NULL) { 61 if (wait & M_NOWAIT) 62 return (NULL); 63 else 64 VM_WAIT; 65 } else 66 break; 67 } |
| 67 va = (void *)PHYS_TO_DMAP(m->phys_addr); | 68 pa = m->phys_addr; 69 dump_add_page(pa); 70 va = (void *)PHYS_TO_DMAP(pa); |
| 68 if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) 69 pagezero(va); 70 return (va); 71} 72 73void 74uma_small_free(void *mem, int size, u_int8_t flags) 75{ 76 vm_page_t m; | 71 if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) 72 pagezero(va); 73 return (va); 74} 75 76void 77uma_small_free(void *mem, int size, u_int8_t flags) 78{ 79 vm_page_t m; |
| 80 vm_paddr_t pa; |
|
| 77 | 81 |
| 78 m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); | 82 pa = DMAP_TO_PHYS((vm_offset_t)mem); 83 dump_drop_page(pa); 84 m = PHYS_TO_VM_PAGE(pa); |
| 79 vm_page_lock_queues(); 80 vm_page_free(m); 81 vm_page_unlock_queues(); 82} | 85 vm_page_lock_queues(); 86 vm_page_free(m); 87 vm_page_unlock_queues(); 88} |