From nobody Wed Mar 30 19:59:40 2022 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 296711A5C3E2; Wed, 30 Mar 2022 19:59:41 +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 4KTHMc5Vdwz3mmy; Wed, 30 Mar 2022 19:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648670381; 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=GQJMTu7cx7JzFooPhWfYOwMURuH9zWCL+GRzM+qDaZU=; b=JqYMxl3sBiKuqsghfwkKFvSiz4PEIYbpM0xYzRtQyamCtLPavFFrJq4n87dyPvmtBYq5/b oWc8lUpuLjjPJMe1Vs8jRAAARmp3zskBwXTq5aHyLF/+e/BuArkEucERWwSnXT4VaA1cT1 tNilINRM/TtzVizK8jMV9xUiWI+RJViGwIH3vMopEHsgBA82iBqgWY0pl7Wg3lWsg3HCSR GrKzQkgbFtsPRboB2wp/nD9ZnDlJ6WIqLd06H8H0MQsJ0930WcWEwXMJmsWm21ZiXmGRMK DE/2qhfrebxjqyTukeawIOOOeCknQpeiqPceJPhlOVmXanqzLnPGZMrUrRBTRQ== 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 6E57719762; Wed, 30 Mar 2022 19:59:40 +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 22UJxe2E058142; Wed, 30 Mar 2022 19:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UJxeBa058141; Wed, 30 Mar 2022 19:59:40 GMT (envelope-from git) Date: Wed, 30 Mar 2022 19:59:40 GMT Message-Id: <202203301959.22UJxeBa058141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d53927b0bae4 - main - uma: Don't allow a limit to be set in a warm zone 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d53927b0bae45bf5b4b206b2dddf37bab319a1b3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648670381; 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=GQJMTu7cx7JzFooPhWfYOwMURuH9zWCL+GRzM+qDaZU=; b=TveHvJVbRXcrdOL3z8henBbJ17GsXUcCNqzbyF9rtIBlZGK1rT9Ya12OM7uJaLCh+4tUmQ 7b5FYmcR0KEuzNhBUSz4/S8gT4fkgmvnkntkmtxay3XxWZ/eSU1bXCQ6FCpugZ83a2AHBe +vHRClMCmM+3+141Sr5UnfabHLlySBCIL5OCfJlDj2jTaAzQpb8ibEJZvCUwReczQC7hf/ b4mJTSJ7enBnIkWAnoIE2O+VnhygREzOGhKGx/xgcVEOANKsGS84DJ23Tht38qLQ/AVshM Q4w5wStztJa17OmzqgSyDqdwnCmSpN686Gn4JbxzRjNDsAsaFzT1tVMRf7knYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648670381; a=rsa-sha256; cv=none; b=bTaRmLbMVwA6hmXrQPR+25w2AkZb0+ZR7A+aTebci63NC/nRWku10RnIcghp8YZYTR1XGe 90X3emyCWSgPa3sbhJ3BFCJ53Gp/GTnfYejRDDW3keMa7tQdmn6Er2abb3mM7vyZ93gER0 vkfO6MIo4rF2jb2bsEOFBh7QdbFg9ASwoAAmDf2F/AWaIhVm+QnxtnE4tDkR8xNxXEBZjh AbpyLZKUCp7HtR9q3Gf2+ssWXQgkMDfFzGysFPbajPxStkq8onmAAa/Nam++ipDCg4xjm2 OYIYgfjc7dbLxxW4jE2FRhBln+IXnHpOZ4LsegjrdNdsCWW+KvcInyc/CUYhRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d53927b0bae45bf5b4b206b2dddf37bab319a1b3 commit d53927b0bae45bf5b4b206b2dddf37bab319a1b3 Author: Mark Johnston AuthorDate: 2022-03-30 19:42:18 +0000 Commit: Mark Johnston CommitDate: 2022-03-30 19:42:18 +0000 uma: Don't allow a limit to be set in a warm zone The limit accounting in UMA does not tolerate this. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- 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 f179e87d87ac..958442fe73e2 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -4880,6 +4880,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);