From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B17ED47ECC5 for ; Tue, 11 Aug 2026 19:42:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786477366; cv=none; b=p7FRwONZF8DAU8owsWprvKhsBOXvXKDwcbOpAepRxy03qnxD4CA0tmtm/JEGuWr5wLrdI6SSMV6xUslKSBGLBKBMn1D3rM+bGXDY+wyOAig77/JpuJMVdcACQESizeyW8Pt1/Qe11mfh2bv/x+HMsc8ozT9NonH2JU0J25T1MpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786477366; c=relaxed/simple; bh=U1vS2hAziy9qUItkEoTyRmbezIqMpTHDIy3iBj2cyM8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QezyzU9xdc6UwoEdCr6vkNcP0chiWQJHXM8C5LibUzUGVIXNk9NSpetA0AgTNuC4ZsEaUFE7xR90NS6GIkPjWCYSbW88hV3txli6SLOR0Nxn9pDu+aPM5quSGML6hX2d4kHq3EHjnAYiWusPjxEklMFO2ymx0JQ/TshJG08Tx8Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NGm56c+a; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NGm56c+a" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4954aff6088so513935e9.3 for ; Tue, 11 Aug 2026 12:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786477363; x=1787082163; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=ThEXNcRr1uXZthkNQc1yyhogFUr1K8iZ1YVWwE63FbE=; b=NGm56c+aCWP/l58H2V1CRfpFp8lr6tPBhLTbD+n9TyELFNa/PLbcoBaPWP7rwjWO+9 0Q6n/SlHCFx66NvBjbA1Jm7ZorAJFSSY9wcSGvCXfeSTRhp1Gf1GbLt7icV1U0QsCQH2 Tgw941ZC9vgqtdYK4SPXePgU5P/4EO+WhZhgButpuwKhAjrT7xJimL8xZQ2QQW5Z0iRh 4iGyhbGmbM7Sl5tS6vpPxnBOWPFPmzstynoiB3sqMfzqaBmj8s9UPnFeiRPixDhUPb5P v5jGFK7OZbWFjjs+PDgfwoZdNoVZ62YGWLt4RnQGQwuEh0ZIn0ZEoASRUy9EkrSGSDLc xIcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786477363; x=1787082163; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ThEXNcRr1uXZthkNQc1yyhogFUr1K8iZ1YVWwE63FbE=; b=HCLPVpoCL8hpp3MNVsC6YDHT2ykca1t1pjYoL0EmpyJd7b3WclOIHNwKz50xoi7HZu g8+N7r6jR/PVOKBs8ywme/L/4oIqniaW5S6QtYhbAM3AMkrx5X8dxCQn1tgjogPxfcGK FpHf6q+2aEiyv+HXRgv5xlBmtHTVE/pDhYZvJI6MV+KR2KQbPsDRHNsbjgBo8lM1JzJ0 7E09lkgmyv+RPxn53r59G1zwGP6wm/QO3VWKK02W8dkeadBrScI2obkIz9ySOd+xXQ4V V+byolYrtA2NjIjx9Hg3irmba/3T/JuwasXW/Mc7LJrl7zXYsG53bs1IVbU3O0iEuwGv racA== X-Forwarded-Encrypted: i=1; AHgh+RqcGdci8vNYWtC41ZONBVBELrd5m4Qn7gQZX3GD1s63RVpnK0pf7h5Hpm/oHswWYmNM8JOrlhWqjEbnAMQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1JSbPYE2Vj3k9bqMqrYnA+OdOfep9fdFBJ+32gG1ly4+nYBNR aO65z3rn5RfOZV/MQVNEVQAU4UTsYNRym22J0xYddoD/5ZcnXmRVylT+ X-Gm-Gg: AR+sD12cJ36p/pntDgC/qvH/uaqEk3+4GZQLKKlf4aKgQydrF1SrP9EspWcLG4PKYag 4xKhiqZuYgejinJMRde7vHtvIdegin5TiJjhrHpllka4vPMA26eXJvuhJpPUNSAKS9OP/fHDrtr d7RLC9348DDR3IHgr4HBLCSS6Ux6wdouEni9t+1e/54JuNn5IiQcgAkm6Bk4LvArF5+nNzQ8b7X nImnfP7uEcQTq3bHSW/DiOWLhE3JYhvSuiDu2uFE1vry1DFxqPwd8j14MHGXxqN+kb3YXEzUo9B 9HCIp7rk5DE7hZOdXWvj1ai7mIQZZmzQxpCas1LXt9MFqEqvCw28PvZRcT1P5hGCZqcrEhB9hyY 1YXb5jmqNPB08NTj4AZzSgnJthQFY2DE2EMzx5ycpXyFkr5bxXEi0ayS3p4zQzEhx3Llt1glhjh KTf8smafRgKrP1Z5ibyVPF6RvF1rmTtYQHmw6pReY23pTOr6wmiqx1kRZ53xKYnckiYK50P9h1j 9CB1JJMkZOfW2AS4DNSrjXeilFU7cYxT4qL0xkIuExeVIbhqsu0vIlCdRiy/pA= X-Received: by 2002:a05:600c:1f83:b0:499:4e47:eaf2 with SMTP id 5b1f17b1804b1-49978413130mr87241535e9.6.1786477362706; Tue, 11 Aug 2026 12:42:42 -0700 (PDT) Received: from torre-GIGABYTE-B550-AORUS-ELITE-V2 (212.pool95-21-2.static.orange.es. [95.21.2.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4997adad05esm3986195e9.3.2026.08.11.12.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 12:42:42 -0700 (PDT) From: =?UTF-8?q?=C3=93scar=20Meg=C3=ADa=20L=C3=B3pez?= To: Christian Koenig , Huang Rui Cc: =?UTF-8?q?=C3=93scar=20Meg=C3=ADa=20L=C3=B3pez?= , Matthew Auld , Matthew Brost , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v5 4/6] ttm_pool_type_init() does not check return value Date: Tue, 11 Aug 2026 21:42:19 +0200 Message-ID: <20260811194224.121597-5-megia.oscar@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260811194224.121597-1-megia.oscar@gmail.com> References: <20260811194224.121597-1-megia.oscar@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: ttm_pool_mgr_init() does not check ttm_pool_type_init() return value and does not free pool if returns error. Fix: Move up shrinker_alloc(), check ttm_pool_type_init() return and free pool types and shrinker if non-zero and return error. Assisted-by: OpenCode:1.17.18-Big Pickle/DeepSeek V4 Flash Assisted-by: claude.ai:Sonnet 5 Cc: # 7.1.0 Fixes: 444e2a19d7fd ("ttm/pool: port to list_lru. (v2)") Signed-off-by: Óscar Megía López --- drivers/gpu/drm/ttm/ttm_pool.c | 100 ++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index 87c843f52736..74d8770f41d8 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -1421,6 +1421,54 @@ static inline u64 ttm_get_node_memory_size(int nid) return managed_pages * PAGE_SIZE; } +static void ttm_pool_type_fini_and_list_lru_destroy(unsigned int nr) +{ + unsigned int i; + + if (nr == 0) + return; + + for (i = 0; i < nr; ++i) { + ttm_pool_type_fini(&global_write_combined[i]); + ttm_pool_type_fini(&global_uncached[i]); + ttm_pool_type_fini(&global_dma32_write_combined[i]); + ttm_pool_type_fini(&global_dma32_uncached[i]); + } + + /* We removed the pool types from the LRU, but we need to also make sure + * that no shrinker is concurrently freeing pages from the pool. + */ + ttm_pool_synchronize_shrinkers(); + + for (i = 0; i < nr; ++i) { + list_lru_destroy(&global_write_combined[i].pages); + list_lru_destroy(&global_uncached[i].pages); + list_lru_destroy(&global_dma32_write_combined[i].pages); + list_lru_destroy(&global_dma32_uncached[i].pages); + } + +} + +static void ttm_pool_type_fini_and_list_lru_destroy_partial( + struct ttm_pool_type *types[], unsigned int n) +{ + unsigned int k; + + if (n == 0) + return; + + for (k = 0; k < n; ++k) + ttm_pool_type_fini(types[k]); + + /* We removed the pool types from the LRU, but we need to also make sure + * that no shrinker is concurrently freeing pages from the pool. + */ + ttm_pool_synchronize_shrinkers(); + + for (k = 0; k < n; ++k) + list_lru_destroy(&types[k]->pages); +} + /** * ttm_pool_mgr_init - Initialize globals * @@ -1431,6 +1479,8 @@ static inline u64 ttm_get_node_memory_size(int nid) int ttm_pool_mgr_init(unsigned long num_pages) { unsigned int i; + int ret = 0; + struct ttm_pool_type *types_free[3]; int nid; for_each_node(nid) { @@ -1445,15 +1495,53 @@ int ttm_pool_mgr_init(unsigned long num_pages) spin_lock_init(&shrinker_lock); INIT_LIST_HEAD(&shrinker_list); + mm_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "drm-ttm_pool"); + if (!mm_shrinker) + return -ENOMEM; + for (i = 0; i < NR_PAGE_ORDERS; ++i) { - ttm_pool_type_init(&global_write_combined[i], NULL, + ret = ttm_pool_type_init(&global_write_combined[i], NULL, ttm_write_combined, i); - ttm_pool_type_init(&global_uncached[i], NULL, ttm_uncached, i); + if (ret) { + ttm_pool_type_fini_and_list_lru_destroy(i); + shrinker_free(mm_shrinker); + return ret; + } + + ret = ttm_pool_type_init(&global_uncached[i], NULL, ttm_uncached, i); + if (ret) { + types_free[0] = &global_write_combined[i]; + ttm_pool_type_fini_and_list_lru_destroy_partial(types_free, 1); - ttm_pool_type_init(&global_dma32_write_combined[i], NULL, + ttm_pool_type_fini_and_list_lru_destroy(i); + shrinker_free(mm_shrinker); + return ret; + } + + ret = ttm_pool_type_init(&global_dma32_write_combined[i], NULL, ttm_write_combined, i); - ttm_pool_type_init(&global_dma32_uncached[i], NULL, + if (ret) { + types_free[0] = &global_write_combined[i]; + types_free[1] = &global_uncached[i]; + ttm_pool_type_fini_and_list_lru_destroy_partial(types_free, 2); + + ttm_pool_type_fini_and_list_lru_destroy(i); + shrinker_free(mm_shrinker); + return ret; + } + + ret = ttm_pool_type_init(&global_dma32_uncached[i], NULL, ttm_uncached, i); + if (ret) { + types_free[0] = &global_write_combined[i]; + types_free[1] = &global_uncached[i]; + types_free[2] = &global_dma32_write_combined[i]; + ttm_pool_type_fini_and_list_lru_destroy_partial(types_free, 3); + + ttm_pool_type_fini_and_list_lru_destroy(i); + shrinker_free(mm_shrinker); + return ret; + } } #ifdef CONFIG_DEBUG_FS @@ -1467,10 +1555,6 @@ int ttm_pool_mgr_init(unsigned long num_pages) #endif #endif - mm_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "drm-ttm_pool"); - if (!mm_shrinker) - return -ENOMEM; - mm_shrinker->count_objects = ttm_pool_shrinker_count; mm_shrinker->scan_objects = ttm_pool_shrinker_scan; mm_shrinker->batch = TTM_SHRINKER_BATCH; -- 2.55.0