From nobody Sun May 17 16:24:12 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 4gJR8X75Zpz6fZ2P for ; Sun, 17 May 2026 16:24:12 +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 4gJR8X4KTHz3sVF for ; Sun, 17 May 2026 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779035052; 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=k8us6U29pe1aH396K6TzA5hS+YihbDMPEGURKNVhQgE=; b=GsQF2xnmZmLqHURCG9wAqgKJQDSRZht8/CcoIMCQZKHb24b5f0BU9X4WTsQ2tQl+g7IkmT Bwb3lU5TulYB3vsTZI01SszZsPyuILkf7IPLAN7ZS6K5RGYl2EGsnCOf32nNPhKR3m24MQ 4DcRjO2MlWOieT/bjnlBvQ6KUck/MKH0JPA7vSlMV/Zzevsybvh9XDciqIqjQM0VCoyhuG XJYgNdR9QPZTxWx7vL3aSbwVD4ld1C5LM9rgoD4NGP3UBSB3P/4d2VLP5KFlQoGlxRkfZ/ pF7YwdljytpsBNKYZ3UBtE/8exOCSTqQpnVp5xwQIUXZm4Uk2UaThvj93DvtqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779035052; a=rsa-sha256; cv=none; b=TrGjbrLdhnI2/fPVTCSu8xlKrJZtcMRIaaz4odyOTndy057/ahAXkyY/mIWs+5nka8gu0G HB11Ay10Hh4RgdgF4dHBXmaNtty7syQRe7xIizFr0vQiKTB/sBVH7BKB5J00Z5fYDngiMh qceNGMADK7w2MQcLvOHnRJBWxUJYYLBK/PAZ8EZ8a6L+flr0BGVrivWyJGPuVIVmN0kk1r KGnYM6QA7jYp5D6DNlaUiy+dlhthqZonhRACAQkzXizSf64+b0AZ6B4bY0Zn9e/oCjXxmp CohTtOtQQQCWrcZJrbdkDxWA3ea+cSFnToNKKk3oObT72XDTETeBySXIF7T5YQ== 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=1779035052; 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=k8us6U29pe1aH396K6TzA5hS+YihbDMPEGURKNVhQgE=; b=BYsZqdlhZspNavkLnNAPZ+TisPxNI7EBCKUey8bU9zkXheI0opkejJaGorJquPtx+CJcI9 eDDN8oecor6g6pCayKAYCO/c4ZQByTq7ft2nF3Kaz9d1pLFDKT9eSKxrCPnOVYcRrhtiyv z5vBDbHchC5+mM6IbU7FfdV6mrcis/+rdbIUEp0gSFnm8idMEaQ0PS2T67hRmJbAEoHB1X i+yk7UoT3OF01QEZfol6MdhE+ZItSxQzDctZN1wBEFAsjltC1FkacVHxsnvbR1w/gf/zIc awYekBxBLVyGXQ3614itx4yMrm74kG9qSz5PXo4ucs7FehCHfKWEmcX1e1L4iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJR8X3jnszpg7 for ; Sun, 17 May 2026 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 180b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 16:24:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 363ea40c7654 - main - limits: Further RLIMIT_VMM cleanup 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 363ea40c765424b3cbd9b96790235af030fcc8ff Auto-Submitted: auto-generated Date: Sun, 17 May 2026 16:24:12 +0000 Message-Id: <6a09ebac.180b1.3301129f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=363ea40c765424b3cbd9b96790235af030fcc8ff commit 363ea40c765424b3cbd9b96790235af030fcc8ff Author: Dag-Erling Smørgrav AuthorDate: 2026-05-17 16:23:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-17 16:23:50 +0000 limits: Further RLIMIT_VMM cleanup Teach limits(1), sh(1), and setclassresources(3) about RLIMIT_VMM. Fixes: 1092ec8b3375 ("kern: Introduce RLIMIT_VMM") Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D57031 --- bin/sh/miscbltin.c | 5 ++++- lib/libutil/login_class.c | 1 + usr.bin/limits/limits.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index bbf0aa5b8bde..f96f96ba43d2 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -517,6 +517,9 @@ static const struct limits limits[] = { #endif #ifdef RLIMIT_PIPEBUF { "pipebuf", (char *)0, RLIMIT_PIPEBUF, 1024, 'y' }, +#endif +#ifdef RLIMIT_VMM + { "virtual machines", (char *)0, RLIMIT_VMM, 1, 'V' }, #endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -553,7 +556,7 @@ ulimitcmd(int argc __unused, char **argv __unused) struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpwkoy")) != '\0') + while ((optc = nextopt("abcdfHklmnopSstuVvwy")) != '\0') switch (optc) { case 'H': how = HARD; diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 9478b4dc98ca..90e4e01f7c3b 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -66,6 +66,7 @@ static struct login_res { { "kqueues", login_getcapsize, RLIMIT_KQUEUES }, { "umtxp", login_getcapnum, RLIMIT_UMTXP }, { "pipebuf", login_getcapnum, RLIMIT_PIPEBUF }, + { "vms", login_getcapnum, RLIMIT_VMM }, { NULL, 0, 0 } }; diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 57551c556c25..fbb19289e6ca 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -92,6 +92,7 @@ static struct { { " kqueues%-4s %8s", "\n", 1 }, { " umtxp%-4s %8s", "\n", 1 }, { " pipebuf%-4s %8s", " kB\n", 1024 }, + { " vms%-4s %8s", "\n", 1 }, } }, { "sh", "unlimited", "", " -H", " -S", "", @@ -112,6 +113,7 @@ static struct { { "ulimit%s -k %s", ";\n", 1 }, { "ulimit%s -o %s", ";\n", 1 }, { "ulimit%s -y %s", ";\n", 1024 }, + { "ulimit%s -V %s", ";\n", 1 }, } }, { "csh", "unlimited", "", " -h", "", NULL,