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 7C8A9C4332F for ; Sat, 31 Dec 2022 20:06:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235989AbiLaUGE (ORCPT ); Sat, 31 Dec 2022 15:06:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235915AbiLaUFl (ORCPT ); Sat, 31 Dec 2022 15:05:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A1729FFD; Sat, 31 Dec 2022 12:05:41 -0800 (PST) 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 D6B9160BEA; Sat, 31 Dec 2022 20:05:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CC65C433D2; Sat, 31 Dec 2022 20:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672517140; bh=vPjXtMkTjZo8i1uEvZ9hNs9r/5PNZTCV+uUHAufChzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f9enGUiAgX9VaO7IVuk1b2blZaaVvxJYu/SLkZ5ml61Var+2IDGPlilL7qr1MdxeU qjqUE2h4VfyS+JCPhZGkjwXqlvojHvb6QAxZ/8hl8//zNR6lRUe1B9SZ6ODa75blmo s4rLduQctkdwALjPKktHTyWxdTtLy7vinqWCMcgb2OIr6g+O3koVSRYMSYPJUTs16n 3cJ337PA36IUe7Hqx4XWZ1cc9l0pry+sW4Qpg9coADMssLXzFOB9Q1rjr9QxjjZd1V kx1pw9BIDn7FiKlPZo+XondsffcO7xUTPTFBP6Jlh62i7FWe58y+XFCt/NZRR0Uiwq Q1pdsq+JqrY9w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luben Tuikov , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , AMD Graphics , Alex Deucher , Sasha Levin , Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Felix.Kuehling@amd.com, matthew.auld@intel.com, Yuliang.Shi@amd.com, rajneesh.bhardwaj@amd.com, sunpeng.li@amd.com, Philip.Yang@amd.com, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.0 5/7] drm/amdgpu: Fix size validation for non-exclusive domains (v4) Date: Sat, 31 Dec 2022 15:05:00 -0500 Message-Id: <20221231200502.1748784-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221231200502.1748784-1-sashal@kernel.org> References: <20221231200502.1748784-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luben Tuikov [ Upstream commit 7554886daa31eacc8e7fac9e15bbce67d10b8f1f ] Fix amdgpu_bo_validate_size() to check whether the TTM domain manager for the requested memory exists, else we get a kernel oops when dereferencing "man". v2: Make the patch standalone, i.e. not dependent on local patches. v3: Preserve old behaviour and just check that the manager pointer is not NULL. v4: Complain if GTT domain requested and it is uninitialized--most likely a bug. Cc: Alex Deucher Cc: Christian König Cc: AMD Graphics Signed-off-by: Luben Tuikov Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 4570ad449390..eb2fa63d93d9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -446,27 +446,24 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, /* * If GTT is part of requested domains the check must succeed to - * allow fall back to GTT + * allow fall back to GTT. */ if (domain & AMDGPU_GEM_DOMAIN_GTT) { man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT); - if (size < man->size) + if (man && size < man->size) return true; - else - goto fail; - } - - if (domain & AMDGPU_GEM_DOMAIN_VRAM) { + else if (!man) + WARN_ON_ONCE("GTT domain requested but GTT mem manager uninitialized"); + goto fail; + } else if (domain & AMDGPU_GEM_DOMAIN_VRAM) { man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM); - if (size < man->size) + if (man && size < man->size) return true; - else - goto fail; + goto fail; } - /* TODO add more domains checks, such as AMDGPU_GEM_DOMAIN_CPU */ return true; -- 2.35.1