From nobody Wed Jul 24 19:32:24 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 4WTkgD70mdz5QJ3M; Wed, 24 Jul 2024 19:32:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WTkgD6W4sz4T9r; Wed, 24 Jul 2024 19:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721849544; 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=EhBlRMwpWv1YUOm+ByWZLmW/awKXWeCGuxaNh4P299E=; b=bXcEDRWx2JLja8lbRcyi8XxZ5ECzrDQkqERSXnQFlrMQ9UKQDbyYzPlze9nw4vmOzIO1zb TS5dP/DNYecbBinVxjVDAy3vABptdw0UvgLi0FHJKL2NGIpb5uNKgiwoTppl9EOzSDipV3 8IUyj3D3mcWLjbhzrRRjR4TpI5snYQMOijUBaea5fwDbIVGkSdkvNdS65JalzMNMHrYJho 9mYWAu9wdrp4uV3W9Gjwp/TdB4LqjIc9OgaMHDnsK23tHaFOAR6r97BRFIng7DWv8/61aR uYPTzPVZdFR/WnQHfBEiWxDga1DmIpU0RqJcrisbg2lKn3MZR+/L1UQD7QppEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721849544; a=rsa-sha256; cv=none; b=bmotuYNnpr96KnS7qX3MULAU+R7/ZCs/vBZTjiE94ACmFjy+wmbGPo2CEgHNMbfDB5LA7X KeCnYp+AtRDQtCE4M8loirBIxiY3Z4FweZbK6FTUzTq65OSz1aJYRVIKy9MpLewlY3cOXZ 7w5TxZs6mGH0f7Qi8WiLDTp3GJu4ITXb45Lrdm/slLkarW2OTNIn7EdTqxpCbrPERMTmR4 FSxhDZdqvC924a4HiS5Nv/FH816XYkD3SvzpIz0d/yPK6RwnHZwqfPzSeRKMFsHpYBPhZ3 8xsEKOGQmOdO9lZFGiVuy/pdVK79MrZK67//n0smQ29YNoL/4s2ikvg/UswOBQ== 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=1721849544; 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=EhBlRMwpWv1YUOm+ByWZLmW/awKXWeCGuxaNh4P299E=; b=rH678ceWM9Mh+DKF/iH1bpC9xmIKYT4v748JwMAuASNzKcxUxdc7jteATUQKSUHUKy+Lvs zz5tHctT7tMSqlG5ilLda4dJbzHY+P8W21Mllhw7GJZWK2ybhoaMV9TAQFbqRjB72bzSnj xr0n84j7M+GiA8Ikb4kOursZj/oSw/YH56NTaUJIXcCeYw0JuMFrKc+PWQ6+ZscSPCTT1c Ln/pN+JT8f8J82T2dvS+4JDSEJrfGLTp///vbGWFKwMxxZ3AlY02MFzVirTPDoZfBubbLI u6WXufsgNa2DNyRPsP8UPYpd0XRvUojZJ+GB6x2Y/w+3EIrGrMWKQnCC8Rx1Gw== 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 4WTkgD66CBzNt0; Wed, 24 Jul 2024 19:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46OJWOY8093580; Wed, 24 Jul 2024 19:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46OJWO9w093577; Wed, 24 Jul 2024 19:32:24 GMT (envelope-from git) Date: Wed, 24 Jul 2024 19:32:24 GMT Message-Id: <202407241932.46OJWO9w093577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: cd836f600418 - main - vm: Retire kmem_arena 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd836f600418e892869d23cee857ce1a6cd5b863 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=cd836f600418e892869d23cee857ce1a6cd5b863 commit cd836f600418e892869d23cee857ce1a6cd5b863 Author: Alan Cox AuthorDate: 2024-07-21 19:50:47 +0000 Commit: Alan Cox CommitDate: 2024-07-24 19:31:40 +0000 vm: Retire kmem_arena It has simply been an alias for the kernel_arena for many years now. Enough time has passed to retire it. Any out-of-tree kernel modules that directly use kmem_arena should switch to kernel_arena. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D46057 --- sys/arm/nvidia/drm2/tegra_bo.c | 4 ++-- sys/kern/subr_vmem.c | 2 -- sys/vm/vm_kern.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/arm/nvidia/drm2/tegra_bo.c b/sys/arm/nvidia/drm2/tegra_bo.c index c27b9f39c508..08cd3de6a3fe 100644 --- a/sys/arm/nvidia/drm2/tegra_bo.c +++ b/sys/arm/nvidia/drm2/tegra_bo.c @@ -71,7 +71,7 @@ tegra_bo_destruct(struct tegra_bo *bo) vm_object_deallocate(bo->cdev_pager); if (bo->vbase != 0) - vmem_free(kmem_arena, bo->vbase, size); + vmem_free(kernel_arena, bo->vbase, size); } static void @@ -137,7 +137,7 @@ tegra_bo_init_pager(struct tegra_bo *bo) size = round_page(bo->gem_obj.size); bo->pbase = VM_PAGE_TO_PHYS(bo->m[0]); - if (vmem_alloc(kmem_arena, size, M_WAITOK | M_BESTFIT, &bo->vbase)) + if (vmem_alloc(kernel_arena, size, M_WAITOK | M_BESTFIT, &bo->vbase)) return (ENOMEM); VM_OBJECT_WLOCK(bo->cdev_pager); diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index a706d944dc3f..9288b0935441 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -236,9 +236,7 @@ static uma_zone_t vmem_bt_zone; static struct vmem kernel_arena_storage; static struct vmem buffer_arena_storage; static struct vmem transient_arena_storage; -/* kernel and kmem arenas are aliased for backwards KPI compat. */ vmem_t *kernel_arena = &kernel_arena_storage; -vmem_t *kmem_arena = &kernel_arena_storage; vmem_t *buffer_arena = &buffer_arena_storage; vmem_t *transient_arena = &transient_arena_storage; diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h index 848f28fe90b8..942c03480364 100644 --- a/sys/vm/vm_kern.h +++ b/sys/vm/vm_kern.h @@ -69,7 +69,6 @@ extern struct vm_map exec_map_store; extern struct vm_map pipe_map_store; #define pipe_map (&pipe_map_store) extern struct vmem *kernel_arena; -extern struct vmem *kmem_arena; extern struct vmem *buffer_arena; extern struct vmem *transient_arena; extern struct vmem *memguard_arena;