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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A350CCA47C for ; Tue, 7 Jun 2022 17:54:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EDBE10EAD6; Tue, 7 Jun 2022 17:54:54 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA6BE10EAD6; Tue, 7 Jun 2022 17:54:52 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4751761794; Tue, 7 Jun 2022 17:54:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3572FC3411F; Tue, 7 Jun 2022 17:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624492; bh=QPi9gTEDBtbnh4IrGry16SvcsyQzH/63P+jQ5n+dKRA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LLnO8PqRPVONsHyNrgs5mT7Ts74FxlK9BfGBDsWsOpWUplIod8BjBdvzMxKB3qEs6 8l9+enweCadTAKTy9Rjts73M/3TKJcPGvn0d5hGDcLvULWYt3qi1HgJkB2GmI+lSwR fOqul7cg1sn7sGlyou03WbDmHGWyNc9qWiPdT06vXCwEjwTQ7QzyLvT9Fv6Sa0gUFp G5R5i9nFv1Sw9XttaoTfMBGZSQ0uEyBZCYO1Yb/CxX+Kl/TPBWFT1fdeFDNn5bYsuo JaCROauYz+L2JAtkR8EcWgv80gRE5uXt1woIYBZLdvCy8gyAvDV01mctOuhWrZ6D7a A2PRwzUPXGocQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 43/60] drm/amd/pm: fix a potential gpu_metrics_table memory leak Date: Tue, 7 Jun 2022 13:52:40 -0400 Message-Id: <20220607175259.478835-43-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607175259.478835-1-sashal@kernel.org> References: <20220607175259.478835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Perry.Yuan@amd.com, lijo.lazar@amd.com, Xiaomeng.Hou@amd.com, yifan1.zhang@amd.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, Xinhui.Pan@amd.com, aaron.liu@amd.com, amd-gfx@lists.freedesktop.org, sathishkumar.sundararaju@amd.com, Gong Yuanjun , ray.huang@amd.com, mario.limonciello@amd.com, Alex Deucher , evan.quan@amd.com, christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Gong Yuanjun [ Upstream commit d2f4460a3d9502513419f06cc376c7ade49d5753 ] gpu_metrics_table is allocated in yellow_carp_init_smc_tables() but not freed in yellow_carp_fini_smc_tables(). Signed-off-by: Gong Yuanjun Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c index 0bc84b709a93..6f7d123702bd 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c @@ -190,6 +190,9 @@ static int yellow_carp_fini_smc_tables(struct smu_context *smu) kfree(smu_table->watermarks_table); smu_table->watermarks_table = NULL; + kfree(smu_table->gpu_metrics_table); + smu_table->gpu_metrics_table = NULL; + return 0; } -- 2.35.1 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73973C43334 for ; Tue, 7 Jun 2022 17:54:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D335310EC7F; Tue, 7 Jun 2022 17:54:53 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA6BE10EAD6; Tue, 7 Jun 2022 17:54:52 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4751761794; Tue, 7 Jun 2022 17:54:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3572FC3411F; Tue, 7 Jun 2022 17:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624492; bh=QPi9gTEDBtbnh4IrGry16SvcsyQzH/63P+jQ5n+dKRA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LLnO8PqRPVONsHyNrgs5mT7Ts74FxlK9BfGBDsWsOpWUplIod8BjBdvzMxKB3qEs6 8l9+enweCadTAKTy9Rjts73M/3TKJcPGvn0d5hGDcLvULWYt3qi1HgJkB2GmI+lSwR fOqul7cg1sn7sGlyou03WbDmHGWyNc9qWiPdT06vXCwEjwTQ7QzyLvT9Fv6Sa0gUFp G5R5i9nFv1Sw9XttaoTfMBGZSQ0uEyBZCYO1Yb/CxX+Kl/TPBWFT1fdeFDNn5bYsuo JaCROauYz+L2JAtkR8EcWgv80gRE5uXt1woIYBZLdvCy8gyAvDV01mctOuhWrZ6D7a A2PRwzUPXGocQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 43/60] drm/amd/pm: fix a potential gpu_metrics_table memory leak Date: Tue, 7 Jun 2022 13:52:40 -0400 Message-Id: <20220607175259.478835-43-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607175259.478835-1-sashal@kernel.org> References: <20220607175259.478835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Perry.Yuan@amd.com, lijo.lazar@amd.com, Xiaomeng.Hou@amd.com, yifan1.zhang@amd.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, Xinhui.Pan@amd.com, aaron.liu@amd.com, amd-gfx@lists.freedesktop.org, sathishkumar.sundararaju@amd.com, Gong Yuanjun , ray.huang@amd.com, mario.limonciello@amd.com, daniel@ffwll.ch, Alex Deucher , evan.quan@amd.com, christian.koenig@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Gong Yuanjun [ Upstream commit d2f4460a3d9502513419f06cc376c7ade49d5753 ] gpu_metrics_table is allocated in yellow_carp_init_smc_tables() but not freed in yellow_carp_fini_smc_tables(). Signed-off-by: Gong Yuanjun Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c index 0bc84b709a93..6f7d123702bd 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c @@ -190,6 +190,9 @@ static int yellow_carp_fini_smc_tables(struct smu_context *smu) kfree(smu_table->watermarks_table); smu_table->watermarks_table = NULL; + kfree(smu_table->gpu_metrics_table); + smu_table->gpu_metrics_table = NULL; + return 0; } -- 2.35.1 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A6F3CCA481 for ; Tue, 7 Jun 2022 19:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355364AbiFGTPe (ORCPT ); Tue, 7 Jun 2022 15:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352526AbiFGS0Q (ORCPT ); Tue, 7 Jun 2022 14:26:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E520316ABFD; Tue, 7 Jun 2022 10:54:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A7BA660DBA; Tue, 7 Jun 2022 17:54:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3572FC3411F; Tue, 7 Jun 2022 17:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624492; bh=QPi9gTEDBtbnh4IrGry16SvcsyQzH/63P+jQ5n+dKRA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LLnO8PqRPVONsHyNrgs5mT7Ts74FxlK9BfGBDsWsOpWUplIod8BjBdvzMxKB3qEs6 8l9+enweCadTAKTy9Rjts73M/3TKJcPGvn0d5hGDcLvULWYt3qi1HgJkB2GmI+lSwR fOqul7cg1sn7sGlyou03WbDmHGWyNc9qWiPdT06vXCwEjwTQ7QzyLvT9Fv6Sa0gUFp G5R5i9nFv1Sw9XttaoTfMBGZSQ0uEyBZCYO1Yb/CxX+Kl/TPBWFT1fdeFDNn5bYsuo JaCROauYz+L2JAtkR8EcWgv80gRE5uXt1woIYBZLdvCy8gyAvDV01mctOuhWrZ6D7a A2PRwzUPXGocQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gong Yuanjun , Alex Deucher , Sasha Levin , evan.quan@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, ray.huang@amd.com, lijo.lazar@amd.com, aaron.liu@amd.com, Xiaomeng.Hou@amd.com, Perry.Yuan@amd.com, yifan1.zhang@amd.com, sathishkumar.sundararaju@amd.com, mario.limonciello@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.17 43/60] drm/amd/pm: fix a potential gpu_metrics_table memory leak Date: Tue, 7 Jun 2022 13:52:40 -0400 Message-Id: <20220607175259.478835-43-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607175259.478835-1-sashal@kernel.org> References: <20220607175259.478835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gong Yuanjun [ Upstream commit d2f4460a3d9502513419f06cc376c7ade49d5753 ] gpu_metrics_table is allocated in yellow_carp_init_smc_tables() but not freed in yellow_carp_fini_smc_tables(). Signed-off-by: Gong Yuanjun Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c index 0bc84b709a93..6f7d123702bd 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c @@ -190,6 +190,9 @@ static int yellow_carp_fini_smc_tables(struct smu_context *smu) kfree(smu_table->watermarks_table); smu_table->watermarks_table = NULL; + kfree(smu_table->gpu_metrics_table); + smu_table->gpu_metrics_table = NULL; + return 0; } -- 2.35.1