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 8A7E0C71157 for ; Wed, 18 Jun 2025 04:06:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29ED96B0089; Wed, 18 Jun 2025 00:06:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 276316B008A; Wed, 18 Jun 2025 00:06:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B36D6B008C; Wed, 18 Jun 2025 00:06:43 -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 0DD546B0089 for ; Wed, 18 Jun 2025 00:06:43 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 94B4310024D for ; Wed, 18 Jun 2025 04:06:42 +0000 (UTC) X-FDA: 83567185044.08.D66010D Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by imf17.hostedemail.com (Postfix) with ESMTP id A6AFE4000A for ; Wed, 18 Jun 2025 04:06:40 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf17.hostedemail.com: 207.211.30.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750219600; a=rsa-sha256; cv=none; b=FKHKRBCp61rf0VJpXUjWqid2C2pel+KnLoNGX65BCEye7mLWY+rSfp7XnJBPcDiIR4DMv1 nCLcCchmSR75GNdfFVL42QQBq4TNdSFMOCA3Gth9e5//90EQNv+pGdGxTWmkCiaG3mOgA/ /91Qs2ACef8mgT4covQBWK+/UjVUn3A= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf17.hostedemail.com: 207.211.30.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750219600; 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=PhwMJnrQ0qMlKsFtBC1BfYyFh5sperABC47T8GvAlxA=; b=O5A/r8MkTb4wErNszbxscVMKdBegUwilSuUS+RgUB/M+ZdSKBnmOBPnRO1w3owvU+nnAhx UyYJkPhjFb9w+wPmehQolv7r0ciFEESGuov/BMAGsA6XIPcDX5fJSXm+k2lGL37OsJIxFk RwOLe2HJ0h5ALS1Fi7jlWVGjDK1QmPo= 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-467-nq8sex84Ofu8R9m5ce10DA-1; Wed, 18 Jun 2025 00:06:38 -0400 X-MC-Unique: nq8sex84Ofu8R9m5ce10DA-1 X-Mimecast-MFC-AGG-ID: nq8sex84Ofu8R9m5ce10DA_1750219597 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 AF32D180034E; Wed, 18 Jun 2025 04:06:36 +0000 (UTC) Received: from dreadlord.redhat.com (unknown [10.67.24.91]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 42984180035E; Wed, 18 Jun 2025 04:06:30 +0000 (UTC) From: Dave Airlie To: dri-devel@lists.freedesktop.org Cc: Dave Airlie , Christian Koenig , Matthew Brost , Johannes Weiner , Andrew Morton , linux-mm@kvack.org Subject: [PATCH 2/2] drm/ttm: use gpu mm stats to track gpu memory allocations. Date: Wed, 18 Jun 2025 14:06:18 +1000 Message-ID: <20250618040618.564650-2-airlied@gmail.com> In-Reply-To: <20250618040618.564650-1-airlied@gmail.com> References: <20250618040618.564650-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: K544SG13xXKNUaQP90mXNe0SvYL4LE5exeDz0gEUCso_1750219597 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: A6AFE4000A X-Rspamd-Server: rspam10 X-Stat-Signature: gd88rbgjgkonpwd3tobz1r6b3czpepot X-HE-Tag: 1750219600-254645 X-HE-Meta: U2FsdGVkX1+M3uz0Ex7JbtQZG+TmKgxMKXMM5RWivteTp93FKFtRjjVY9KHd6xYC7miMjdip1gEv9EDY5id1IwlLm1XGtrdiQZJZOzmuCKhwdRpP8NO4QQn0evM0EBzVaW+iESYXy4/xboiATHuP12p/QND6POg6fKe3A0iB3Woryqj7JPKFzY6nxTguyBWCPyMNhfLts16qXtMMhjAm6iH9/Vn8XY2sp+3yOLLL8ciR8sXM8lprpTMrMs0mKHY3S9JyCQWZ0g7gK5FQslWeUoDv6ok1tfPrNGY+9AuFTx8xWca38T7d02hwlSxWI2ILOJmNa2fNJ3KoAlBHB9/C+2tbLNker2YAEty0BehIqnGOLpe65k9u/968lgOCEwqwILKMffn2AXQ0wmgcqlhecoUdmJlP336vVISdc2AjFPtgCfF2j/DdTiqRLbOQ6kzJ7nDrFW9pOHJ7gDTLk12v04NvmPV6/BDXRQS0iWH1RkzwThjiFg9KbzXYL50fwBqdeIpx8D1swUQRN9NJtQhF1vQxkiXrWdefELdtbzC2bvux2VP8p2HK66z2svEu7F1Z4Pzup/tC8OYU+Wh6vOGQU6LdvGUCCEwQ2xpBw4iesnvR6MWTiD3CbSwuQJSzG3sag6KjOGV1AAycEW21/Eyw7M0r8zPPEEx15gmgXaUFWpLB90N68rrQRCVoAqtRHworr5fgWYlqpo0hIZ1LooNym5lW1jr70cdUOmUe/gq+opiaZYoMmWW2reHcWEFpRpAFm37VnuWnH4YCwLwvZvSfDmdspeeHvOgn2HD22gbtwbP2rDfvyrqPKROn7bGF9ZrPhG4XArmBhEo5rX/3fZoFOfpwlodPIJjwy2e2xFonDMVy7T3pZYaFP46oB/0IYGaeE3U74lNV5RoWfu07nOCsiJ2SILCReflxSp+xDw3YHKlwtg0w4mqIJi5nyXtwA/f/0woi+0Up5GUyXjWYZ6z BombtbkP OXvhYhb6UuTkK82thvWVPNJxcRnze22pFwALyvUXZcF00rKZlR3TiJzk1B1fzoM77wIq32O8nopUWZJqtP0JtjwJf0n+62UJUiX//yiprN4qNvbRo0d/x7mdYxtjKzzmMM6y+PL1uPdupKgPkH4NvgACTNRIDmexUmoD1hlSnRcqXp0Ys9igk5/6QIGrgDxFzTMPZpmSJj8if4pLjZKse/oE0kG+q1KYHqeLB1a8bompPD1IGjsoKqrJJABsS5yrqspTgbEoIs+g331K2Y1vUyI3/xTEzEBJY//tRwK4yGtl6066WkKBKwUKVupSVRwZ3GYk1yJg8qMkUqTxwpN23+7yMXFjOvX2b7+iE/ti8e8jMnJ9C/qNgzJmKxhohv7qrKGQCCfQMeeFUljsG/XedzJwapOiyjv90MBVT/jyoPYfeCTz1BIlz2foYl9ZlIyJBStfOb9vQcAgiZ+cCZau4jGEnMPy/IdH24EAswcIzNTwR4ZFta0XR5Dzo0XY97d9bAZvxc9vp9H2qHd1niTSzFZDp6mSoeUUPaCicITzn8i4mpktoYZNvgrNqnhzJ7NIxfSIFuS9Ec+W2/nw4zzscJx75zz27MPyD4dDV 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 uses the newly introduced per-node gpu tracking stats, to track GPU memory allocated via TTM and reclaimable memory in the TTM page pools. These stats will be useful later for system information and later when mem cgroups are integrated. Cc: Christian Koenig Cc: Matthew Brost Cc: Johannes Weiner Cc: Andrew Morton Cc: linux-mm@kvack.org Signed-off-by: Dave Airlie --- drivers/gpu/drm/ttm/ttm_pool.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.= c index c2ea865be657..ccc3b9a13e9e 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -130,6 +130,16 @@ static struct list_head shrinker_list; static struct shrinker *mm_shrinker; static DECLARE_RWSEM(pool_shrink_rwsem); =20 +/* helper to get a current valid node id from a pool */ +static int ttm_pool_nid(struct ttm_pool *pool) { +=09int nid =3D NUMA_NO_NODE; +=09if (pool) +=09=09nid =3D pool->nid; +=09if (nid =3D=3D NUMA_NO_NODE) +=09=09nid =3D numa_node_id(); +=09return nid; +} + /* Allocate pages of size 1 << order with the given gfp_flags */ static struct page *ttm_pool_alloc_page(struct ttm_pool *pool, gfp_t gfp_f= lags, =09=09=09=09=09unsigned int order) @@ -149,8 +159,10 @@ static struct page *ttm_pool_alloc_page(struct ttm_poo= l *pool, gfp_t gfp_flags, =20 =09if (!pool->use_dma_alloc) { =09=09p =3D alloc_pages_node(pool->nid, gfp_flags, order); -=09=09if (p) +=09=09if (p) { =09=09=09p->private =3D order; +=09=09=09mod_node_page_state(NODE_DATA(ttm_pool_nid(pool)), NR_GPU_ACTIVE,= (1 << order)); +=09=09} =09=09return p; =09} =20 @@ -201,6 +213,7 @@ static void ttm_pool_free_page(struct ttm_pool *pool, e= num ttm_caching caching, =20 =09if (!pool || !pool->use_dma_alloc) { =09=09__free_pages(p, order); +=09=09mod_node_page_state(NODE_DATA(ttm_pool_nid(pool)), NR_GPU_ACTIVE, -(= 1 << order)); =09=09return; =09} =20 @@ -275,6 +288,7 @@ static void ttm_pool_unmap(struct ttm_pool *pool, dma_a= ddr_t dma_addr, static void ttm_pool_type_give(struct ttm_pool_type *pt, struct page *p) { =09unsigned int i, num_pages =3D 1 << pt->order; +=09int nid =3D ttm_pool_nid(pt->pool); =20 =09for (i =3D 0; i < num_pages; ++i) { =09=09if (PageHighMem(p)) @@ -287,17 +301,23 @@ static void ttm_pool_type_give(struct ttm_pool_type *= pt, struct page *p) =09list_add(&p->lru, &pt->pages); =09spin_unlock(&pt->lock); =09atomic_long_add(1 << pt->order, &allocated_pages); + +=09mod_node_page_state(NODE_DATA(nid), NR_GPU_ACTIVE, -(1 << pt->order)); +=09mod_node_page_state(NODE_DATA(nid), NR_GPU_RECLAIM, (1 << pt->order)); } =20 /* Take pages from a specific pool_type, return NULL when nothing availabl= e */ static struct page *ttm_pool_type_take(struct ttm_pool_type *pt) { =09struct page *p; +=09int nid =3D ttm_pool_nid(pt->pool); =20 =09spin_lock(&pt->lock); =09p =3D list_first_entry_or_null(&pt->pages, typeof(*p), lru); =09if (p) { =09=09atomic_long_sub(1 << pt->order, &allocated_pages); +=09=09mod_node_page_state(NODE_DATA(nid), NR_GPU_ACTIVE, (1 << pt->order))= ; +=09=09mod_node_page_state(NODE_DATA(nid), NR_GPU_RECLAIM, -(1 << pt->order= )); =09=09list_del(&p->lru); =09} =09spin_unlock(&pt->lock); --=20 2.49.0