From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 87C40263C8F for ; Tue, 11 Aug 2026 14:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786458560; cv=none; b=RBQ9fUCE5BKyYxgKcImy33PRwIMhhFfzgh5oyjM5N59oX9ec7tCYZ4QtUPvLaNTYnGNoB1nUI7Q/8ADm6C00phZN+pospKh5zbTzNSKfzDHSg0GH4uyRav4XB0QvxLkIklA1kZNab0lz69j0ZEfzgcjl9mfa58bzzDX3UVENw8k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786458560; c=relaxed/simple; bh=25RfUnYCCAn500NPErkFHuNL6+Q3MhhwJRPB178c5V4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lJDkPoJomy64zrUWh588VXqCOT/++YA/AGI6cOc8cJVYBfIqjtLEFVkoxHj/bFBgqM99DHDf4xLN1dJP04Awe9E/tjITcOl6qxM3z05ZbDU85mQuiRJ8silq/WQeBZKSzhLgpEAZDqXMMucuvexdpky5QmdmvuvG1/vnru5mC6k= 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=GdWHcIH1; arc=none smtp.client-ip=209.85.210.178 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="GdWHcIH1" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-8484f229529so2450986b3a.2 for ; Tue, 11 Aug 2026 07:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786458559; x=1787063359; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=mwCkWoypVWX0DUrD2GWalLqHhPmC5gYTzx+dm4HNg9s=; b=GdWHcIH1txRQ0aCzC5Tu2tdg9NnSH3H4KapoV+2/77OSA9mkSZTMm+h5GXxLqfZZvo mEz3Ot6gw58HPf2/p3jqfDu8cMwhwYcXa2MRhRMf/fGRlwKsmGNPQI2hMUahzqw7Lt8A gGGREnTI+mfXMOpii52fEHOfl+2LZ8yLtI4xSnOOvtuw6G5FyW6Q8VcI+OgqMADPeK5U xee5dTAQIYx5SWyCsJoNxy4QvqKmJloiPOE6omP20zlZmMuLO4VuIaAPGKj1sxLRs/on xgqEPgwEMO6w5r3qBQHWT8FSfNYkTrbgH94YvtCH8J81XBCVCWtnNOJ/d4/sktmUj2mu sqag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786458559; x=1787063359; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=mwCkWoypVWX0DUrD2GWalLqHhPmC5gYTzx+dm4HNg9s=; b=FAruG1YervkrEzlgh7i8UvXscOS4KhiY3CpzT+7XUdqV4Q7lFGYLIdOPcgkjtfcfLw WAZ0dsJWq79KV98y9CFhdwZryXDWzm03YD6omzTjH3yd9zVW+1vdzX0QqcHpzHI8jNG+ XEyvxD+c2oTvId0omY5/EBC3hcAe4dsYJ4KIBkj9I3rrWt3aGZVrh3NAa58nnsIcRoMq qUz9AoKEvEMJNIcMxlLktPRphQfTx30l4OM/jaK78rr1hrfpsdHPJPfKat063z+LKWuS JBNfTsb7fng1IQE0XMiV+zqLyTP7AvBV3A+oIpCocUKeALvwkoEBLnfh9JsrFdcOcMkD FZRQ== X-Forwarded-Encrypted: i=1; AHgh+Rrri2Io56FAl3xb1yG0PvyH2outTBZ4ZWnmPw6UWKXMaoM+cTd/ii4BS7EcrFQHAGxB45mIA5EpVOMYe48=@vger.kernel.org X-Gm-Message-State: AOJu0Yyo78BiFHDtwboHWwPtuwvmrsXz2P9XJlsnMYB9j+hk7ze2Jdkg JKjQwDk1u+VgXPXBq3/HIEaZJDIJemOeAH6LAokJpiCitarqWReQmIsKnlijlspjPBE= X-Gm-Gg: AR+sD13mHyruRpfmPB/em2qFt5OYbnc/7/zbxBPKaA8GQ/KgomTRTVoEnmltK6ikM0U 2+vC/zDLSxXBqflwRDMdvk0OLzh5ODGVVgaL7puLO2sOmyHccvmW0StpCnxN9aUIgl64zamVN6I 9pyH8OdWNoHSQciC0kag1+Nd6Ck/E+PwttjQDXwbViLgqOBc4r6YNWTX8oy+zM++GL0ROUXdNtO sgMF43HNaRtVGJviep0LlCRt+WLI+HXB37XOjnxTQ+nMZndbeNg8sUKXiJMx4OFE4HUBNgwudel Qpe8do32l9Y1FtjTe2XvchtEfogEMoGBB+67NO7ppdt+uTPedi7oYDlG50TmHZ9fsB2ljdFGfC3 te0sC/CkBXL2klC49JKsQ6+/odEyGOgD0o3/Q1KQlPL3ZnvBW1wF91sqNXzuQVWJvIXxZRbW8k9 CT9rqM7boR2AgbqMm4OcT0i0owK4iQZrSkt0i6gAFoZ82GTC7vQNe467waddQ= X-Received: by 2002:a05:6a00:848:b0:845:e8b5:8c49 with SMTP id d2e1a72fcca58-84fa86aa6f8mr3656519b3a.10.1786458558584; Tue, 11 Aug 2026 07:29:18 -0700 (PDT) Received: from LAPTOP-N3B6U5LC.localdomain ([117.147.100.52]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84fa954fc8asm890209b3a.50.2026.08.11.07.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 07:29:18 -0700 (PDT) From: Zhenhao Wan Date: Tue, 11 Aug 2026 22:28:51 +0800 Subject: [PATCH 2/2] drm/nouveau/dmem: fix callocated underflow on large folio split 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: 7bit Message-Id: <20260811-b4-nouveau-dmem-thp-fixes-v1-2-2cdf9860af2a@gmail.com> References: <20260811-b4-nouveau-dmem-thp-fixes-v1-0-2cdf9860af2a@gmail.com> In-Reply-To: <20260811-b4-nouveau-dmem-thp-fixes-v1-0-2cdf9860af2a@gmail.com> To: Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrew Morton , Balbir Singh Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Zhenhao Wan , Yuhao Jiang , stable@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786458544; l=2343; i=whi4ed0g@gmail.com; h=from:subject:message-id; bh=25RfUnYCCAn500NPErkFHuNL6+Q3MhhwJRPB178c5V4=; b=KuT7Vz44ftGEbyMSNmyMs8gTFuhkVAnAk7FcqfCULSkaKx7+Tre0AqjyKJ+yRD05IFx+yF++P mhFHY/fO+knCTMRcui6xM+5LBLSBox31ZOFlheXXru87VbNIRBncJX0 X-Developer-Key: i=whi4ed0g@gmail.com; a=ed25519; pk=zRTKlstE0LmilshGwJsFYEVjiT6RiXMBXK8Og6VmuVQ= nouveau_dmem_folio_free() drops chunk->callocated once per freed folio, while a large (compound) device-private folio is only counted once when it is allocated. When such a folio is split, the mm core invokes ->folio_split() (nouveau_dmem_folio_split()) once for each new sub-folio, but the hook only fixes up the sub-folio metadata and leaves chunk->callocated unchanged. Each resulting sub-folio is later freed separately, so after a split the single allocation (+1) is met by N frees (-N), leaving chunk->callocated short by N-1. On the first split/free cycle it underflows: WARN_ON(!chunk->callocated) fires, the unsigned counter wraps and never returns to zero, so the chunk can no longer be reclaimed (nouveau_dmem_fini() also warns on the leaked count). Account for the new sub-folio in the split hook, under the same lock as nouveau_dmem_folio_free(), so the count stays balanced. Fixes: c32287471077 ("gpu/drm/nouveau: enable THP support for GPU memory migration") Reported-by: Yuhao Jiang Assisted-by: Claude:claude-opus-5 Cc: stable@vger.kernel.org Signed-off-by: Zhenhao Wan --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index d2abee3efb9a..ad4570c50be7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -279,11 +279,25 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) static void nouveau_dmem_folio_split(struct folio *head, struct folio *tail) { + struct nouveau_dmem_chunk *chunk; + struct nouveau_dmem *dmem; + if (tail == NULL) return; tail->pgmap = head->pgmap; tail->mapping = head->mapping; folio_set_zone_device_data(tail, folio_zone_device_data(head)); + + /* + * The split hands out a new independently-freeable folio that will + * later be released via nouveau_dmem_folio_free(); account for it so + * chunk->callocated stays balanced. + */ + chunk = nouveau_page_to_chunk(&head->page); + dmem = chunk->drm->dmem; + spin_lock(&dmem->lock); + chunk->callocated++; + spin_unlock(&dmem->lock); } static const struct dev_pagemap_ops nouveau_dmem_pagemap_ops = { -- 2.34.1