From nobody Wed Apr 13 12:12:58 2022 X-Original-To: dev-commits-src-branches@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 6A5341B02FE5; Wed, 13 Apr 2022 12:12:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KdhLg1KPmz3lfY; Wed, 13 Apr 2022 12:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649851979; 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=4vE5m+7EhsBP0L5wC46ucfCSC1zDTwbRF1DUS/NpBp0=; b=tsoAGNGpNfPmi8+We2BIABxH0wYftTDX4PK3vGvkvN5SISd8mzH424ig8L65YBHq4S3W/y gZJBnioUVz+BN0HEt63GtKSiemny3zOohA7yGJgpHeNC74nQHazMoXOM4Lroce6Yzvdfef TPQNwIwURV7mjym+esIQmuxRefBfBSooCV1n/Tf98/dlhFFD0Pp5oRlwIYzxhaZRlt3Epp aI7OwVnoEjyhGSPfiJ/OrST62Vd8uf1++3H0aU4lwvUhznadFH9UHb+lb28SzM3MGT/9W+ jI9T3VRi9At9o/YQQINjlrCeDoSKvnL3SEdSNAql15PC6Oqd2h42I5AhpFoV4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A9D437CB; Wed, 13 Apr 2022 12:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23DCCw5I094703; Wed, 13 Apr 2022 12:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DCCwg5094702; Wed, 13 Apr 2022 12:12:58 GMT (envelope-from git) Date: Wed, 13 Apr 2022 12:12:58 GMT Message-Id: <202204131212.23DCCwg5094702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f9677b7e742c - stable/13 - uma: Don't allow a limit to be set in a warm zone List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f9677b7e742c95bdb94ee5da8a4fba14c9010a6e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649851979; 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=4vE5m+7EhsBP0L5wC46ucfCSC1zDTwbRF1DUS/NpBp0=; b=gZ2V/VVfl+w9m4xvwRahMTHEsdA2QYHPRS6hLGFrKmwlV0oa9Mv8CVwk3BLlKBNFxjUHZ5 /uVFEXOosBnTIzS2/DummXoxsKhRErIhHGkEvkGD8nUZtxyU6sRJB0yK+N3qZc2dBMlGn7 FAIz3IHYNnIfA5Mz1MqvR8Kkj44cA8UaNhBA/vef5IR3qL7D2x1MiHkTxsjS0sMPrDtpnC WPUZOyoIm2KxMgZHVEHx8eAN3nwE+ftj82QhtGLN5hn5gavINKoCs+gHW9QRlokArkGwP0 yImdPPFPHqdxon/4s3hU7PE4oWAYBzHETmDIB0d6QNInky1UVvzlo0MjsutwGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649851979; a=rsa-sha256; cv=none; b=DUyY1No0l+8iUd5ujOtx/Ph5rS+5t7ik6MCDBJ8SyGAF7dX9fWKRsn1hc3zmRzeuorsx1n KKc55nu6UpbVYzpqoZ5VPVRuG9k0Tm5/OP/lPUThJh087IXck1OXjQI16Lo0Nss1JntDwt s2aDeLOB5/ddsuj9Rsdcl35FCkXvMwgEmfdu58HvYpnIxYufof7bSj2WH7LaTr59Wxu/mX QMn/JJipYun0eCgMF5o84X5YPsgWq/uoxAYeRxaapjkiuFIC2Vh93nUx7JnSgkhbzKvWwq Tm5UY8o/NfYAkWs3cLRmjkcYvLiwHaMZf5HoE+kojD/kHWQAZk1wbUVxcjVoag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f9677b7e742c95bdb94ee5da8a4fba14c9010a6e commit f9677b7e742c95bdb94ee5da8a4fba14c9010a6e Author: Mark Johnston AuthorDate: 2022-03-30 19:42:18 +0000 Commit: Mark Johnston CommitDate: 2022-04-13 12:10:35 +0000 uma: Don't allow a limit to be set in a warm zone The limit accounting in UMA does not tolerate this. Sponsored by: The FreeBSD Foundation (cherry picked from commit d53927b0bae45bf5b4b206b2dddf37bab319a1b3) --- sys/vm/uma_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 211198d02d04..754e9d9ff15e 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -4791,6 +4791,8 @@ uma_zone_set_max(uma_zone_t zone, int nitems) * way to clear a limit. */ ZONE_LOCK(zone); + if (zone->uz_max_items == 0) + ZONE_ASSERT_COLD(zone); zone->uz_max_items = nitems; zone->uz_flags |= UMA_ZFLAG_LIMIT; zone_update_caches(zone);