From patchwork Fri Sep 30 15:39:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12995709 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 2D524C433FE for ; Fri, 30 Sep 2022 15:42:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44E6010ED63; Fri, 30 Sep 2022 15:42:26 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0A5A10ED63; Fri, 30 Sep 2022 15:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664552541; x=1696088541; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nIcncyGkzAFU5EaPSD+Vi95qDGxy7a548QZ9hHeem30=; b=kTdK3i8kbqkHwTa1ne9NTldfwQuGFB0M4pzQRwdbzPiVoMwF1GPUmVua Wk5xe3mSX7v3GH67IjYjOmXaHqxd1VZ5XMJw7TSyFQ78XYS+bYdoPyQhH xad7iGe16B75aiK0sA4E9Y9tLHDwWp+RFl5iUD55OMjyZyXYjfc2VDqyg hwz21eXNv3cVlwT/nbL+KsDCeumn01p/iqu7FcpHeF1ywOa7zwMFq2jLC aQGJlkoN0hAy4r9ZK14+/VSxghrNjD98tWTrYoUM6+ntyBbQ8gTAVnhVN kBVKKXvXehmRo5HuOAlohkx4l73vaok9zMZUa91NBS9NUMy3VGhpqbQKW A==; X-IronPort-AV: E=McAfee;i="6500,9779,10486"; a="282583549" X-IronPort-AV: E=Sophos;i="5.93,358,1654585200"; d="scan'208";a="282583549" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2022 08:42:21 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10486"; a="711835709" X-IronPort-AV: E=Sophos;i="5.93,358,1654585200"; d="scan'208";a="711835709" Received: from dtrawins-mobl1.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.7.39]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2022 08:42:20 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Fri, 30 Sep 2022 16:39:57 +0100 Message-Id: <20220930153957.416938-1-matthew.auld@intel.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/ttm: move bo->resource check in vm_access X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Touching bo->resource looks like it should require first locking the object, since this state is dynamic and could potentially change from under us. Signed-off-by: Matthew Auld Cc: Christian König --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 38119311284d..8a0de14d8c85 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -412,13 +412,15 @@ int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr, << PAGE_SHIFT); int ret; - if (len < 1 || (offset + len) >> PAGE_SHIFT > bo->resource->num_pages) - return -EIO; - ret = ttm_bo_reserve(bo, true, false, NULL); if (ret) return ret; + if (len < 1 || (offset + len) >> PAGE_SHIFT > bo->resource->num_pages) { + ret = -EIO; + goto out_reserve; + } + switch (bo->resource->mem_type) { case TTM_PL_SYSTEM: fallthrough; @@ -433,6 +435,7 @@ int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr, ret = -EIO; } +out_reserve: ttm_bo_unreserve(bo); return ret;