Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43172C83F25 for ; Tue, 22 Jul 2025 01:50:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D3D510E5C6; Tue, 22 Jul 2025 01:50:49 +0000 (UTC) Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31CFE10E5C4 for ; Tue, 22 Jul 2025 01:50:48 +0000 (UTC) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-1LW42z-2P424ejYxjYPfiw-1; Mon, 21 Jul 2025 21:50:43 -0400 X-MC-Unique: 1LW42z-2P424ejYxjYPfiw-1 X-Mimecast-MFC-AGG-ID: 1LW42z-2P424ejYxjYPfiw_1753149042 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B30991800284; Tue, 22 Jul 2025 01:50:42 +0000 (UTC) Received: from dreadlord.redhat.com (unknown [10.67.32.7]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 73AF119560A3; Tue, 22 Jul 2025 01:50:38 +0000 (UTC) From: Dave Airlie To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Johannes Weiner , Christian Koenig Cc: Dave Chinner , Kairui Song , Dave Airlie Subject: [PATCH 09/15] ttm/pool: initialise the shrinker earlier Date: Tue, 22 Jul 2025 11:43:22 +1000 Message-ID: <20250722014942.1878844-10-airlied@gmail.com> In-Reply-To: <20250722014942.1878844-1-airlied@gmail.com> References: <20250722014942.1878844-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TCHhVlRoxG0e0BFaC8jvLFEWILK0LX3tDfMBeDNi4x0_1753149042 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Dave Airlie Later memcg enablement needs the shrinker initialised before the list lru, Just move it for now. Signed-off-by: Dave Airlie --- drivers/gpu/drm/ttm/ttm_pool.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.= c index 9a8b4f824bc1..2c9969de7517 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -1381,6 +1381,17 @@ int ttm_pool_mgr_init(unsigned long num_pages) =09spin_lock_init(&shrinker_lock); =09INIT_LIST_HEAD(&shrinker_list); =20 +=09mm_shrinker =3D shrinker_alloc(SHRINKER_NUMA_AWARE, "drm-ttm_pool"); +=09if (!mm_shrinker) +=09=09return -ENOMEM; + +=09mm_shrinker->count_objects =3D ttm_pool_shrinker_count; +=09mm_shrinker->scan_objects =3D ttm_pool_shrinker_scan; +=09mm_shrinker->batch =3D TTM_SHRINKER_BATCH; +=09mm_shrinker->seeks =3D 1; + +=09shrinker_register(mm_shrinker); + =09for (i =3D 0; i < NR_PAGE_ORDERS; ++i) { =09=09ttm_pool_type_init(&global_write_combined[i], NULL, =09=09=09=09 ttm_write_combined, i); @@ -1403,17 +1414,6 @@ int ttm_pool_mgr_init(unsigned long num_pages) #endif #endif =20 -=09mm_shrinker =3D shrinker_alloc(SHRINKER_NUMA_AWARE, "drm-ttm_pool"); -=09if (!mm_shrinker) -=09=09return -ENOMEM; - -=09mm_shrinker->count_objects =3D ttm_pool_shrinker_count; -=09mm_shrinker->scan_objects =3D ttm_pool_shrinker_scan; -=09mm_shrinker->batch =3D TTM_SHRINKER_BATCH; -=09mm_shrinker->seeks =3D 1; - -=09shrinker_register(mm_shrinker); - =09return 0; } =20 --=20 2.49.0