From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 3FCAE4252D7 for ; Wed, 8 Jul 2026 10:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783507894; cv=none; b=gZXcr+pJ+BXdzQ2gRUFJyeLWbcSVOSZL/hKxcz/oI7A0CA3taJYQP0UhHPgXy+cyyxc+xTjb5srPgIm+jbC21GaGaowYu13ODYu4BILakr70r16SAQsHgkxKQYUYfYuqjXSfmRSP1uJU/u9ZEMc7aj4CkZ1ITc+Hfw7RBzAEpRg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783507894; c=relaxed/simple; bh=hHt8ubitxvP4VSTFskrr/0FBstrCYFXf6MRWPKyu1Eo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LkY2kDO1zlUpS1HItqkxJ+3UcRcBqG4F726N4CFb//m0nKrN+ybgzThJHYyzuL9SInia7fCYom5Q8zMNdkyIf8tXrN9JX87a/D5jUZ7bkzY0P/XLCFBYy8/y0vCk3iVu7u8iMEoAAAECpD6+WxBEXaisXlY1JRh2LpyC9NVBWH0= 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=FpSDIOCL; arc=none smtp.client-ip=209.85.210.180 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="FpSDIOCL" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8454160043aso504545b3a.3 for ; Wed, 08 Jul 2026 03:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783507885; x=1784112685; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=4A/oLhgrzmAdBx1StZRZebeEK/bn7LhBiB+cKgJw7kc=; b=FpSDIOCLPYst8ndPLAsNg2ybjaHbiK+egVjP+01c5UzjafdzyObPJbIZOrc7MGrx0Z OO2qdTquy62vQiwFauYjLjpnwf+aaTbJ4cN23fYz88N6hlGdUnzS21EEOjM/LsMUR3aa UatkVM4v4jgyUSv3/k5fBN2TsNbiRQdeO52kSzOOLEdyQzqlqSIqyatJ//l8HP72vVox 0eE5MNlwce2tHR85EhSPBYQH5SUv9OEE04WgmUdDAZLIYB4y4a0FyW1lOb6BjJLm68Yu QA4AmZx4aup7tWQ1pmo30XhKab6jFD9975sh63z+xxqF6AtCdJ3nFL4a/j/Gia8xF8hu kK8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783507885; x=1784112685; h=content-transfer-encoding:mime-version: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=4A/oLhgrzmAdBx1StZRZebeEK/bn7LhBiB+cKgJw7kc=; b=MoQttTsly93369ePlkV+uGkP8TlOGipAfqAI63KuTfnWUa0Cz9AIEjlqLFTHBYxQm7 lHEUgiVvBFUO7Yxsbd7jSMmNZ0VNDraq7dBhQkMYKnT9/THKOIm5p/GqoYCPmUVX7C26 7AwvZhdlyyPj1bIpsLgNzkZ4KyJR2f5KCX2wPYaXF3NYtr/l65nNX/4huZSqFSbdDAlD cE3xrlSaQytYKUXcIV8z1SXxsPZX68Ad3fG3a5VHGU0e8hXXHpdSoPmAQkYDh21De90x FP83vieSaoxmkBVJi0IIMhVkC2GfivnoerOEZMLjJXtsgPcwJtDRKQd0Nw59p7UlquLs Vd5w== X-Forwarded-Encrypted: i=1; AHgh+Rp27NGfHAjyOWWJmqBdPbHVxDS8u2wsZ/Zxf48W3e6ziE9s+lqRNzeMAbKd3PWyxDKVTpuQJrlPiXMixv8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0ew+reejp4+BBB5qVlkPZ+1vw4y2DmWrF0Azwdk6VhDiHdiFO b9ioAOOnjP+HL1LkYkEbVSRy8GzAk+3dg75dPMHGy9OtCPNDYTLtjaka X-Gm-Gg: AfdE7cnU+ftk4nD8CAXe/JmOAIxDvraylxzIra9C1eb22TJ9VHvEecsz1uM5MJY2rzo HWKtT8jm3OSc1Sbwpk/Rv7V2w43/VP8Trr/tAOyAfrzF/kyRkFU0tNiUn7d4YAuIPErLDsXeU+h uDmKqVSdQ8DPmxHU5OhQJK1ZhyamZpQwpiFyGUm62nc/uk/rJ0uOu3LsPzzkCwr3cEGiY2QLp2w O87/Gjr9+YicxYiowx/kzzJ9vLRP25YorCIoJeaDENcfx6eLf8wMxwgYdIw/si5hAk00j6bXLjG OFTrNn0gGUqDyGiP7t6bjksMHTFzVq1KO6nEOfGvvQ+x01CACWB4KahW7aD8diqZ94qeHbAcqTT 33Erd66o1KXkkwzlO4a2q6jvttsDZFf2RjDkNHtw7gaeCvcRMnyigUBJWFMk+D4vRCzFwlG8bQZ oJVQ== X-Received: by 2002:a05:6a00:1795:b0:845:cb04:9cbf with SMTP id d2e1a72fcca58-84842fec8e2mr2316101b3a.39.1783507885324; Wed, 08 Jul 2026 03:51:25 -0700 (PDT) Received: from lgs.. ([118.193.39.24]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-848429d65fasm862430b3a.51.2026.07.08.03.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 03:51:24 -0700 (PDT) From: Guangshuo Li To: Felix Kuehling , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Oak Zeng , Haoxiang Li , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] drm/amdkfd: free MQD managers on DQM init failures Date: Wed, 8 Jul 2026 18:51:15 +0800 Message-ID: <20260708105115.746474-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The change referenced by the Fixes tag releases the HIQ SDMA MQD trunk buffer when device_queue_manager_init() fails after it has been allocated. However, the same failure path can also be reached after init_mqd_managers() has succeeded. At that point dqm->mqd_mgrs[] contains per-type MQD manager objects owned by the device queue manager. The normal teardown path frees those objects from uninitialize(), but the initialization error path only frees dqm itself. Free the MQD managers from the initialization error path as well. This is safe for earlier failures because dqm is zeroed when allocated and init_mqd_managers() clears the entries it rolls back internally. Fixes: b7cccc8286bb ("drm/amdkfd: fix a memory leak in device_queue_manager_init()") Signed-off-by: Guangshuo Li --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 2e010c1f8828..be75fd3a9acc 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -3103,6 +3103,7 @@ static void deallocate_hiq_sdma_mqd(struct kfd_node *dev, struct device_queue_manager *device_queue_manager_init(struct kfd_node *dev) { struct device_queue_manager *dqm; + int i; pr_debug("Loading device queue manager\n"); @@ -3231,6 +3232,9 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_node *dev) deallocate_hiq_sdma_mqd(dev, &dqm->hiq_sdma_mqd); out_free: + for (i = 0; i < KFD_MQD_TYPE_MAX; i++) + kfree(dqm->mqd_mgrs[i]); + kfree(dqm); return NULL; } -- 2.43.0