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 6D0BEC83F20 for ; Mon, 14 Jul 2025 05:23:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1B8E6B0099; Mon, 14 Jul 2025 01:23:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CBF66B009A; Mon, 14 Jul 2025 01:23:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9095B6B009B; Mon, 14 Jul 2025 01:23:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 821896B0099 for ; Mon, 14 Jul 2025 01:23:35 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 37FCF5934F for ; Mon, 14 Jul 2025 05:23:35 +0000 (UTC) X-FDA: 83661727590.11.6507D31 Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by imf27.hostedemail.com (Postfix) with ESMTP id 5789C40012 for ; Mon, 14 Jul 2025 05:23:33 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=softfail (imf27.hostedemail.com: 207.211.30.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=1752470613; 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=fgIZSzOUjodeQ1cfdZFBu7nRQ09o574XuPNR6SujM/s=; b=dGc+Cu3HMHtv0fFQXB5E/flu4OafiagQABaFhCAgyZCrSnmmv+5OeL5h80QbtqVJAEi3VL UvmPSOVdbGNAZiCxqM5piQtDXn7wobpeG/HR7ROcq9oR7WWoU/LlaUdYMapm8g/YDqIVYF G65ljU4bfwxRn07G6rVMCIn31AzEl8k= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=softfail (imf27.hostedemail.com: 207.211.30.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=1752470613; a=rsa-sha256; cv=none; b=lN+oox527Oir3Rz/zdm1PnmezZFvCWQkud3rkLfB1q22vGvzoyaE2UFLEKh1s0fBDNRShq epv6uUqx4WYEh0jQ2d8Ms7IOXsSuhGxI1nHn8o6ZiTTOdfU7kk35si0n2/kMIPH8cwEjKH HTUwXVxgbxRicWOlLRJNhAoTyMwv6WU= 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-367-wJmtB9wNMgWRSAWY1Raa5Q-1; Mon, 14 Jul 2025 01:23:31 -0400 X-MC-Unique: wJmtB9wNMgWRSAWY1Raa5Q-1 X-Mimecast-MFC-AGG-ID: wJmtB9wNMgWRSAWY1Raa5Q_1752470609 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 AFE5D1800368; Mon, 14 Jul 2025 05:23:29 +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 25D9D1977029; Mon, 14 Jul 2025 05:23:24 +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/18] ttm/pool: drop numa specific pools Date: Mon, 14 Jul 2025 15:18:20 +1000 Message-ID: <20250714052243.1149732-6-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: GeVU16Zg6ER6EpnFi0zIXmcjyWc4yJptr1A335vcBz8_1752470609 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-Rspamd-Queue-Id: 5789C40012 X-Stat-Signature: 49dbcyxiwq86yfyi8mzkrsqqcfodrr77 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1752470613-778144 X-HE-Meta: U2FsdGVkX1/NR2jW69NTMNDW8r7g9nmb+pXr/Hn+l4Li88qCQJZpL9gHRQl1pY6RQdCTvOwmxJv2W+H+ogdpxKv3CPs2Fa2SD4I5Z/d7OI9RZui0gp0skTxTkOXlIWZ7l9vSNSEFpLyInacbC6z8HgSZyvnv4/J69R3VVCrC5WtoxEDjiw9iQ9fceN/+d2idKpbu4kLqLvctRpoBDjICyYAQU6yOteeKjonYUI932xiHPmAlraWFilX2IEPyTnrA0x7++5Sr5rnIGNiRkFWebv9nHZvpC7hVimQ/l2JANANWZoNFYE6MGWWhrCJu1pESznpvnB+mdbIgVmmiOrv626C1LfEajDOxvet2d0HjevM7ikd/kiGljYPllbPRaODbNZdleIaj2MkWG7NsxjqsIG26V2UXaSnlsFh8ctD3jfSN+cBXbbhsO4y1kuY9pHiRjKRVx1iO0b5sBYi1SdtLnWzA5LF+LqgMwLjaHE6gT5TMk5AVMzdEI2d9IjaujjwttK5U4gkOQ2yB6hvQ5O93ifT080lx/wrJ+bb3DGeAgClcPVr5lW1kW63JwXy2GJZg8qjvMxUCC5MXhAjJx0QcxdsIzVHKpJ5qS7cnTUv+ORtVglfWl3H7KNdY3CFiquf1PEh8uadoJglEEkn3l25b1sQXEJkQ7RZRQZYO3/O6BC4SRyYXAGozYnsscTK+b/7Rwx3ttHVUYMvcbSqwPhGFabrS78tcSgmh0OlWcng4628G/YZS/Ekjd2efSMaml1O84bfNm7yFOuqXSrRKMxo/XimS/HHwAqdQ7iCvQrF/WV5Jv3aKDy36AMKc7fgv/1mLN85dDc/fF4l0C1uI7/wRhcGakd0UYyKAzX+lRT/xQMo0TuR9ZBe8jDhU9obgXQgiQ1omT2iHWS7ki3n4nRhVBP2kqg1ARCek5uPEhq1Y862Ram6L2/Lj+6xOsmLk++rP4vIW3qm3YyfNGq1D1Bp W+cB3OHF ncoHIhLyQyjsiDYd4kJ87bCgyKGwupj4Q21t/32cqrxNJf7DPIf9RjVlRf68o9G/DfurfbeNnWvv8mBlS75fDPaian026cw3PQPaJwBLdAJZpiJFFfSr2YftBMHbQR/3UfPVNqMio1zuKy1mvVX8rqbMSkc2P2VkGaJaW7XPCTzQLEB5JklDbg2Aem0SdlHzQTVPC0XEWhLB9IiGQlWYqxnM90gxN+AlHXxNCx9ILQHjdwn8vfDZaiVW5hXTQ5Q7fMZr6CoBsceiXz5mNQVI9pHJkWUhvKOOc44QXcIv2GqZ50O13wSGoQQSb52mm6rIoh99hYGGT5lUou73pC7fjhK/fBBnQJPlk6J48bDm0wgxZMP4ERrmRMbt38qgNi7TsLOwN4r2xAEN5kTk//xIiilM1WXRo9fUNJqv3XqMRk5GcHUqaqGdxdL+yA0chWGkhB2gVSYHAUwl2Lx8yIBvyWEl1GRF5XpRJj06uUz3RqT9EBIiwhZoB6QCW0Q== 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 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.= c index df6b81a43893..e26d57676fe3 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -398,17 +398,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 @@ -1283,7 +1277,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct se= q_file *m) { =09unsigned int i; =20 -=09if (!pool->use_dma_alloc && pool->nid =3D=3D NUMA_NO_NODE) { +=09if (!pool->use_dma_alloc) { =09=09seq_puts(m, "unused\n"); =09=09return 0; =09} @@ -1294,10 +1288,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct s= eq_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->use_dma_alloc) -=09=09=09seq_puts(m, "DMA "); -=09=09else -=09=09=09seq_printf(m, "N%d ", pool->nid); +=09=09seq_puts(m, "DMA "); =09=09switch (i) { =09=09case ttm_cached: =09=09=09seq_puts(m, "\t:"); --=20 2.49.0