From nobody Fri Sep 16 22:36:04 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 4MTpnc3v05z4cJZk; Fri, 16 Sep 2022 22:36:04 +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 4MTpnc38nSz3lq4; Fri, 16 Sep 2022 22:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663367764; 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=g2xNIuwTxQIF6+6OK1lizdqZoPYFRinTyx5jIy38FpI=; b=Y2diuiSvNM+z33ueVeeneh7ubjK7vo+/wNiF3dtU2hKojbv2fNmHQdEnNddpJcYHdIObnQ mOMnpEZtpxpHTj4lIsF2SPDSZViEJHF2xj4qe4QRDavw/nU9ld3NTj19pYegM/UfmSpvL0 ZMOFjr+2+Rs/HKbwA62TG5s8YdqzcxZqL8IRg60E1lFFxy/7C9yYtNMrgFRH+JJIsnV4K6 HPKEIkA0ZM8hdku/DbLSKRn6TvpWNoiOFZE3ySrhG783WhMY56LWQwYaYDCiyUizCUVenK PXzLU1MkH1USLRLr2PTkC6pKJ2gCMJV5aMNuhttamUaTIKH4x4wnBTKzRY79MQ== 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 4MTpnc1wBCzWLX; Fri, 16 Sep 2022 22:36:04 +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 28GMa4TM088207; Fri, 16 Sep 2022 22:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GMa4TB088206; Fri, 16 Sep 2022 22:36:04 GMT (envelope-from git) Date: Fri, 16 Sep 2022 22:36:04 GMT Message-Id: <202209162236.28GMa4TB088206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0e2af3b59a15 - main - jemalloc: Define SWAP_RESERVE_* if not provided by the system headers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e2af3b59a1517521e9fb3aab61fa06e5ce25c2c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663367764; 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=g2xNIuwTxQIF6+6OK1lizdqZoPYFRinTyx5jIy38FpI=; b=ZW2IW8mVPrXnyN9VqTr/5q+X8Aq52m7nVExt6cLkQ9Xpyen4GFBYordPXWewAtfkMvJi/A O/nC0iqYdPvtYHtMaxjzKPmfC9wa4h5BbmcqLEY4cxpLv1jXcuAPOCvzTgIJVEMLYT3uw5 9PqzYTTPvKn2nq8D3P7CQlI54+ociR/bFuoL20rLBklhaTj6tZmPII0ncTox6o5DvknFxE WghqHomHcpPbDimHUfUvUFQcVLNIRkqdI0fTrBzc3MzHoIqbHze+V9era8CnXXEval/gaY viFWEvm2zaPmqijBzR5x66K2iRGUz18ig1RvIrSckM+kcL1p+sZxKqMLiMpGtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663367764; a=rsa-sha256; cv=none; b=HglgZS6P5HQ8pqJ8z312sJUUzcHtXfft55I/xhbpiqs7Bogi/V4nqb3gQwj0qAQar2ps4A C2fsnRAc9PK4XJm7TOhEQhKm839Lqhq22AD36H8XWFoit6JVNQ5sdlR7b9Nub3J2zfKWZo 2708UJXaYZCzbRAkS4uwnuQTAw3oGu1pcgYS1oNpTfN75nc6Z5mYxhkrPL+jkXyK4dSpNt TQoevrRWbdoAckKaRQxgu2KdhIu4LACVF0wibZE/b6U1f+6w0lJEgkvN+BPQr06fTVCj3v MlUpS5P+PO/hdOqAbWGWl8TIwEtq7ayKNbBibfhZ7J3TL0SS7lGPOX3dXtLesw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0e2af3b59a1517521e9fb3aab61fa06e5ce25c2c commit 0e2af3b59a1517521e9fb3aab61fa06e5ce25c2c Author: Konstantin Belousov AuthorDate: 2022-09-16 21:08:03 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-16 22:35:35 +0000 jemalloc: Define SWAP_RESERVE_* if not provided by the system headers instead ifdef-ing out the return statement. Reported by: Mark Millard Fixes: 87384c51e047 Sponsored by: The FreeBSD Foundation MFC after: 2 weeks --- contrib/jemalloc/src/pages.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c index 6b00eb0cb919..6405bb528984 100644 --- a/contrib/jemalloc/src/pages.c +++ b/contrib/jemalloc/src/pages.c @@ -464,10 +464,12 @@ os_overcommits_sysctl(void) { } #endif -#ifdef SWAP_RESERVE_FORCE_ON +#ifndef SWAP_RESERVE_FORCE_ON +#define SWAP_RESERVE_FORCE_ON (1 << 0) +#define SWAP_RESERVE_RLIMIT_ON (1 << 1) +#endif return ((vm_overcommit & (SWAP_RESERVE_FORCE_ON | SWAP_RESERVE_RLIMIT_ON)) == 0); -#endif } #endif