From nobody Sun May 26 14:28:00 2024 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 4VnLjD4swYz5LXvQ; Sun, 26 May 2024 14:28:00 +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 4VnLjD3tw4z4ljh; Sun, 26 May 2024 14:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716733680; 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=I7QGSlRt9dOAxhoyUH3dO1r4Ng1GBnw6ropMeyOYgQI=; b=ccbJQ1clf1WCh/8nq9gJnvejZHQegPlF8x1Bfa6xkjUGHuonxN/xwYArens2ra1wLuUSMQ 4O+9yieU5qX/0uVI5CXyxuAce1nh0vTOPFwxlElKNXg+B7ePArEiRGUPrVaGHnn9Zurbwn vEDDJ9RMlGnKZqs15CD9JcozNf7uo1ijAESc/zZ9HZxPOepZSXiVHs++H1Cwi+819RSNay rPcKGCLD/pDU1L3yR2AtwgSWHeIlCC+fDzLWZpCdlqo+00iVUiIgqbupmEhtC0VsgydY0T OcEtihVigeswemj/R2Rtd3shUIkI2r8BlGKtBxNwGf+Ms9W5PKwwbB2HsrCSmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716733680; a=rsa-sha256; cv=none; b=roehgo17RJE0QGCy00xVt7UFzkliEILKdXVLvxkHLLFo/YxfT9FtPGIY2c4aomFsrB0+6E miw2QyP3yhrJ9ugk8kxKE72ynRgdCZTaifwjMSyyy9fl41sqkdvhD4rwzX+BNLLAkv+tk1 Dx3bJPfkc3mQW6B2vDtMmkxHk9StMf+62N+5scwsSFHCOIOWxSjaJNXoU0zVEjvr9zQDu7 osU8YFFrD1xG4Mjgl38pTTYlLp8Lb5DyBkx/sKoDIirmJ9AqAKyhcJqwHZW90BWJsb46v3 9Q5wTG7FYJm45a7ubYuvlCeFg7QZ2MVI3zFm4upkH7F1Db1VEEocY6G1p9ewEw== 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=1716733680; 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=I7QGSlRt9dOAxhoyUH3dO1r4Ng1GBnw6ropMeyOYgQI=; b=U8khUGMBPE3zunfpbkevxGiS/3k7kJW6PQCUpdwzAGMTDAnDFGJV+zAnSU+LETWoRNsuk2 vpbB++8REDhRdhwpwSfy4vUKVcaUEeIMQlrBxFnLc5wV4ltgGF4OJIF/XYMDs7wj8/+Gd3 fMEniOTSfbJsowahm+xWB+cn3suNxu4Dwr4jvirQBHkYRczmto3frbXmVqIsHd0MMNf9qh geO3yoOHhjl2Eamyr37+M5pW19zauJBY52z9748niDHIghqQA+tzjcXAROfclJes/wUE/b HvNRN9Hpu36M9ykfcnQUM2mq+zsC7O8wHuexwydFSd+zNXY7MdAB+1ev5zlQnQ== 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 4VnLjD3VgJz13y8; Sun, 26 May 2024 14:28:00 +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 44QES0uY056434; Sun, 26 May 2024 14:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44QES0Nk056431; Sun, 26 May 2024 14:28:00 GMT (envelope-from git) Date: Sun, 26 May 2024 14:28:00 GMT Message-Id: <202405261428.44QES0Nk056431@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: d25ed6504383 - main - uma: Fix improper uses of UMA_MD_SMALL_ALLOC 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d25ed6504383e15b7eb6d04876b70548fffc9690 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=d25ed6504383e15b7eb6d04876b70548fffc9690 commit d25ed6504383e15b7eb6d04876b70548fffc9690 Author: Bojan Novković AuthorDate: 2024-05-26 07:54:45 +0000 Commit: Bojan Novković CommitDate: 2024-05-26 05:27:37 +0000 uma: Fix improper uses of UMA_MD_SMALL_ALLOC UMA_MD_SMALL_ALLOC was recently replaced by UMA_USE_DMAP, but da76d349b6b1 missed some improper uses of the old symbol. This change makes sure that UMA_USE_DMAP is used properly in code that selects uma_small_alloc. Fixes: da76d349b6b1 Reported by: eduardo, rlibby Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D45368 --- sys/vm/uma_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 59066eb96ae9..516ac2c2965a 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -2523,7 +2523,7 @@ keg_ctor(void *mem, int size, void *udata, int flags) * If we haven't booted yet we need allocations to go through the * startup cache until the vm is ready. */ -#ifdef UMA_MD_SMALL_ALLOC +#ifdef UMA_USE_DMAP if (keg->uk_ppera == 1) keg->uk_allocf = uma_small_alloc; else @@ -2536,7 +2536,7 @@ keg_ctor(void *mem, int size, void *udata, int flags) keg->uk_allocf = contig_alloc; else keg->uk_allocf = page_alloc; -#ifdef UMA_MD_SMALL_ALLOC +#ifdef UMA_USE_DMAP if (keg->uk_ppera == 1) keg->uk_freef = uma_small_free; else @@ -5221,7 +5221,7 @@ uma_zone_reserve_kva(uma_zone_t zone, int count) keg->uk_kva = kva; keg->uk_offset = 0; zone->uz_max_items = pages * keg->uk_ipers; -#ifdef UMA_MD_SMALL_ALLOC +#ifdef UMA_USE_DMAP keg->uk_allocf = (keg->uk_ppera > 1) ? noobj_alloc : uma_small_alloc; #else keg->uk_allocf = noobj_alloc;