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 AA3F2C83F1B for ; Mon, 14 Jul 2025 05:24:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 24AA910E353; Mon, 14 Jul 2025 05:24:09 +0000 (UTC) Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [205.139.111.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD9BF10E395 for ; Mon, 14 Jul 2025 05:24:07 +0000 (UTC) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-c-Cndiw8PnSsPX-9VpwHLw-1; Mon, 14 Jul 2025 01:24:03 -0400 X-MC-Unique: c-Cndiw8PnSsPX-9VpwHLw-1 X-Mimecast-MFC-AGG-ID: c-Cndiw8PnSsPX-9VpwHLw_1752470642 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 00CF51956096; Mon, 14 Jul 2025 05:24:02 +0000 (UTC) Received: from dreadlord.redhat.com (unknown [10.67.32.31]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B09F61977000; Mon, 14 Jul 2025 05:23:57 +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 11/18] ttm/pool: initialise the shrinker earlier Date: Mon, 14 Jul 2025 15:18:26 +1000 Message-ID: <20250714052243.1149732-12-airlied@gmail.com> In-Reply-To: <20250714052243.1149732-1-airlied@gmail.com> References: <20250714052243.1149732-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KodgTn_RQ4qKWL7Ayp25rl2Gz8R1u4qtOJ-LCbTvR30_1752470642 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 63eb81b18987..a4f4e27c6a1f 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -1382,6 +1382,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); @@ -1404,17 +1415,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