upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

posix shm: mark backing objects with SHM_POSIXSHM flag

Browse source 
and consistently store the pointer to shmfd into pager priv data space.

Reviewed by:	markj
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D46970
This commit is contained in:
Konstantin Belousov 2024-10-07 04:26:38 +03:00
parent 71a66883b5
commit a10870ecea
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/kern/uipc_shm.c
View file

@ -945,15 +945,20 @@ shm_alloc(struct ucred *ucred, mode_t mode, bool largepage)
shmfd->shm_gid = ucred->cr_gid;
shmfd->shm_mode = mode;
if (largepage) {
shmfd->shm_object = phys_pager_allocate(NULL,
obj = shmfd->shm_object = phys_pager_allocate(NULL,
&shm_largepage_phys_ops, NULL, shmfd->shm_size,
VM_PROT_DEFAULT, 0, ucred);
VM_OBJECT_WLOCK(shmfd->shm_object);
obj->un_pager.phys.phys_priv = shmfd;
vm_object_set_flag(obj, OBJ_POSIXSHM);
VM_OBJECT_WUNLOCK(shmfd->shm_object);
shmfd->shm_lp_alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT;
} else {
obj = vm_pager_allocate(shmfd_pager_type, NULL,
shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred);
VM_OBJECT_WLOCK(obj);
obj->un_pager.swp.swp_priv = shmfd;
vm_object_set_flag(obj, OBJ_POSIXSHM);
VM_OBJECT_WUNLOCK(obj);
shmfd->shm_object = obj;
}
@ -993,11 +998,12 @@ shm_drop(struct shmfd *shmfd)
rangelock_destroy(&shmfd->shm_rl);
mtx_destroy(&shmfd->shm_mtx);
obj = shmfd->shm_object;
if (!shm_largepage(shmfd)) {
VM_OBJECT_WLOCK(obj);
VM_OBJECT_WLOCK(obj);
if (shm_largepage(shmfd))
obj->un_pager.phys.phys_priv = NULL;
else
obj->un_pager.swp.swp_priv = NULL;
VM_OBJECT_WUNLOCK(obj);
}
VM_OBJECT_WUNLOCK(obj);
vm_object_deallocate(obj);
free(shmfd, M_SHMFD);
}

2
sys/vm/vm_object.h
View file

@ -172,6 +172,7 @@ struct vm_object {
void *data_ptr;
uintptr_t data_val;
};
void *phys_priv;
} phys;
} un_pager;
struct ucred *cred;
@ -202,6 +203,7 @@ struct vm_object {
#define OBJ_PAGERPRIV1 0x00004000 /* Pager private */
#define OBJ_PAGERPRIV2 0x00008000 /* Pager private */
#define OBJ_SYSVSHM 0x00010000 /* SysV SHM */
#define OBJ_POSIXSHM 0x00020000 /* Posix SHM */
/*
* Helpers to perform conversion between vm_object page indexes and offsets.