From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61C8CC83F17 for ; Mon, 14 Jul 2025 05:23:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 035076B009C; Mon, 14 Jul 2025 01:23:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F23B46B009D; Mon, 14 Jul 2025 01:23:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E39856B009E; Mon, 14 Jul 2025 01:23:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D0FEA6B009C for ; Mon, 14 Jul 2025 01:23:42 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9D504C04F3 for ; Mon, 14 Jul 2025 05:23:42 +0000 (UTC) X-FDA: 83661727884.08.47DB50B Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [205.139.111.44]) by imf07.hostedemail.com (Postfix) with ESMTP id BB79640004 for ; Mon, 14 Jul 2025 05:23:40 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=softfail (imf07.hostedemail.com: 205.139.111.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752470620; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0FdoD2Xn802bJ1/gQFTA1ksFSALNPCNkalNpcqy0I8c=; b=TBU2e4SDd+oUs1Yyu24ExtdKPIWmQL7cAUoqlw1Yqf/d8cvypo+bwopzimhn0fgkXDlJ/r ABbSgFW67Fk6IWsydPIt5m+UInsdbXj+9axNdBH0skivXHDxE/NWIgqiwAZWc7XNhwCLJb WBQ1IRwfWEXEOFvWibpfQg3OEdDTPYM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=softfail (imf07.hostedemail.com: 205.139.111.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752470620; a=rsa-sha256; cv=none; b=Sz1yP1+fWLQKqLT1rqZMsRXKI6ebqc3iXVPrKT3SrAx6Nu6qxNGHGpI4pa8syB7W4beFkM laFf+oYhktolW7wgWsUbNa80NeNidyb0Tjec95MljW0BmrXJ+6YUn9ecpMvoXL8zFXgIN9 w3fC2zGIffHbv4aUjrXn/nIsA15d850= Received: from mx-prod-mc-08.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-42-gpyEZ4XUOLO17nZ05Zy5KA-1; Mon, 14 Jul 2025 01:23:36 -0400 X-MC-Unique: gpyEZ4XUOLO17nZ05Zy5KA-1 X-Mimecast-MFC-AGG-ID: gpyEZ4XUOLO17nZ05Zy5KA_1752470615 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D01A31809C8A; Mon, 14 Jul 2025 05:23:34 +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 89CBB1977000; Mon, 14 Jul 2025 05:23:30 +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 06/18] ttm/pool: make pool shrinker NUMA aware Date: Mon, 14 Jul 2025 15:18:21 +1000 Message-ID: <20250714052243.1149732-7-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: H9KlCss6B02CMxMK4r4DiRce-vlfT3gYQApH3nszXFM_1752470615 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-Rspamd-Queue-Id: BB79640004 X-Stat-Signature: fmjdbomsjsxhq5eohrt1eesthkmnuwtx X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1752470620-417301 X-HE-Meta: U2FsdGVkX19DbaGdKuq3nbXYn36i22cmBK0G7/F25zaPSxR1putbMJpBOsrtTL/kGFKVUPTnkFi1hMQZp17vjpaQdlj4a6omqWv2TS7qA8SoWMwTxuaQfzdgjnlTAlQ7LLEwOWgHLT+yN1xKrklCcCzFPQNVh6cFVZlWXGXMy3u2zCBKFZDdxsLG55sTGAMTjl/UbSM1Albihz/sXcl/88OvP2cQtyGyGIVq8PMf71wr3zU7gQsVxL5LJPGhiilOU6WAWiO8jeZpNtij0QLLj0LqRJFm0AAh1f1HamdpBx2Me/YkpY4DXuSvZFKH+qDLhQwJnPiVZ+UN7o1wgk+dCrPGyF48Su4nkZHaEArCix7vf9jHKAlA8wKakPghv/lXra3btA+nA8XVMD+OHjX3IS61WgITxlASZ3VkdaJq6ItYzccPMKPrC5QfCPHJRm2E6ucy9HCYzRa3LzMzyw06YqLlY0AKPxK88f9WNdsj0ensEvYUpjqFEDbuShC29k68AokXhHinkZMKqW3iWNOIl9hNqHMrj0uR76HRADwp3ZpZHYswXj/U/3E5kAM4BkcgW889zWUGPBBvDbPHOg/jvrVnHg1YIhY3PHZJMLBMHEngb5sQeuXAtXfqaCcA1xH7mp2uX3L/zvpbS5LwRjvjI2BZ9cOYvq0eNngWibVhAy+5VtpS68fltnq9Rv/F4/FG/zNYml0nzjSDzSGI4CCgaWR6/30A4+PfEQ6ySnWDTBN12hIEm1XFAlCy2Wu2V+w9XJBM9xtv8FdoUs6VmOU5QO3i2lB1zs2R+Vo3ezgv4Xi8bJJQbyEcSDmiYk9HDnS2mlpBQI5mq1WUeja38dpaUxq+jGtvi8UJR1IKkw33kySE8kP5EhyHKulqhBOEypFoA/xqn65OnM9g2RMtwE03ULDYFAbIidrBvKw2E3OpCMuU+RSVr39P6H905/w6dX8c3NWV9BRZp/6uM66b9KU UDC2bo4f Mj7YJ8ZDTC50oMdnkTYry0r5eXYCZDBxZPErXEkXYjRgFi2+bsejQpAfkWp4fnWrWURJTFuhrEwFGlUSveapt8NfkB1BDf98eZk8CwIW6Pk7p5eXlmfffGNN0M1qf56/qGjr+EKPP2AP7WIaxAI+DFML4Wg8nJT1wwkW79FPo4Ik7j/2UFF8TNVZ5jsq7GMLiUoPe+sZAElG4DcL3pphh+T5yvMQ3/Hk2I+TNrXBF8wXI+dyYsVps2vir0NrgIM7CXK7ZEmi+SidSFCxd0uN52BQxkNxXDRYJCcRyVcl5zybfR+eSHqdJQJU+IinHdVqLfyjYs4oU+e+OcKlBRwhOeos4byjB9+V1+T/RUH2k7h4YfvAvNhajzjiMteuRlEZBf8k96wbCDTfwgSEokxwj/ClkM/vspEH/cZeMVooAnHUNtsDCUWhwU2Ahws3YE9rVRA9LyLwQanr0mbztf5R1BkVQifO6mhwaaj+qmQMJno0CfzquC+1Ugo76KA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Dave Airlie This enable NUMA awareness for the shrinker on the ttm pools. Cc: Christian Koenig Cc: Dave Chinner Signed-off-by: Dave Airlie --- drivers/gpu/drm/ttm/ttm_pool.c | 38 +++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.= c index e26d57676fe3..c0391ccd179b 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -415,12 +415,12 @@ static struct ttm_pool_type *ttm_pool_select_type(str= uct ttm_pool *pool, =09return NULL; } =20 -/* Free pages using the global shrinker list */ -static unsigned int ttm_pool_shrink(void) +/* Free pages using the per-node shrinker list */ +static unsigned int ttm_pool_shrink(int nid, unsigned long num_to_free) { +=09LIST_HEAD(dispose); =09struct ttm_pool_type *pt; =09unsigned int num_pages; -=09struct page *p; =20 =09down_read(&pool_shrink_rwsem); =09spin_lock(&shrinker_lock); @@ -428,13 +428,10 @@ static unsigned int ttm_pool_shrink(void) =09list_move_tail(&pt->shrinker_list, &shrinker_list); =09spin_unlock(&shrinker_lock); =20 -=09p =3D ttm_pool_type_take(pt, ttm_pool_nid(pt->pool)); -=09if (p) { -=09=09ttm_pool_free_page(pt->pool, pt->caching, pt->order, p, true); -=09=09num_pages =3D 1 << pt->order; -=09} else { -=09=09num_pages =3D 0; -=09} +=09num_pages =3D list_lru_walk_node(&pt->pages, nid, pool_move_to_dispose_= list, &dispose, &num_to_free); +=09num_pages *=3D 1 << pt->order; + +=09ttm_pool_dispose_list(pt, &dispose); =09up_read(&pool_shrink_rwsem); =20 =09return num_pages; @@ -783,6 +780,7 @@ static int __ttm_pool_alloc(struct ttm_pool *pool, stru= ct ttm_tt *tt, =09=09pt =3D ttm_pool_select_type(pool, page_caching, order); =09=09if (pt && allow_pools) =09=09=09p =3D ttm_pool_type_take(pt, ttm_pool_nid(pool)); + =09=09/* =09=09 * If that fails or previously failed, allocate from system. =09=09 * Note that this also disallows additional pool allocations using @@ -931,8 +929,10 @@ void ttm_pool_free(struct ttm_pool *pool, struct ttm_t= t *tt) { =09ttm_pool_free_range(pool, tt, tt->caching, 0, tt->num_pages); =20 -=09while (atomic_long_read(&allocated_pages) > page_pool_size) -=09=09ttm_pool_shrink(); +=09while (atomic_long_read(&allocated_pages) > page_pool_size) { +=09=09unsigned long diff =3D page_pool_size - atomic_long_read(&allocated_= pages); +=09=09ttm_pool_shrink(ttm_pool_nid(pool), diff); +=09} } EXPORT_SYMBOL(ttm_pool_free); =20 @@ -1189,7 +1189,7 @@ static unsigned long ttm_pool_shrinker_scan(struct sh= rinker *shrink, =09unsigned long num_freed =3D 0; =20 =09do -=09=09num_freed +=3D ttm_pool_shrink(); +=09=09num_freed +=3D ttm_pool_shrink(sc->nid, sc->nr_to_scan); =09while (num_freed < sc->nr_to_scan && =09 atomic_long_read(&allocated_pages)); =20 @@ -1317,11 +1317,15 @@ static int ttm_pool_debugfs_shrink_show(struct seq_= file *m, void *data) =09=09.nr_to_scan =3D TTM_SHRINKER_BATCH, =09}; =09unsigned long count; +=09int nid; =20 =09fs_reclaim_acquire(GFP_KERNEL); -=09count =3D ttm_pool_shrinker_count(mm_shrinker, &sc); -=09seq_printf(m, "%lu/%lu\n", count, -=09=09 ttm_pool_shrinker_scan(mm_shrinker, &sc)); +=09for_each_node(nid) { +=09=09sc.nid =3D nid; +=09=09count =3D ttm_pool_shrinker_count(mm_shrinker, &sc); +=09=09seq_printf(m, "%d: %lu/%lu\n", nid, count, +=09=09=09 ttm_pool_shrinker_scan(mm_shrinker, &sc)); +=09} =09fs_reclaim_release(GFP_KERNEL); =20 =09return 0; @@ -1369,7 +1373,7 @@ int ttm_pool_mgr_init(unsigned long num_pages) #endif #endif =20 -=09mm_shrinker =3D shrinker_alloc(0, "drm-ttm_pool"); +=09mm_shrinker =3D shrinker_alloc(SHRINKER_NUMA_AWARE, "drm-ttm_pool"); =09if (!mm_shrinker) =09=09return -ENOMEM; =20 --=20 2.49.0