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 3ED7CC7EE2A for ; Mon, 30 Jun 2025 04:51:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D22288D0002; Mon, 30 Jun 2025 00:51:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CD22B8D0001; Mon, 30 Jun 2025 00:51:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B99AE8D0002; Mon, 30 Jun 2025 00:51:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A9FB48D0001 for ; Mon, 30 Jun 2025 00:51:06 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3381BC0396 for ; Mon, 30 Jun 2025 04:51:06 +0000 (UTC) X-FDA: 83610842532.24.8143A5F Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [205.139.111.44]) by imf19.hostedemail.com (Postfix) with ESMTP id 55AE61A0006 for ; Mon, 30 Jun 2025 04:51:04 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf19.hostedemail.com: 205.139.111.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=1751259064; 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=+0jTEb0whadfcyOw/ivoC6nxJSc0Udoly3UXCTMAVZg=; b=mBIR/Ie7N3iae1ThSDTPzq27bOddjxqiXVZCu24bnKTGXhRQBSjePJ1fBjdgKwhP2YZKz0 Up+U6jNStYZWwgBt+bJYwf5Yk886erz0K7N4hkVM2tOmpWPvcgFnwEnuLO+Vdi/Gnctf+c qloKyYUWBWhxdpKyVBHmIrVrxyth7rI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751259064; a=rsa-sha256; cv=none; b=reh31mYB9StasqOhWQMw679kzRGO9OF0fkIIOiUl+GQdR45eqq0qs5ulTbq7th20ada+dx nUeF4Do1WHcuT6nIpBLJ1RMfPAR6G9Ma0qOlzKrx9jGdVGakyKg177/sSpv1yjJZbG49M3 7Av2gEOt5zw7dO+oRA4SIwwmEHYF+dE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf19.hostedemail.com: 205.139.111.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com Received: from mx-prod-mc-01.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-602-iZFFzm70OJ-FYw_LztJnaw-1; Mon, 30 Jun 2025 00:51:00 -0400 X-MC-Unique: iZFFzm70OJ-FYw_LztJnaw-1 X-Mimecast-MFC-AGG-ID: iZFFzm70OJ-FYw_LztJnaw_1751259059 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E7D1E195608C; Mon, 30 Jun 2025 04:50:58 +0000 (UTC) Received: from dreadlord.redhat.com (unknown [10.67.24.96]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B23751956095; Mon, 30 Jun 2025 04:50:53 +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 05/17] ttm/pool: drop numa specific pools Date: Mon, 30 Jun 2025 14:49:24 +1000 Message-ID: <20250630045005.1337339-6-airlied@gmail.com> In-Reply-To: <20250630045005.1337339-1-airlied@gmail.com> References: <20250630045005.1337339-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: O4Qmzj4h0hjSqBHeg3Ijg2f5yFuctUOuAfPAa-P1So4_1751259059 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-Server: rspam12 X-Rspamd-Queue-Id: 55AE61A0006 X-Stat-Signature: yyxntrhhzjqp4jzsepj8t8t1u9dgi5jt X-HE-Tag: 1751259064-103393 X-HE-Meta: U2FsdGVkX1/jrrFB2CwW4uT1j3KK9jnU6uQEyr5Bwa/F3vwtvxsHV1trDoQB1RgzjS3ptDNjeBv6bY1g3IOIVPR4msNQ5a7GigwStFmIWNh33FiG6oBOSjtnmpRy+Zwv70Wj/CK5X1L2dFPe/NBfifFSBtqkGesj+fkIBchpdBNB6qjZR3n5oOiBUaniklLeaDCZRtfJjoebosFXrVut0tVgjNJc+tsNp5XrXAz/zB/KbDgqd8P3VHk2I7OzScEmaD9EGMtyqy0+l0rtmlG82JTfUarVpEwfMvw7bEjw17xu062Tg2T1ywltWhyOxUPtjJ6zBJSVI5HhD3SMXCY9OLI1Dh9wCkiT5CvneJokT0hLPdLzgtPCBL3UTH/KJPukMnKtkbRULpvhu0YRa2N7dp5hdj0oftx57KHqKrofkQLJnPSXrh6zaPCzyoDoTHpGYdGkRnL+btmBasypWJmrayDSDH8++Ki4pth98Ywii2z4KmJLTDDpSIAv5f5VIckwPorE7MkXyC0o/+Q+T3x69yn6xb53Gh7AtQVk22UvEeZGSBk4T/WhRVNWozBEx/XItXftdPWiZn3r4TlB8wrAxYTQCl2Pdevc8K5QILQ2Cwt+hz1BQm3z001m5lKbN/ofQeOFRMbdoJJYndGMNGo2gfCVf6N7TpCwJKCv/1sfym+eqmi1cElJpxaayIoR2iDla5ar2orm2LZUEnRgyePPtZAXBFGpcVAJgK9lUOvMM30o7VXwFcvryvBXmPocFL7xaLltUuj/5QPkzYVCz5lmt4jY/bE+xtTWRPmywqISI+5JORiPV5v6jjBWraGi6etpWhZK0m7YVyTmqAKN4QkM4Myg9S5p6R7hdd94jBuljSsRZttxQQJqvOICzo6gaVRh40ai5bNundRFXoVrKj6StCUdkmKc83Ajp4ivsntkKBR8JNgXCZoZfSRI2i6m+KNcTldqjWpS/dqPmDjYSU6 WMACwMIa Eqo1s5N93jWpQD9KkfVLIS0wS+RJroIVhyHG6/FilKSJofxrWRVZpvtwdHbHvEs8IPXp/sC0owUg5nkbMBHbsQ7hIE9klrrIubmkrgv1ifzCLjD+P6cfAPL+0Gs0dGWTbuVCoSkt7HytqD9a/F//rq2jR1FQMqEtwAoisQ7K/JX9mG6ptLyKKqDLsnyp9pAxPBCgBWzp/yAlLTvG+oC4ILfYzB2Y21WR9TNwsrKay1pRBjONhnK0+ztPwGM6hvTs9WZL++gqt9DWnBKXBRzCLt+uSUPBht0NzlLiioJ25eY39447vLYkmFGccYDCpZuH9CWeydHZtEGTDw6ybB0B/aW4xBRs+pTHuwYRXyjyWUjbeSLZoTC1r5yJRyuGjGowj0Qg84tLhQiBj+19rMT28Dj9H6faoee4qxIkqY5N05c10S2kT0c1YLdezVQhnAOtY7YZVpAp6wTG73cYlr+ODUOmUJBwB4brdqvOEbyMQCB5Mxb+iEPnmj3RegA== 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 The list_lru will now handle numa for us, so need to keep separate pool types for it. Just consoldiate into the global ones. This adds a debugfs change to avoid dumping non-existant orders due to this change. Cc: Christian Koenig Cc: Johannes Weiner Signed-off-by: Dave Airlie --- drivers/gpu/drm/ttm/ttm_pool.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.= c index 4372f0cc4a57..95bbbc843b97 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -399,17 +399,11 @@ static struct ttm_pool_type *ttm_pool_select_type(str= uct ttm_pool *pool, #ifdef CONFIG_X86 =09switch (caching) { =09case ttm_write_combined: -=09=09if (pool->nid !=3D NUMA_NO_NODE) -=09=09=09return &pool->caching[caching].orders[order]; - =09=09if (pool->use_dma32) =09=09=09return &global_dma32_write_combined[order]; =20 =09=09return &global_write_combined[order]; =09case ttm_uncached: -=09=09if (pool->nid !=3D NUMA_NO_NODE) -=09=09=09return &pool->caching[caching].orders[order]; - =09=09if (pool->use_dma32) =09=09=09return &global_dma32_uncached[order]; =20 @@ -1295,6 +1289,8 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct se= q_file *m) =09for (i =3D 0; i < TTM_NUM_CACHING_TYPES; ++i) { =09=09if (!ttm_pool_select_type(pool, i, 0)) =09=09=09continue; +=09=09if (pool->caching[i].orders[0].pool !=3D pool) +=09=09=09continue; =09=09if (pool->use_dma_alloc) =09=09=09seq_puts(m, "DMA "); =09=09else --=20 2.49.0