From nobody Fri May 1 01:15:45 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g6Clk0gHrz6cf2Z for ; Fri, 01 May 2026 01:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6Clj72bZz474B for ; Fri, 01 May 2026 01:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777598146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D9P+P3Sl6edx7woW6//a6uoXteXegRct9RSJ7FPSm4Q=; b=jBQMKDl+8KhVNU0S59gW3SOSjohLabsUPM3jeN0SLWZyZemIyWo7A0bVVXIJX/blDzHDkC sU2Ym/1T2gdp/kw+mFwnvT3u5zgUUvsIVTyADtEsp11+JiajsBDAHPlImD4i+AwabuKc3P CzwOMYXC/jqEeFZ4RlJ7To0yQC8Pb9x7DwP5Ri3K7N93kHPAoNtF+ltxUTpBynFQCojGHy QAK7Z2peUi3ZLGixsdeu1y0uZcBfMz9NsXuzxEBZtoQ2OOVu5HBAED2sh9vBeejTaeC3mK J3EZ6bg2p9WGTg5ZZjGyIq+ZolWUhUT9j/3eHHotARHWNTa1oz/XupnTMEQgLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777598146; a=rsa-sha256; cv=none; b=ZGlpnrxICyOD6d6de8YiMAXy1jspaCVF3WPTgfIQEiK4z94WyTbFk/1FU9e2zMM5C4Vk4e VhCgUGhK9xpEC94FHqRcezse2RbWUs6rBj2dT5zFu7Yj2LGwKGYdfS7C9zVoCiMVaewHX9 tZ6VjCzsvmuqC/E6QJZVzKLKSsfdV7NoD2gpTPEuLIEbt2SvwwZhgli9xf7/lFhQHbecwf BM8p4Brt06mJQ1TueHA/5QdGhOKnbUsjOGnXflFeCXNNd0CdwDxV07fXBd9MMCCsL+NuQM fw7tEA6snfrQkMhLgrS3YF4ScTA75A+yJfKV4hktkCvV9KrTP+oFlIohzpD9yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777598146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D9P+P3Sl6edx7woW6//a6uoXteXegRct9RSJ7FPSm4Q=; b=cdNgJ/xmBkglwRemHVBVMGoHXA7Om7WEoiz2hf5kR/LGWQCOKSQR/fqEOdqEHJIUqZi65H JWpE40/2GlcshiuVlVWTqmXPAYTz/SilJZAkFUjrVhxw8s37kTPH+hqkpu+DZ25oBee+Ab DN5U8Dl8tLOxiCMMO1sz5AaHPjKIRM+zKQdlRcdsIUcyeISajaJ0rnAI0lr5r/lQHrPg5K 7vfVZBG0pJ6eAIWuyiUv6SxqzJsrxk/uTwhIt6GZ8ITUxwCQhczp177t5oivg3gvTIjCaW 61P6XM1sVFqOGonq8l1kk7cOy45+O0dSi5L+btGWrYhO4/RHxX4YzD92Vcd+fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6Clj6dm7zdCb for ; Fri, 01 May 2026 01:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 01:15:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 839d3266d8c6 - main - uipc_shm.c: make large page allocation interruptible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 839d3266d8c6f6471cb92a3c0ae32eb16d117427 Auto-Submitted: auto-generated Date: Fri, 01 May 2026 01:15:45 +0000 Message-Id: <69f3fec1.38e74.264f4dbb@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=839d3266d8c6f6471cb92a3c0ae32eb16d117427 commit 839d3266d8c6f6471cb92a3c0ae32eb16d117427 Author: Konstantin Belousov AuthorDate: 2026-04-28 02:34:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-01 01:06:42 +0000 uipc_shm.c: make large page allocation interruptible in cases there is no page pressure or when the user lost patience waiting for very large allocation. Other case is already handled by vm_wait_intr(). Reported by: "Lizzie from Eden Emulator project" Reviewed by: adrian, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56725 --- 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 ==