git: b333b8799af0 - releng/15.1 - uipc_shm.c: make large page allocation interruptible
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 09 May 2026 20:44:21 UTC
The branch releng/15.1 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=b333b8799af00b2b95681219a6b222403c3bfdc9
commit b333b8799af00b2b95681219a6b222403c3bfdc9
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-04-28 02:34:49 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-05-09 20:44:10 +0000
uipc_shm.c: make large page allocation interruptible
Approved by: re (cperciva)
(cherry picked from commit 839d3266d8c6f6471cb92a3c0ae32eb16d117427)
(cherry picked from commit c335dafd77363b67493d37ab260bc82e70c8cfa7)
---
sys/kern/uipc_shm.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index 0ad5be2e8d71..197409d97f0c 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -829,12 +829,20 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie)
* object lock might allowed mapping of them.
*/
while (object->size < newobjsz) {
+ error = sig_intr();
+ if (error != 0)
+ return (error);
m = vm_page_alloc_contig(object, object->size, aflags,
pagesizes[psind] / PAGE_SIZE, 0, ~0,
pagesizes[psind], 0,
VM_MEMATTR_DEFAULT);
if (m == NULL) {
VM_OBJECT_WUNLOCK(object);
+ error = sig_intr();
+ if (error != 0) {
+ VM_OBJECT_WLOCK(object);
+ return (error);
+ }
if (shmfd->shm_lp_alloc_policy ==
SHM_LARGEPAGE_ALLOC_NOWAIT ||
(shmfd->shm_lp_alloc_policy ==