From nobody Mon May 27 13:47:42 2024 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 4VnxmG5TCmz5L8VH; Mon, 27 May 2024 13:47:42 +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 4VnxmG4vR6z43j4; Mon, 27 May 2024 13:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716817662; 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=OdsV2oewqQtL/SqxvACKy/dCqH3UJ6pP7lxWaXTJBl4=; b=ibX/1IeOSnD1csD9ifbXDxtEPeGtBxiDr7S0ZyEa5kCCpCsuJ49PrVcHpFj5omFEg3MCDu hnrqnacSYMYohXby88DEItH1RwbIbDapEksV13Tc+MNcO9ApFhkjUojNBb60dfZpA/Wwhz acLIeDWWs0bUDMD76YEVkUNVIy8QCM1yWztoRUOUkSkbNgrLGatFuSNgzOoCCGeUhwyN2u bwvLFbnNzYTSoP8ByGef6fcUuuRWv+QXy0uoNh71N/pC22G3CqQBR7kqqhdavWKCwwIbLy lYdnhU8C5a+g8qsJPOPDnXUapbkfv5zAqe5yrLeZCDAK2fvL1KcqJJV8s+KTww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716817662; a=rsa-sha256; cv=none; b=awZENlSSfzaZYqYQt9f7DYPOqkkfe6Dp1wrAz7t1Uxr2W6AVNqidH3466eYNedftSoN89Y iH4WZPbjUwscikXBo6nbaNfT5dIaFFkiGh/lKNSQMysL82DMU4ge/7i1w+uSdQ07zx5kVw Qq2WFMkPIx2FCvhit4T/nAM/PLei8SE5Rjf70yeO0WRdTmspaRpnT5ITrrABtqCoSRJQdO hvcgsg7jnhYp6N/PYLNoK4hgtDA7DaxBEwgTaZZlLs48SpmhgjbkDPzy7PE7uoFL5EcrNt 6D/Q9zzO/lso5VrhIXg9DS0P4Ew5pAdOdqY1yndWM+skTRJ02olAZqikIL+z4g== 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=1716817662; 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=OdsV2oewqQtL/SqxvACKy/dCqH3UJ6pP7lxWaXTJBl4=; b=mATa33TPC3Skk071HaSoeUFDAeg85lU+9rPLOQtKHubBBsVk79TreaSpHF2R1NuCjgaqrD AhUeAoIm1cyZyFmK2pxktvN6e42tifpoqsfQdq1myq1RL4YguZolsXZNzHru9No5ZQgJzo eYgbKmoMRJDQBr1kMwL6BS1tlkIhDMZASu9qlOOM1b08CeDuFGjy4vZU2lOktJGx4WsjsJ IHfi6YcySmcI+wpN9OIWGBGe2lSzImVV2Xkq3qd3rSASO1jr6KdsrDP12wVrkJ1sHfn8hi lzCJLXQhzaou8fRi7WkWQ6P4eh5rpOAcKT2/6niK2r+R7MaOYkqliGKdpBEp2g== 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 4VnxmG4VnQzmPx; Mon, 27 May 2024 13:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RDlgxQ022675; Mon, 27 May 2024 13:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RDlgOD022672; Mon, 27 May 2024 13:47:42 GMT (envelope-from git) Date: Mon, 27 May 2024 13:47:42 GMT Message-Id: <202405271347.44RDlgOD022672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 4c053c17f2c8 - main - zfs: Update use of UMA-related symbols in arc_available_memory 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c053c17f2c8a715988f215d16284879857ca376 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=4c053c17f2c8a715988f215d16284879857ca376 commit 4c053c17f2c8a715988f215d16284879857ca376 Author: Bojan Novković AuthorDate: 2024-05-27 13:28:03 +0000 Commit: Bojan Novković CommitDate: 2024-05-27 13:47:17 +0000 zfs: Update use of UMA-related symbols in arc_available_memory da76d34 repurposed the use of UMA_MD_SMALL_ALLOC in a way that breaks arc_available_memory on -CURRENT. This change ensures that arc_available_memory uses the new symbol while maintaining compatibility with older FreeBSD releases. This change was submitted to upstream as well. Approved by: markj (mentor) Fixes: da76d34 --- sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c index 92696c0bf1ae..478b74828c65 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c @@ -89,7 +89,7 @@ arc_available_memory(void) if (n < lowest) { lowest = n; } -#if defined(__i386) || !defined(UMA_MD_SMALL_ALLOC) +#if !defined(UMA_MD_SMALL_ALLOC) && !defined(UMA_USE_DMAP) /* * If we're on an i386 platform, it's possible that we'll exhaust the * kernel heap space before we ever run out of available physical