From patchwork Thu Apr 1 14:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 12178177 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B9C23C433ED for ; Thu, 1 Apr 2021 14:37:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6BF6B6120F for ; Thu, 1 Apr 2021 14:37:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BF6B6120F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB37C6ECD0; Thu, 1 Apr 2021 14:37:34 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C06F6ECCF; Thu, 1 Apr 2021 14:37:33 +0000 (UTC) IronPort-SDR: pF9f95B2QIBWt1TYvw1IStI/88f8mcojPM8c2U/NG48hBgexk4+c1WzwLTIGpyVEq5aKPj/3va Cg+GBNQzwBnA== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="188996632" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="188996632" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 07:37:33 -0700 IronPort-SDR: P1TGdPaHf9EIRJxv3HrRjZuIhcK4sqq28mc9KYilAjKZzeXEu9+2SxhlCwFytOHjecNGuw2MAW UH3U/KmA8vXA== X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="419225327" Received: from jkrzyszt-mobl1.ger.corp.intel.com ([10.213.28.167]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 07:37:31 -0700 From: Janusz Krzysztofik To: igt-dev@lists.freedesktop.org Date: Thu, 1 Apr 2021 16:36:43 +0200 Message-Id: <20210401143643.7867-6-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210401143643.7867-1-janusz.krzysztofik@linux.intel.com> References: <20210401143643.7867-1-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RFC PATCH i-g-t 6/6] tests/core_hotunplug: Add 'GEM spin' variants 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: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Verify if a device with a GEM spin batch job still running on a GPU can be hot-unbound/unplugged cleanly and released. Signed-off-by: Janusz Krzysztofik --- tests/core_hotunplug.c | 124 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c index 0cb1267ae..f93545402 100644 --- a/tests/core_hotunplug.c +++ b/tests/core_hotunplug.c @@ -35,6 +35,7 @@ #include "i915/gem_vm.h" #include "igt.h" #include "igt_device_scan.h" +#include "igt_dummyload.h" #include "igt_kmod.h" #include "igt_sysfs.h" #include "sw_sync.h" @@ -440,6 +441,37 @@ static int local_gem_close(int fd, uint32_t handle) return igt_ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close_bo) ? -errno : 0; } +static int local_bo_busy(int fd, uint32_t handle) +{ + struct drm_i915_gem_busy busy = { .handle = handle, }; + + return igt_ioctl(fd, DRM_IOCTL_I915_GEM_BUSY, &busy) ? -errno : 0; +} + +static void local_spin_free(struct hotunplug *priv, igt_spin_t *spin) +{ + igt_spin_end(spin); + + spin->poll_handle = 0; + spin->handle = 0; + + if (spin->poll) { + void *ptr = spin->poll; + + spin->poll = NULL; + igt_assert(!gem_munmap(ptr, 4096)); + } + + if (spin->batch) { + void *ptr = spin->poll; + + spin->batch = NULL; + igt_assert(!gem_munmap(ptr, 4096)); + } + + igt_spin_free(priv->fd.drm, spin); +} + /* Subtests */ static void unbind_rebind(struct hotunplug *priv) @@ -862,6 +894,74 @@ static void prime_hotunplug_lateclose(struct hotunplug *priv) igt_assert_eq(dmabuf, -1); } +static void spin_hotunbind_lateclose(struct hotunplug *priv) +{ + igt_spin_t *spin; + + igt_require(priv->fd.drm = -1); + priv->fd.drm = local_drm_open_driver(false, "pre-", " for prerequisites check"); + + igt_require_intel(priv->fd.drm); + igt_require_gem(priv->fd.drm); + priv->fd.drm = close_device(priv->fd.drm, "", "pre-checked "); + + pre_check(priv); + + priv->fd.drm = local_drm_open_driver(false, "", " for hot unbind"); + + local_debug("%s\n", "running dummy load"); + spin = igt_spin_new(priv->fd.drm, .flags = IGT_SPIN_POLL_RUN); + igt_spin_busywait_until_started(spin); + + driver_unbind(priv, "hot ", 0); + + local_debug("%s\n", "trying to late query the dummy load related GEM object status"); + igt_assert_eq(local_bo_busy(priv->fd.drm, spin->handle), -ENODEV); + local_debug("%s\n", "trying to late close the dummy load related GEM objects"); + igt_assert_eq(local_gem_close(priv->fd.drm, spin->poll_handle), -ENODEV); + igt_assert_eq(local_gem_close(priv->fd.drm, spin->handle), -ENODEV); + + priv->fd.drm = close_device(priv->fd.drm, "late ", "unbound "); + igt_assert_eq(priv->fd.drm, -1); + + local_debug("%s\n", "trying to late free the dummy load"); + local_spin_free(priv, spin); +} + +static void spin_hotunplug_lateclose(struct hotunplug *priv) +{ + igt_spin_t *spin; + + igt_require(priv->fd.drm = -1); + priv->fd.drm = local_drm_open_driver(false, "pre-", " for prerequisites check"); + + igt_require_intel(priv->fd.drm); + igt_require_gem(priv->fd.drm); + priv->fd.drm = close_device(priv->fd.drm, "", "pre-checked "); + + pre_check(priv); + + priv->fd.drm = local_drm_open_driver(false, "", " for hot unplug"); + + local_debug("%s\n", "running dummy load"); + spin = igt_spin_new(priv->fd.drm, .flags = IGT_SPIN_POLL_RUN); + igt_spin_busywait_until_started(spin); + + device_unplug(priv, "hot ", 0); + + local_debug("%s\n", "trying to late query the dummy load related GEM object status"); + igt_assert_eq(local_bo_busy(priv->fd.drm, spin->handle), -ENODEV); + local_debug("%s\n", "trying to late close the dummy load related GEM objects"); + igt_assert_eq(local_gem_close(priv->fd.drm, spin->poll_handle), -ENODEV); + igt_assert_eq(local_gem_close(priv->fd.drm, spin->handle), -ENODEV); + + priv->fd.drm = close_device(priv->fd.drm, "late ", "removed "); + igt_assert_eq(priv->fd.drm, -1); + + local_debug("%s\n", "trying to late free the dummy load"); + local_spin_free(priv, spin); +} + /* Main */ igt_main @@ -1119,6 +1219,30 @@ igt_main recover(&priv); } + igt_fixture + post_healthcheck(&priv); + + igt_subtest_group { + igt_describe("Check if the driver can be cleanly unbound from a device with a still running spin batch, then released"); + igt_subtest("spin-hotunbind-lateclose") + spin_hotunbind_lateclose(&priv); + + igt_fixture + recover(&priv); + } + + igt_fixture + post_healthcheck(&priv); + + igt_subtest_group { + igt_describe("Check if a device with a still running spin batch can be cleanly unplugged, then released"); + igt_subtest("spin-hotunplug-lateclose") + spin_hotunplug_lateclose(&priv); + + igt_fixture + recover(&priv); + } + igt_fixture { post_healthcheck(&priv);