From nobody Fri Sep 30 02:04:08 2022 X-Original-To: dev-commits-src-all@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 4Mdtnj0C18z4ddvB; Fri, 30 Sep 2022 02:04:09 +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 4Mdtnh6lyhz3ds4; Fri, 30 Sep 2022 02:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503448; 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=hLlRUZqdORXlVYNY+jER0zMp1bDgWbnDp0+FBzrnDww=; b=wVL5+T5k9gBLx+0Y2pilqnV0PYIpvZTvE2ZcCgq/+1fL7Y3LnbXHTVVmkP9LMu3sHk8bjW 93WYl9uXXGdjevnrajsiF0hR1J47XUE4tPdF4N18nWDM+TZ5JfJQKJh+eI5N765wNYKJPj TPmcdxlUcZwC4Z6YLWmjf7mWBfMD13lxWXxBYc8tewkNZEvoljQQ0yPCR5DsvcSqYNfI8+ ov5TfXdBJ+YuSIzSmYCW9OjKHXThz3wKKMM16O/t01VtF9w/dlWvNxVUm+yn85zIbdsqG8 c192U5aSLF47XhSkIeoFzuCl0p+x+dQDd98xw05LaSGT8VzDCTl0NAgdOwDpWg== 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 4Mdtnh5rQRz11fK; Fri, 30 Sep 2022 02:04:08 +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 28U2483X099087; Fri, 30 Sep 2022 02:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28U248bi099086; Fri, 30 Sep 2022 02:04:08 GMT (envelope-from git) Date: Fri, 30 Sep 2022 02:04:08 GMT Message-Id: <202209300204.28U248bi099086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2bcbf601a8e2 - stable/13 - jemalloc: use symbolic definitions for bits in vm_overcommit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2bcbf601a8e24471fa4373c40aca222bb438dcf5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503448; 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=hLlRUZqdORXlVYNY+jER0zMp1bDgWbnDp0+FBzrnDww=; b=tVmWqTwZ2djVYZ3WcmyPL4r7dZHJQ2axvCdWcctRnpp0/GQpjWg5HlAYBeJ4Ed0cdDNZ/3 pEp05zT6dU3GTllb5NST1lZTG261bQjedfcvGuLudQQ17VTY42VmlskzYol4zE8PIixeXG W1/J8hT2gZqKVGdZJ5qaUgozmpBMKsTChYOUrPZgcUPb4+vT3wpQ6nujVyJVfDXgkOyKXs knrCYqvFTnq1SW9KM6RrzwlAH4XTxnyyDGQ5GvX3pvbRq9JA4HI0y5UV19yvDt8y6SUxvp 22WfZn0PQuULW/wtAQMn/VwVrJvSd08cKF8rSw1FEl4cpBmDEe18ezml7OTLJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664503448; a=rsa-sha256; cv=none; b=a9Z/6HKIWOy54+IVyvk3ZEruGh2/pnfTwbX19PgDvDRNxCxw/0750dJzXzWLpQgMeHw9EH 8mB2CNBb1O7PjLj+Qog6DfeIP3IRi+0mjiVXfRXvR/bwKrOLcdE4mRyuQcBl8dRmNh5B5R AGdzahspkhmeM1bb4ezUnlHqMA6+3MvUqBh2Zax3Bz2ZOsMkK6DBX52shY0wTywi6FGPWX NyPvkrwTX0Iu4bXmbvZajXg4f97DL7SHzSDCJ835FU070g/owQL6wXrwDwiRBPolr/HSbs FYeHxGZrot2KLIDvZFHl1Oqio52M6BFV9cWjUbgJIZZ3YcochtF1bXX49nX/Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2bcbf601a8e24471fa4373c40aca222bb438dcf5 commit 2bcbf601a8e24471fa4373c40aca222bb438dcf5 Author: Konstantin Belousov AuthorDate: 2022-09-15 09:59:42 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-30 00:29:09 +0000 jemalloc: use symbolic definitions for bits in vm_overcommit (cherry picked from commit 87384c51e047349fdbcf4f07fe52d900ce108040) --- contrib/jemalloc/src/pages.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c index 13de27a0087d..3600443e2cb5 100644 --- a/contrib/jemalloc/src/pages.c +++ b/contrib/jemalloc/src/pages.c @@ -12,6 +12,7 @@ #include #ifdef __FreeBSD__ #include +#include #endif #endif @@ -455,7 +456,10 @@ os_overcommits_sysctl(void) { } #endif - return ((vm_overcommit & 0x3) == 0); +#ifdef SWAP_RESERVE_FORCE_ON + return ((vm_overcommit & (SWAP_RESERVE_FORCE_ON | + SWAP_RESERVE_RLIMIT_ON)) == 0); +#endif } #endif