Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Introduce uvm_km_kmemalloc1() which allows alignment and preferred offset

Browse Source 
to be passed to uvm_map().

* Turn all uvm_km_valloc*() macros back into (inlined) functions to retain
  binary compatibility with any 3rd party modules.
This commit is contained in:
pk 2003-12-18 15:02:04 +00:00
parent 5218af0651
commit 3c96ae431b
2 changed files with 71 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/uvm/uvm_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_extern.h,v 1.86 2003/12/18 08:15:42 pk Exp $ */
/* $NetBSD: uvm_extern.h,v 1.87 2003/12/18 15:02:04 pk Exp $ */
/*
*
@ -594,13 +594,15 @@ vaddr_t uvm_km_alloc1 __P((struct vm_map *, vsize_t,
void uvm_km_free __P((struct vm_map *, vaddr_t, vsize_t));
void uvm_km_free_wakeup __P((struct vm_map *, vaddr_t,
vsize_t));
vaddr_t uvm_km_kmemalloc1 __P((struct vm_map *, struct
uvm_object *, vsize_t, vsize_t, voff_t, int));
vaddr_t uvm_km_kmemalloc __P((struct vm_map *, struct
uvm_object *, vsize_t, int));
struct vm_map *uvm_km_suballoc __P((struct vm_map *, vaddr_t *,
vaddr_t *, vsize_t, int, boolean_t,
struct vm_map *));
vaddr_t uvm_km_valloc1 __P((struct vm_map *, vsize_t,
vsize_t, voff_t, uvm_flag_t));
vsize_t, voff_t, uvm_flag_t));
vaddr_t uvm_km_valloc __P((struct vm_map *, vsize_t));
vaddr_t uvm_km_valloc_align __P((struct vm_map *, vsize_t,
vsize_t));
@ -611,14 +613,35 @@ vaddr_t uvm_km_alloc_poolpage1 __P((struct vm_map *,
struct uvm_object *, boolean_t));
void uvm_km_free_poolpage1 __P((struct vm_map *, vaddr_t));
#define uvm_km_valloc(map, size) \
uvm_km_valloc1(map, size, 0, UVM_UNKNOWN_OFFSET, UVM_KMF_NOWAIT)
#define uvm_km_valloc_align(map, size, align) \
uvm_km_valloc1(map, size, align, UVM_UNKNOWN_OFFSET, UVM_KMF_NOWAIT)
#define uvm_km_valloc_prefer_wait(map, size, prefer) \
uvm_km_valloc1(map, size, 0, prefer, 0)
#define uvm_km_valloc_wait(map, size) \
uvm_km_valloc1(map, size, 0, UVM_UNKNOWN_OFFSET, 0)
extern __inline__ vaddr_t
uvm_km_kmemalloc(struct vm_map *map, struct uvm_object *obj, vsize_t sz, int flags)
{
return uvm_km_kmemalloc1(map, obj, sz, 0, UVM_UNKNOWN_OFFSET, flags);
}
extern __inline__ vaddr_t
uvm_km_valloc(struct vm_map *map, vsize_t sz)
{
return uvm_km_valloc1(map, sz, 0, UVM_UNKNOWN_OFFSET, UVM_KMF_NOWAIT);
}
extern __inline__ vaddr_t
uvm_km_valloc_align(struct vm_map *map, vsize_t sz, vsize_t align)
{
return uvm_km_valloc1(map, sz, align, UVM_UNKNOWN_OFFSET, UVM_KMF_NOWAIT);
}
extern __inline__ vaddr_t
uvm_km_valloc_prefer_wait(struct vm_map *map, vsize_t sz, voff_t prefer)
{
return uvm_km_valloc1(map, sz, 0, prefer, 0);
}
extern __inline__ vaddr_t
uvm_km_valloc_wait(struct vm_map *map, vsize_t sz)
{
return uvm_km_valloc1(map, sz, 0, UVM_UNKNOWN_OFFSET, 0);
}
#define uvm_km_alloc_poolpage(waitok) \
uvm_km_alloc_poolpage1(kmem_map, NULL, (waitok))

45
sys/uvm/uvm_km.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_km.c,v 1.65 2003/12/18 08:15:42 pk Exp $ */
/* $NetBSD: uvm_km.c,v 1.66 2003/12/18 15:02:04 pk Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -134,7 +134,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.65 2003/12/18 08:15:42 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.66 2003/12/18 15:02:04 pk Exp $");
#include "opt_uvmhist.h"
@ -360,15 +360,18 @@ uvm_km_pgremove_intrsafe(start, end)
* free VM space in the map... caller should be prepared to handle
* this case.
* => we return KVA of memory allocated
* => align,prefer - passed on to uvm_map()
* => flags: NOWAIT, VALLOC - just allocate VA, TRYLOCK - fail if we can't
* lock the map
*/
vaddr_t
uvm_km_kmemalloc(map, obj, size, flags)
uvm_km_kmemalloc1(map, obj, size, align, prefer, flags)
struct vm_map *map;
struct uvm_object *obj;
vsize_t size;
vsize_t align;
voff_t prefer;
int flags;
{
vaddr_t kva, loopva;
@ -392,10 +395,10 @@ uvm_km_kmemalloc(map, obj, size, flags)
* allocate some virtual space
*/
if (__predict_false(uvm_map(map, &kva, size, obj, UVM_UNKNOWN_OFFSET,
0, UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_NONE,
UVM_ADV_RANDOM,
(flags & (UVM_KMF_TRYLOCK | UVM_KMF_NOWAIT))))
if (__predict_false(uvm_map(map, &kva, size, obj, prefer, align,
UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_NONE,
UVM_ADV_RANDOM,
(flags & (UVM_KMF_TRYLOCK | UVM_KMF_NOWAIT))))
!= 0)) {
UVMHIST_LOG(maphist, "<- done (no VM)",0,0,0,0);
return(0);
@ -657,6 +660,34 @@ uvm_km_valloc1(map, size, align, prefer, flags)
/*NOTREACHED*/
}
/* Function definitions for binary compatibility */
vaddr_t
uvm_km_kmemalloc(struct vm_map *map, struct uvm_object *obj,
vsize_t sz, int flags)
{
return uvm_km_kmemalloc1(map, obj, sz, 0, UVM_UNKNOWN_OFFSET, flags);
}
vaddr_t uvm_km_valloc(struct vm_map *map, vsize_t sz)
{
return uvm_km_valloc1(map, sz, 0, UVM_UNKNOWN_OFFSET, UVM_KMF_NOWAIT);
}
vaddr_t uvm_km_valloc_align(struct vm_map *map, vsize_t sz, vsize_t align)
{
return uvm_km_valloc1(map, sz, align, UVM_UNKNOWN_OFFSET, UVM_KMF_NOWAIT);
}
vaddr_t uvm_km_valloc_prefer_wait(struct vm_map *map, vsize_t sz, voff_t prefer)
{
return uvm_km_valloc1(map, sz, 0, prefer, 0);
}
vaddr_t uvm_km_valloc_wait(struct vm_map *map, vsize_t sz)
{
return uvm_km_valloc1(map, sz, 0, UVM_UNKNOWN_OFFSET, 0);
}
/* Sanity; must specify both or none. */
#if (defined(PMAP_MAP_POOLPAGE) || defined(PMAP_UNMAP_POOLPAGE)) && \
(!defined(PMAP_MAP_POOLPAGE) || !defined(PMAP_UNMAP_POOLPAGE))