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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE12BC2D0A3 for ; Tue, 3 Nov 2020 21:49:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7E5E22384 for ; Tue, 3 Nov 2020 21:49:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604440149; bh=eAxzmhxaZ1kV6zsX3y87pIkAiEU459Pq/otXWw1pE+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Mr5YnAOdHECjYaI2BHIrvjGBJ1XeX9JC+vuAla4w1BOSpRPDO/YoimR2uZNGkmBC+ XyoEF/7b0AYTkQTGFK2z/YEcBwpgIO3VHDvSQI7+UHSyy+gcb7vzy24lofjxy5KDN5 5BreN2gLOiYQgOq1FAVnZsOCYKMw3z1EpOYuUKfE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731001AbgKCUtt (ORCPT ); Tue, 3 Nov 2020 15:49:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:43218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731647AbgKCUts (ORCPT ); Tue, 3 Nov 2020 15:49:48 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2E34F223FD; Tue, 3 Nov 2020 20:49:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436587; bh=eAxzmhxaZ1kV6zsX3y87pIkAiEU459Pq/otXWw1pE+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gn7fZaEvQhe1CMTk266dUvN3M8msrwpjzyHMk/NOvyQVvqIRvvY2P2UT9yIhw3G/F vwTKeetjGHm+329Slrlz2w1kI5hFpFcBz+HHQGTjN1ctbzc+qO0q1TKRZRkZNt0/TB Vx42wK5W/vUnxwvEDG8hk/EdSwef1hT3qaiH4Zt4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Madhav Chauhan , Alex Deucher Subject: [PATCH 5.9 316/391] drm/amdgpu: dont map BO in reserved region Date: Tue, 3 Nov 2020 21:36:07 +0100 Message-Id: <20201103203408.434205405@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Madhav Chauhan commit c4aa8dff6091cc9536aeb255e544b0b4ba29faf4 upstream. 2MB area is reserved at top inside VM. Suggested-by: Christian König Signed-off-by: Madhav Chauhan Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -596,6 +596,7 @@ int amdgpu_gem_va_ioctl(struct drm_devic struct ww_acquire_ctx ticket; struct list_head list, duplicates; uint64_t va_flags; + uint64_t vm_size; int r = 0; if (args->va_address < AMDGPU_VA_RESERVED_SIZE) { @@ -616,6 +617,15 @@ int amdgpu_gem_va_ioctl(struct drm_devic args->va_address &= AMDGPU_GMC_HOLE_MASK; + vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE; + vm_size -= AMDGPU_VA_RESERVED_SIZE; + if (args->va_address + args->map_size > vm_size) { + dev_dbg(&dev->pdev->dev, + "va_address 0x%llx is in top reserved area 0x%llx\n", + args->va_address + args->map_size, vm_size); + return -EINVAL; + } + if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) { dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n", args->flags);