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 871F4EEB569 for ; Fri, 8 Sep 2023 19:30:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8498A10E116; Fri, 8 Sep 2023 19:30:12 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8304810E123; Fri, 8 Sep 2023 19:30:09 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 41431B821D4; Fri, 8 Sep 2023 19:30:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 526D5C433CD; Fri, 8 Sep 2023 19:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201406; bh=UlNHEZooncUx70aELClSSXCKe2hSn6Mzv2ec/t1aFdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXkhwhKRJ4WSZgPosT3jwaUXzj1yo+CdbdRqMZ6wtBE0+G8GASLbnCXotK1OlCELR vXvibF6tJMgu6Iz2Wkhu2i9ZNFgt5R5KPJ227DNwuDamjmhIL47MqdmxAUqy/nRExI 6b/mIK0J7ptPUJ5MfnlwMWianwRSE5suP/04Do28lbz73lqLvRJBwvcsn7cnHrtBFj Zgo++bvtT08ojMSGjlwaYOm4tzK3Dh0/vLc5AWvShjQtuRuqTijKOtGf5BXAOO95Ry pZmi2WUNYtMwCWbaaOnbSLDkuJNCJkOplD3bqct5lKerwTTpgzdQUmVqocmknoGoSr /f+JlA3xTShkg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 13/36] drm/amdgpu: Update ring scheduler info as needed Date: Fri, 8 Sep 2023 15:28:24 -0400 Message-Id: <20230908192848.3462476-13-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908192848.3462476-1-sashal@kernel.org> References: <20230908192848.3462476-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.2 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 , Philip.Yang@amd.com, Xinhui.Pan@amd.com, Lijo Lazar , amd-gfx@lists.freedesktop.org, le.ma@amd.com, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Alex Deucher , James Zhu , airlied@gmail.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Lijo Lazar [ Upstream commit 6cb209ed68e45c8e4b71d97a037ac6b7dbce9b50 ] Not all rings have scheduler associated. Only update scheduler data for rings with scheduler. It could result in out of bound access as total rings are more than those associated with particular IPs. Signed-off-by: Lijo Lazar Reviewed-by: James Zhu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c index 72b629a78c62c..d0fc62784e821 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c @@ -134,7 +134,7 @@ static int aqua_vanjaram_xcp_sched_list_update( for (i = 0; i < AMDGPU_MAX_RINGS; i++) { ring = adev->rings[i]; - if (!ring || !ring->sched.ready) + if (!ring || !ring->sched.ready || ring->no_scheduler) continue; aqua_vanjaram_xcp_gpu_sched_update(adev, ring, ring->xcp_id); -- 2.40.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 BDFB0EEB569 for ; Fri, 8 Sep 2023 19:31:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238646AbjIHTbK (ORCPT ); Fri, 8 Sep 2023 15:31:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230188AbjIHTbJ (ORCPT ); Fri, 8 Sep 2023 15:31:09 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6FDFE7F; Fri, 8 Sep 2023 12:30:44 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 526D5C433CD; Fri, 8 Sep 2023 19:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201406; bh=UlNHEZooncUx70aELClSSXCKe2hSn6Mzv2ec/t1aFdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXkhwhKRJ4WSZgPosT3jwaUXzj1yo+CdbdRqMZ6wtBE0+G8GASLbnCXotK1OlCELR vXvibF6tJMgu6Iz2Wkhu2i9ZNFgt5R5KPJ227DNwuDamjmhIL47MqdmxAUqy/nRExI 6b/mIK0J7ptPUJ5MfnlwMWianwRSE5suP/04Do28lbz73lqLvRJBwvcsn7cnHrtBFj Zgo++bvtT08ojMSGjlwaYOm4tzK3Dh0/vLc5AWvShjQtuRuqTijKOtGf5BXAOO95Ry pZmi2WUNYtMwCWbaaOnbSLDkuJNCJkOplD3bqct5lKerwTTpgzdQUmVqocmknoGoSr /f+JlA3xTShkg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lijo Lazar , James Zhu , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, le.ma@amd.com, Philip.Yang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.5 13/36] drm/amdgpu: Update ring scheduler info as needed Date: Fri, 8 Sep 2023 15:28:24 -0400 Message-Id: <20230908192848.3462476-13-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908192848.3462476-1-sashal@kernel.org> References: <20230908192848.3462476-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.2 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lijo Lazar [ Upstream commit 6cb209ed68e45c8e4b71d97a037ac6b7dbce9b50 ] Not all rings have scheduler associated. Only update scheduler data for rings with scheduler. It could result in out of bound access as total rings are more than those associated with particular IPs. Signed-off-by: Lijo Lazar Reviewed-by: James Zhu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c index 72b629a78c62c..d0fc62784e821 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c @@ -134,7 +134,7 @@ static int aqua_vanjaram_xcp_sched_list_update( for (i = 0; i < AMDGPU_MAX_RINGS; i++) { ring = adev->rings[i]; - if (!ring || !ring->sched.ready) + if (!ring || !ring->sched.ready || ring->no_scheduler) continue; aqua_vanjaram_xcp_gpu_sched_update(adev, ring, ring->xcp_id); -- 2.40.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 F29F9EEB566 for ; Fri, 8 Sep 2023 19:30:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 623E810E114; Fri, 8 Sep 2023 19:30:11 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8304810E123; Fri, 8 Sep 2023 19:30:09 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 41431B821D4; Fri, 8 Sep 2023 19:30:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 526D5C433CD; Fri, 8 Sep 2023 19:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201406; bh=UlNHEZooncUx70aELClSSXCKe2hSn6Mzv2ec/t1aFdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXkhwhKRJ4WSZgPosT3jwaUXzj1yo+CdbdRqMZ6wtBE0+G8GASLbnCXotK1OlCELR vXvibF6tJMgu6Iz2Wkhu2i9ZNFgt5R5KPJ227DNwuDamjmhIL47MqdmxAUqy/nRExI 6b/mIK0J7ptPUJ5MfnlwMWianwRSE5suP/04Do28lbz73lqLvRJBwvcsn7cnHrtBFj Zgo++bvtT08ojMSGjlwaYOm4tzK3Dh0/vLc5AWvShjQtuRuqTijKOtGf5BXAOO95Ry pZmi2WUNYtMwCWbaaOnbSLDkuJNCJkOplD3bqct5lKerwTTpgzdQUmVqocmknoGoSr /f+JlA3xTShkg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 13/36] drm/amdgpu: Update ring scheduler info as needed Date: Fri, 8 Sep 2023 15:28:24 -0400 Message-Id: <20230908192848.3462476-13-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908192848.3462476-1-sashal@kernel.org> References: <20230908192848.3462476-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.2 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 , Philip.Yang@amd.com, Xinhui.Pan@amd.com, Lijo Lazar , amd-gfx@lists.freedesktop.org, le.ma@amd.com, dri-devel@lists.freedesktop.org, Alex Deucher , James Zhu , christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Lijo Lazar [ Upstream commit 6cb209ed68e45c8e4b71d97a037ac6b7dbce9b50 ] Not all rings have scheduler associated. Only update scheduler data for rings with scheduler. It could result in out of bound access as total rings are more than those associated with particular IPs. Signed-off-by: Lijo Lazar Reviewed-by: James Zhu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c index 72b629a78c62c..d0fc62784e821 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c @@ -134,7 +134,7 @@ static int aqua_vanjaram_xcp_sched_list_update( for (i = 0; i < AMDGPU_MAX_RINGS; i++) { ring = adev->rings[i]; - if (!ring || !ring->sched.ready) + if (!ring || !ring->sched.ready || ring->no_scheduler) continue; aqua_vanjaram_xcp_gpu_sched_update(adev, ring, ring->xcp_id); -- 2.40.1