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 2540FCE79AB for ; Wed, 20 Sep 2023 09:50:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED6F710E240; Wed, 20 Sep 2023 09:50:15 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD0D510E240 for ; Wed, 20 Sep 2023 09:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695203413; x=1726739413; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=NEYoeWhumpLkX1EjnOV90aaKGLqrgUVB3QC8L8mj9Ic=; b=Sw84/x/AOJ0T8r0s+ovy0ma/AKmbyJUSWEvJ3cxhFf4FvBOd77Wu0+NF VtKrT2zLeysGhORGl/bxz7/P0ImTIMDX+/5f1hZoKrpDO8dtoTTAPaA3m xnRq3H81Yxj6zdWKerBIO/qCnbRDIlr4ce3s1OuL4VPflAShC4yd2OcGh gaTZwYinKqV/RMiObqZ4+mNBPo9wXDfNxOBAgHoIOp4ZcIemXKcJnudBg yw+jZ4jXAX5ZAOxv86nc//SBw3U5zBI5TE/rXfO+EXzngnVxxP9vQW6Na op9hw08Zadz+l/gfRtkMxxhYszcyPv3D58Pq79yS3PESBzZyl7W949hay g==; X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="411120968" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="411120968" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 02:50:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="746580110" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="746580110" Received: from noors55x-mobl1.gar.corp.intel.com (HELO fedora..) ([10.249.254.146]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 02:50:11 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Date: Wed, 20 Sep 2023 11:50:01 +0200 Message-ID: <20230920095001.5539-1-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v2] drm/xe: Disallow pinning dma-bufs in VRAM X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" For now only support pinning in TT memory, for two reasons: 1) Avoid pinning in a placement not accessible to some importers. 2) Pinning in VRAM requires PIN accounting which is a to-do. v2: - Adjust the dma-buf kunit test accordingly. Suggested-by: Oded Gabbay Signed-off-by: Thomas Hellström Reviewed-by: Oded Gabbay --- drivers/gpu/drm/xe/tests/xe_dma_buf.c | 16 ++++++++++++---- drivers/gpu/drm/xe/xe_dma_buf.c | 25 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/tests/xe_dma_buf.c b/drivers/gpu/drm/xe/tests/xe_dma_buf.c index 1c3f4bc72b99..ee911df94cc9 100644 --- a/drivers/gpu/drm/xe/tests/xe_dma_buf.c +++ b/drivers/gpu/drm/xe/tests/xe_dma_buf.c @@ -150,11 +150,19 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe) /* Is everything where we expect it to be? */ xe_bo_lock(import_bo, false); err = xe_bo_validate(import_bo, NULL, false); - if (err && err != -EINTR && err != -ERESTARTSYS) - KUNIT_FAIL(test, - "xe_bo_validate() failed with err=%d\n", err); - check_residency(test, bo, import_bo, dmabuf); + /* Pinning in VRAM is not allowed. */ + if (!is_dynamic(params) && + params->force_different_devices && + !(params->mem_mask & XE_BO_CREATE_SYSTEM_BIT)) + KUNIT_EXPECT_EQ(test, err, -EINVAL); + /* Otherwise only expect interrupts or success. */ + else if (err && err != -EINTR && err != -ERESTARTSYS) + KUNIT_EXPECT_TRUE(test, !err || err == -EINTR || + err == -ERESTARTSYS); + + if (!err) + check_residency(test, bo, import_bo, dmabuf); xe_bo_unlock(import_bo); } drm_gem_object_put(import); diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c index 09343b8b3e96..bd8d51e7f93f 100644 --- a/drivers/gpu/drm/xe/xe_dma_buf.c +++ b/drivers/gpu/drm/xe/xe_dma_buf.c @@ -49,13 +49,30 @@ static int xe_dma_buf_pin(struct dma_buf_attachment *attach) { struct drm_gem_object *obj = attach->dmabuf->priv; struct xe_bo *bo = gem_to_xe_bo(obj); + struct xe_device *xe = xe_bo_device(bo); + int ret; /* - * Migrate to TT first to increase the chance of non-p2p clients - * can attach. + * For now only support pinning in TT memory, for two reasons: + * 1) Avoid pinning in a placement not accessible to some importers. + * 2) Pinning in VRAM requires PIN accounting which is a to-do. */ - (void)xe_bo_migrate(bo, XE_PL_TT); - xe_bo_pin_external(bo); + if (xe_bo_is_pinned(bo) && bo->ttm.resource->placement != XE_PL_TT) { + drm_dbg(&xe->drm, "Can't migrate pinned bo for dma-buf pin.\n"); + return -EINVAL; + } + + ret = xe_bo_migrate(bo, XE_PL_TT); + if (ret) { + if (ret != -EINTR && ret != -ERESTARTSYS) + drm_dbg(&xe->drm, + "Failed migrating dma-buf to TT memory: %pe\n", + ERR_PTR(ret)); + return ret; + } + + ret = xe_bo_pin_external(bo); + xe_assert(xe, !ret); return 0; } -- 2.41.0