Author: jhb
Date: Mon Sep 9 18:11:59 2013
New Revision: 255426
URL: http://svnweb.freebsd.org/changeset/base/255426
Log:
Add a mmap flag (MAP_32BIT) on 64-bit platforms to request that a mapping use
an address in the first 2GB of the process's address space. This flag should
have the same semantics as the same flag on Linux.
To facilitate this, add a new parameter to vm_map_find() that specifies an
optional maximum virtual address. While here, fix several callers of
vm_map_find() to use a VMFS_* constant for the findspace argument instead of
TRUE and FALSE.
Reviewed by: alc
Approved by: re (kib)
Modified:
head/lib/libc/sys/mmap.2
head/sys/compat/freebsd32/freebsd32_misc.c
head/sys/compat/linux/linux_misc.c
head/sys/compat/svr4/imgact_svr4.c
head/sys/dev/drm2/i915/i915_gem.c
head/sys/i386/ibcs2/imgact_coff.c
head/sys/i386/linux/imgact_linux.c
head/sys/ia64/ia32/ia32_signal.c
head/sys/kern/imgact_elf.c
head/sys/kern/imgact_gzip.c
head/sys/kern/init_main.c
head/sys/kern/link_elf.c
head/sys/kern/link_elf_obj.c
head/sys/kern/sys_pipe.c
head/sys/kern/sysv_shm.c
head/sys/kern/uipc_shm.c
head/sys/sparc64/sparc64/pmap.c
head/sys/sys/mman.h
head/sys/vm/vm_init.c
head/sys/vm/vm_kern.c
head/sys/vm/vm_map.c
head/sys/vm/vm_map.h
head/sys/vm/vm_mmap.c
head/usr.bin/kdump/mksubr
head/usr.bin/truss/syscalls.c
Modified: head/lib/libc/sys/mmap.2
==============================================================================
--- head/lib/libc/sys/mmap.2 Mon Sep 9 17:38:02 2013 (r255425)
+++ head/lib/libc/sys/mmap.2 Mon Sep 9 18:11:59 2013 (r255426)
@@ -28,7 +28,7 @@
.\" @(#)mmap.2 8.4 (Berkeley) 5/11/95
.\" $FreeBSD$
.\"
-.Dd August 16, 2013
+.Dd September 9, 2013
.Dt MMAP 2
.Os
.Sh NAME
@@ -98,6 +98,12 @@ argument by
.Em or Ns 'ing
the following values:
.Bl -tag -width MAP_PREFAULT_READ
+.It Dv MAP_32BIT
+Request a region in the first 2GB of the current process's address space.
+If a suitable region cannot be found,
+.Fn mmap
+will fail.
+This flag is only available on 64-bit platforms.
.It Dv MAP_ALIGNED Ns Pq Fa n
Align the region on a requested boundary.
If a suitable region cannot be found,
@@ -362,6 +368,13 @@ was specified and the
argument was not page aligned, or part of the desired address space
resides out of the valid address space for a user process.
.It Bq Er EINVAL
+Both
+.Dv MAP_FIXED
+and
+.Dv MAP_32BIT
+were specified and part of the desired address space resides outside
+of the first 2GB of user address space.
+.It Bq Er EINVAL
The
.Fa len
argument
Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/compat/freebsd32/freebsd32_misc.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -448,9 +448,8 @@ freebsd32_mmap_partial(struct thread *td
}
} else {
vm_offset_t addr = trunc_page(start);
- rv = vm_map_find(map, 0, 0,
- &addr, PAGE_SIZE, FALSE, prot,
- VM_PROT_ALL, 0);
+ rv = vm_map_find(map, NULL, 0, &addr, PAGE_SIZE, 0,
+ VMFS_NO_SPACE, prot, VM_PROT_ALL, 0);
if (rv != KERN_SUCCESS)
return (EINVAL);
}
@@ -542,9 +541,8 @@ freebsd32_mmap(struct thread *td, struct
rv = vm_map_remove(map, start, end);
if (rv != KERN_SUCCESS)
return (EINVAL);
- rv = vm_map_find(map, 0, 0,
- &start, end - start, FALSE,
- prot, VM_PROT_ALL, 0);
+ rv = vm_map_find(map, NULL, 0, &start, end - start,
+ 0, VMFS_NO_SPACE, prot, VM_PROT_ALL, 0);
if (rv != KERN_SUCCESS)
return (EINVAL);
r.fd = fd;
Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/compat/linux/linux_misc.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -410,8 +410,8 @@ linux_uselib(struct thread *td, struct l
/* get anon user mapping, read+write+execute */
error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0,
- &vmaddr, a_out->a_text + a_out->a_data, FALSE, VM_PROT_ALL,
- VM_PROT_ALL, 0);
+ &vmaddr, a_out->a_text + a_out->a_data, 0, VMFS_NO_SPACE,
+ VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
goto cleanup;
@@ -455,7 +455,8 @@ linux_uselib(struct thread *td, struct l
/* allocate some 'anon' space */
error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0,
- &vmaddr, bss_size, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
+ &vmaddr, bss_size, 0, VMFS_NO_SPACE, VM_PROT_ALL,
+ VM_PROT_ALL, 0);
if (error)
goto cleanup;
}
Modified: head/sys/compat/svr4/imgact_svr4.c
==============================================================================
--- head/sys/compat/svr4/imgact_svr4.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/compat/svr4/imgact_svr4.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -140,8 +140,8 @@ exec_svr4_imgact(imgp)
*/
vmaddr = virtual_offset;
error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
- a_out->a_text + a_out->a_data + bss_size, FALSE,
- VM_PROT_ALL, VM_PROT_ALL, 0);
+ a_out->a_text + a_out->a_data + bss_size, 0, VMFS_NO_SPACE,
+ VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
goto fail;
@@ -204,7 +204,7 @@ exec_svr4_imgact(imgp)
if (bss_size != 0) {
vmaddr = virtual_offset + a_out->a_text + a_out->a_data;
error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
- bss_size, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
+ bss_size, 0, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
goto fail;
#ifdef DEBUG
Modified: head/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/dev/drm2/i915/i915_gem.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -1291,7 +1291,7 @@ i915_gem_mmap_ioctl(struct drm_device *d
addr = 0;
vm_object_reference(obj->vm_obj);
DRM_UNLOCK(dev);
- rv = vm_map_find(map, obj->vm_obj, args->offset, &addr, args->size,
+ rv = vm_map_find(map, obj->vm_obj, args->offset, &addr, args->size, 0,
VMFS_OPTIMAL_SPACE, VM_PROT_READ | VM_PROT_WRITE,
VM_PROT_READ | VM_PROT_WRITE, MAP_INHERIT_SHARE);
if (rv != KERN_SUCCESS) {
Modified: head/sys/i386/ibcs2/imgact_coff.c
==============================================================================
--- head/sys/i386/ibcs2/imgact_coff.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/i386/ibcs2/imgact_coff.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -128,7 +128,7 @@ load_coff_section(struct vmspace *vmspac
if (map_len != 0) {
error = vm_map_find(&vmspace->vm_map, NULL, 0, &map_addr,
- map_len, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
+ map_len, 0, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
return (vm_mmap_to_errno(error));
}
@@ -473,7 +473,7 @@ exec_coff_imgact(imgp)
DPRINTF(("imgact: error = %d\n", error));
vm_map_find(&vmspace->vm_map, NULL, 0,
- (vm_offset_t *)&hole, PAGE_SIZE, VMFS_NO_SPACE,
+ (vm_offset_t *)&hole, PAGE_SIZE, 0, VMFS_NO_SPACE,
VM_PROT_ALL, VM_PROT_ALL, 0);
DPRINTF(("IBCS2: start vm_dsize = 0x%x, vm_daddr = 0x%p end = 0x%p\n",
ctob(vmspace->vm_dsize), vmspace->vm_daddr,
Modified: head/sys/i386/linux/imgact_linux.c
==============================================================================
--- head/sys/i386/linux/imgact_linux.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/i386/linux/imgact_linux.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -139,8 +139,8 @@ exec_linux_imgact(struct image_params *i
*/
vmaddr = virtual_offset;
error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
- a_out->a_text + a_out->a_data + bss_size, FALSE,
- VM_PROT_ALL, VM_PROT_ALL, 0);
+ a_out->a_text + a_out->a_data + bss_size, 0, VMFS_NO_SPACE,
+ VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
goto fail;
@@ -204,7 +204,7 @@ exec_linux_imgact(struct image_params *i
if (bss_size != 0) {
vmaddr = virtual_offset + a_out->a_text + a_out->a_data;
error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
- bss_size, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
+ bss_size, 0, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
goto fail;
#ifdef DEBUG
Modified: head/sys/ia64/ia32/ia32_signal.c
==============================================================================
--- head/sys/ia64/ia32/ia32_signal.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/ia64/ia32/ia32_signal.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -169,8 +169,8 @@ ia32_setregs(struct thread *td, struct i
* Build the GDT and LDT.
*/
gdt = sv->sv_usrstack;
- vm_map_find(&vmspace->vm_map, 0, 0, &gdt, IA32_PAGE_SIZE << 1, 0,
- VM_PROT_ALL, VM_PROT_ALL, 0);
+ vm_map_find(&vmspace->vm_map, NULL, 0, &gdt, IA32_PAGE_SIZE << 1, 0,
+ VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
ldt = gdt + IA32_PAGE_SIZE;
desc.sd_lolimit = 8*NLDT-1;
Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/imgact_elf.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -417,8 +417,9 @@ __elfN(map_insert)(vm_map_t map, vm_obje
* The mapping is not page aligned. This means we have
* to copy the data. Sigh.
*/
- rv = vm_map_find(map, NULL, 0, &start, end - start,
- FALSE, prot | VM_PROT_WRITE, VM_PROT_ALL, 0);
+ rv = vm_map_find(map, NULL, 0, &start, end - start, 0,
+ VMFS_NO_SPACE, prot | VM_PROT_WRITE, VM_PROT_ALL,
+ 0);
if (rv)
return (rv);
if (object == NULL)
Modified: head/sys/kern/imgact_gzip.c
==============================================================================
--- head/sys/kern/imgact_gzip.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/imgact_gzip.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -269,12 +269,9 @@ do_aout_hdr(struct imgact_gzip * gz)
*/
vmaddr = gz->virtual_offset + gz->a_out.a_text +
gz->a_out.a_data;
- error = vm_map_find(&vmspace->vm_map,
- NULL,
- 0,
- &vmaddr,
- gz->bss_size,
- FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
+ error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
+ gz->bss_size, 0, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL,
+ 0);
if (error) {
gz->where = __LINE__;
return (error);
Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/init_main.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -709,8 +709,8 @@ start_init(void *dummy)
* Need just enough stack to hold the faked-up "execve()" arguments.
*/
addr = p->p_sysent->sv_usrstack - PAGE_SIZE;
- if (vm_map_find(&p->p_vmspace->vm_map, NULL, 0, &addr, PAGE_SIZE,
- FALSE, VM_PROT_ALL, VM_PROT_ALL, 0) != 0)
+ if (vm_map_find(&p->p_vmspace->vm_map, NULL, 0, &addr, PAGE_SIZE, 0,
+ VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0) != 0)
panic("init: couldn't allocate argument space");
p->p_vmspace->vm_maxsaddr = (caddr_t)addr;
p->p_vmspace->vm_ssize = 1;
Modified: head/sys/kern/link_elf.c
==============================================================================
--- head/sys/kern/link_elf.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/link_elf.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -891,7 +891,7 @@ link_elf_load_file(linker_class_t cls, c
}
ef->address = (caddr_t) vm_map_min(kernel_map);
error = vm_map_find(kernel_map, ef->object, 0,
- (vm_offset_t *) &ef->address, mapsize, 1,
+ (vm_offset_t *) &ef->address, mapsize, 0, VMFS_OPTIMAL_SPACE,
VM_PROT_ALL, VM_PROT_ALL, 0);
if (error != 0) {
vm_object_deallocate(ef->object);
Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/kern/link_elf_obj.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -689,7 +689,8 @@ link_elf_load_file(linker_class_t cls, c
mapbase = VM_MIN_KERNEL_ADDRESS;
#endif
error = vm_map_find(kernel_map, ef->object, 0, &mapbase,
- round_page(mapsize), TRUE, VM_PROT_ALL, VM_PROT_ALL, FALSE);
+ round_page(mapsize), 0, VMFS_OPTIMAL_SPACE, VM_PROT_ALL,
+ VM_PROT_ALL, 0);
if (error) {
vm_object_deallocate(ef->object);
ef->object = 0;
Modified: head/sys/kern/sys_pipe.c
==============================================================================
--- head/sys/kern/sys_pipe.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/sys_pipe.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -524,7 +524,7 @@ retry:
buffer = (caddr_t) vm_map_min(pipe_map);
error = vm_map_find(pipe_map, NULL, 0,
- (vm_offset_t *) &buffer, size, 1,
+ (vm_offset_t *) &buffer, size, 0, VMFS_ANY_SPACE,
VM_PROT_ALL, VM_PROT_ALL, 0);
if (error != KERN_SUCCESS) {
if ((cpipe->pipe_buffer.buffer == NULL) &&
Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/sysv_shm.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -413,7 +413,7 @@ kern_shmat(td, shmid, shmaddr, shmflg)
vm_object_reference(shmseg->object);
rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->object,
- 0, &attach_va, size, (flags & MAP_FIXED) ? VMFS_NO_SPACE :
+ 0, &attach_va, size, 0, (flags & MAP_FIXED) ? VMFS_NO_SPACE :
VMFS_OPTIMAL_SPACE, prot, prot, MAP_INHERIT_SHARE);
if (rv != KERN_SUCCESS) {
vm_object_deallocate(shmseg->object);
Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/kern/uipc_shm.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -954,7 +954,7 @@ shm_map(struct file *fp, size_t size, of
ofs = offset & PAGE_MASK;
offset = trunc_page(offset);
size = round_page(size + ofs);
- rv = vm_map_find(kernel_map, obj, offset, &kva, size,
+ rv = vm_map_find(kernel_map, obj, offset, &kva, size, 0,
VMFS_OPTIMAL_SPACE, VM_PROT_READ | VM_PROT_WRITE,
VM_PROT_READ | VM_PROT_WRITE, 0);
if (rv == KERN_SUCCESS) {
Modified: head/sys/sparc64/sparc64/pmap.c
==============================================================================
--- head/sys/sparc64/sparc64/pmap.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/sys/sparc64/sparc64/pmap.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -786,7 +786,7 @@ pmap_init(void)
continue;
if (addr < VM_MIN_PROM_ADDRESS || addr > VM_MAX_PROM_ADDRESS)
continue;
- result = vm_map_find(kernel_map, NULL, 0, &addr, size,
+ result = vm_map_find(kernel_map, NULL, 0, &addr, size, 0,
VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT);
if (result != KERN_SUCCESS || addr != translations[i].om_start)
panic("pmap_init: vm_map_find");
Modified: head/sys/sys/mman.h
==============================================================================
--- head/sys/sys/mman.h Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/sys/mman.h Mon Sep 9 18:11:59 2013 (r255426)
@@ -91,6 +91,9 @@
*/
#define MAP_NOCORE 0x00020000 /* dont include these pages in a
coredump */
#define MAP_PREFAULT_READ 0x00040000 /* prefault mapping for reading */
+#ifdef __LP64__
+#define MAP_32BIT 0x00080000 /* map in the low 2GB of address
space */
+#endif
/*
* Request specific alignment (n == log2 of the desired alignment).
Modified: head/sys/vm/vm_init.c
==============================================================================
--- head/sys/vm/vm_init.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/vm/vm_init.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -111,7 +111,7 @@ kva_import(void *unused, vmem_size_t siz
int result;
addr = vm_map_min(kernel_map);
- result = vm_map_find(kernel_map, NULL, 0, &addr, size,
+ result = vm_map_find(kernel_map, NULL, 0, &addr, size, 0,
VMFS_SUPER_SPACE, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT);
if (result != KERN_SUCCESS)
return (ENOMEM);
Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/vm/vm_kern.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -285,7 +285,7 @@ kmem_suballoc(vm_map_t parent, vm_offset
size = round_page(size);
*min = vm_map_min(parent);
- ret = vm_map_find(parent, NULL, 0, min, size, superpage_align ?
+ ret = vm_map_find(parent, NULL, 0, min, size, 0, superpage_align ?
VMFS_SUPER_SPACE : VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL,
MAP_ACC_NO_CHARGE);
if (ret != KERN_SUCCESS)
Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/vm/vm_map.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -1432,8 +1432,8 @@ vm_map_fixed(vm_map_t map, vm_object_t o
int
vm_map_find(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
vm_offset_t *addr, /* IN/OUT */
- vm_size_t length, int find_space, vm_prot_t prot,
- vm_prot_t max, int cow)
+ vm_size_t length, vm_offset_t max_addr, int find_space,
+ vm_prot_t prot, vm_prot_t max, int cow)
{
vm_offset_t alignment, initial_addr, start;
int result;
@@ -1452,7 +1452,8 @@ again:
vm_map_lock(map);
do {
if (find_space != VMFS_NO_SPACE) {
- if (vm_map_findspace(map, start, length, addr)) {
+ if (vm_map_findspace(map, start, length, addr) ||
+ (max_addr != 0 && *addr + length > max_addr)) {
vm_map_unlock(map);
if (find_space == VMFS_OPTIMAL_SPACE) {
find_space = VMFS_ANY_SPACE;
Modified: head/sys/vm/vm_map.h
==============================================================================
--- head/sys/vm/vm_map.h Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/vm/vm_map.h Mon Sep 9 18:11:59 2013 (r255426)
@@ -366,7 +366,7 @@ boolean_t vm_map_check_protection (vm_ma
vm_map_t vm_map_create(pmap_t, vm_offset_t, vm_offset_t);
int vm_map_delete(vm_map_t, vm_offset_t, vm_offset_t);
int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t,
- int, vm_prot_t, vm_prot_t, int);
+ vm_offset_t, int, vm_prot_t, vm_prot_t, int);
int vm_map_fixed(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t, vm_size_t,
vm_prot_t, vm_prot_t, int);
int vm_map_findspace (vm_map_t, vm_offset_t, vm_size_t, vm_offset_t *);
Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c Mon Sep 9 17:38:02 2013 (r255425)
+++ head/sys/vm/vm_mmap.c Mon Sep 9 18:11:59 2013 (r255426)
@@ -94,10 +94,8 @@ SYSCTL_INT(_vm, OID_AUTO, old_mlock, CTL
"Do not apply RLIMIT_MEMLOCK on mlockall");
TUNABLE_INT("vm.old_mlock", &old_mlock);
-#ifndef _SYS_SYSPROTO_H_
-struct sbrk_args {
- int incr;
-};
+#ifdef MAP_32BIT
+#define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31)
#endif
static int vm_mmap_vnode(struct thread *, vm_size_t, vm_prot_t, vm_prot_t *,
@@ -107,6 +105,12 @@ static int vm_mmap_cdev(struct thread *,
static int vm_mmap_shm(struct thread *, vm_size_t, vm_prot_t, vm_prot_t *,
int *, struct shmfd *, vm_ooffset_t, vm_object_t *);
+#ifndef _SYS_SYSPROTO_H_
+struct sbrk_args {
+ int incr;
+};
+#endif
+
/*
* MPSAFE
*/
@@ -278,6 +282,18 @@ sys_mmap(td, uap)
return (EINVAL);
if (addr + size < addr)
return (EINVAL);
+#ifdef MAP_32BIT
+ if (flags & MAP_32BIT && addr + size > MAP_32BIT_MAX_ADDR)
+ return (EINVAL);
+ } else if (flags & MAP_32BIT) {
+ /*
+ * For MAP_32BIT, override the hint if it is too high and
+ * do not bother moving the mapping past the heap (since
+ * the heap is usually above 2GB).
+ */
+ if (addr + size > MAP_32BIT_MAX_ADDR)
+ addr = 0;
+#endif
} else {
/*
* XXX for non-fixed mappings where no hint is provided or
@@ -1620,8 +1636,11 @@ vm_mmap(vm_map_t map, vm_offset_t *addr,
MAP_ALIGNMENT_SHIFT);
else
findspace = VMFS_OPTIMAL_SPACE;
- rv = vm_map_find(map, object, foff, addr, size, findspace,
- prot, maxprot, docow);
+ rv = vm_map_find(map, object, foff, addr, size,
+#ifdef MAP_32BIT
+ flags & MAP_32BIT ? MAP_32BIT_MAX_ADDR :
+#endif
+ 0, findspace, prot, maxprot, docow);
} else
rv = vm_map_fixed(map, object, foff, *addr, size,
prot, maxprot, docow);
Modified: head/usr.bin/kdump/mksubr
==============================================================================
--- head/usr.bin/kdump/mksubr Mon Sep 9 17:38:02 2013 (r255425)
+++ head/usr.bin/kdump/mksubr Mon Sep 9 18:11:59 2013 (r255426)
@@ -497,6 +497,10 @@ egrep "^#[[:space:]]*define[[:space:]]+M
++i; \
printf "\tif (!((flags > 0) ^ ((%s) >
0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i }'
cat <<_EOF_
+#ifdef MAP_32BIT
+ if (!((flags > 0) ^ ((MAP_32BIT) > 0)))
+ if_print_or(flags, MAP_32BIT, or);
+#endif
align = flags & MAP_ALIGNMENT_MASK;
if (align != 0) {
if (align == MAP_ALIGNED_SUPER)
Modified: head/usr.bin/truss/syscalls.c
==============================================================================
--- head/usr.bin/truss/syscalls.c Mon Sep 9 17:38:02 2013
(r255425)
+++ head/usr.bin/truss/syscalls.c Mon Sep 9 18:11:59 2013
(r255426)
@@ -296,7 +296,11 @@ static struct xlat mmap_flags[] = {
X(MAP_SHARED) X(MAP_PRIVATE) X(MAP_FIXED) X(MAP_RENAME)
X(MAP_NORESERVE) X(MAP_RESERVED0080) X(MAP_RESERVED0100)
X(MAP_HASSEMAPHORE) X(MAP_STACK) X(MAP_NOSYNC) X(MAP_ANON)
- X(MAP_NOCORE) X(MAP_PREFAULT_READ) XEND
+ X(MAP_NOCORE) X(MAP_PREFAULT_READ)
+#ifdef MAP_32BIT
+ X(MAP_32BIT)
+#endif
+ XEND
};
static struct xlat mprot_flags[] = {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
