From patchwork Mon Feb 27 16:21:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Cavitt, Jonathan" X-Patchwork-Id: 13153862 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 CC592C64ED6 for ; Mon, 27 Feb 2023 16:25:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8808710E43C; Mon, 27 Feb 2023 16:25:41 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDAC710E45D for ; Mon, 27 Feb 2023 16:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677515138; x=1709051138; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=7hRREJFt1lu+Ymr58RYALiJPosNMad0rfX2pR8+P5Nc=; b=jRRXIMMF7NIlz3Dn0RVa9ShuolXJCtTD3xEBEILtXZ16w5tUUyBVe6uh PPkgQm/8EIz/K2+2Z/Ni3vKgyeWYmnudtapk/gl6jAhBe6zPjjLFD/RXa SwCaCjoyguNZh+EqBJo/5IXxqZf48R1esNfl5Vtlx9vHalzkJ0T+Pbwol Hqa860Uri+7vs0XRYc0ez6NlIFS+lfkM/IPuVw3Cem6dAjNXJmx73q30E 73GtxRQP+qIKFzSPi3P3T2WrnkxtS/RyP05SLNWg8K9TKi3urKqL4KgCj MH4dj86gr2uKg2DfR8s76TdRptsCvPxhQHegqQxv+c5LQUQIJ7jKEPUx1 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="317692971" X-IronPort-AV: E=Sophos;i="5.98,219,1673942400"; d="scan'208";a="317692971" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 08:25:37 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="706242883" X-IronPort-AV: E=Sophos;i="5.98,219,1673942400"; d="scan'208";a="706242883" Received: from dut-internal-9dd7.jf.intel.com ([10.24.14.53]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 08:25:37 -0800 From: Jonathan Cavitt To: intel-gfx@lists.freedesktop.org Date: Mon, 27 Feb 2023 08:21:07 -0800 Message-Id: <20230227162108.2412264-1-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v4 1/2] drm/i915: Use correct huge page manager for MTL 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: lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, jonathan.cavitt@intel.com, matthew.auld@intel.com, daniel.vetter@intel.com, chris.p.wilson@linux.intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" MTL currently uses gen8_ppgtt_insert_huge when managing huge pages. This is because MTL reports as not supporting 64K pages, or more accurately, the system that reports whether a platform has 64K pages reports false for MTL. This is only half correct, as the 64K page support reporting system only cares about 64K page support for LMEM, which MTL doesn't have. MTL should be using xehpsdv_ppgtt_insert_huge. However, simply changing over to using that manager doesn't resolve the issue because MTL is expecting the virtual address space for the page table to be flushed after initialization, so we must also add a flush statement there. v2: Update igt_mock_ppgtt_huge_fill with current behavior expectations. v3: Update igt_mock_ppgtt_64K with current behavior expectations. v4: Break mock subtest changes into separate patch. Signed-off-by: Jonathan Cavitt --- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c index 4daaa6f55668..9c571185395f 100644 --- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c +++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c @@ -570,6 +570,7 @@ xehpsdv_ppgtt_insert_huge(struct i915_address_space *vm, } } while (rem >= page_size && index < max); + drm_clflush_virt_range(vaddr, PAGE_SIZE); vma_res->page_sizes_gtt |= page_size; } while (iter->sg && sg_dma_len(iter->sg)); } @@ -707,7 +708,7 @@ static void gen8_ppgtt_insert(struct i915_address_space *vm, struct sgt_dma iter = sgt_dma(vma_res); if (vma_res->bi.page_sizes.sg > I915_GTT_PAGE_SIZE) { - if (HAS_64K_PAGES(vm->i915)) + if (GRAPHICS_VER_FULL(vm->i915) >= IP_VER(12, 50)) xehpsdv_ppgtt_insert_huge(vm, vma_res, &iter, cache_level, flags); else gen8_ppgtt_insert_huge(vm, vma_res, &iter, cache_level, flags); From patchwork Mon Feb 27 16:21:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Cavitt, Jonathan" X-Patchwork-Id: 13153861 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 3A747C64ED6 for ; Mon, 27 Feb 2023 16:25:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8050210E435; Mon, 27 Feb 2023 16:25:41 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id EBFF810E49F for ; Mon, 27 Feb 2023 16:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677515138; x=1709051138; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7/hU9VrcGisb3soU6xeJ1Ei4JyvvOaaHJ85fjObRjeM=; b=hlis2YbGGyUaj8beuW5vcyKZ1a8yRr5xB7Xm1+UfsBrIOlqt2dUFq9Ms 1f+XiqMH8tfSVfqyMquK0zlE/tkH1NeLGas/95zroIpQVExCCB4H79GyI 0F/MVdtOSB0EUbznUfPDYwq2wVdwy2736bM2mJIEgDip7sVs8ctU//h5r RPdI+ql1BKV+CjrcB6QdLmiAt9qByCTrNw7bWVcCK4i8i4IODGqch0rjv OL7qXaiFkL7SWSYrB3hAHmzQSYUYoGnrls75Ix1zVZGaKPQrSgZHJKUgQ LcZ6njqV6rDKL28b1AdjT2LClFMb+Sw0JnhrhxAC+AYrLlb6qUdU5Z7fe Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="317692972" X-IronPort-AV: E=Sophos;i="5.98,219,1673942400"; d="scan'208";a="317692972" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 08:25:37 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="706242886" X-IronPort-AV: E=Sophos;i="5.98,219,1673942400"; d="scan'208";a="706242886" Received: from dut-internal-9dd7.jf.intel.com ([10.24.14.53]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 08:25:37 -0800 From: Jonathan Cavitt To: intel-gfx@lists.freedesktop.org Date: Mon, 27 Feb 2023 08:21:08 -0800 Message-Id: <20230227162108.2412264-2-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227162108.2412264-1-jonathan.cavitt@intel.com> References: <20230227162108.2412264-1-jonathan.cavitt@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v4 2/2] drm/i915: Migrate platform-dependent mock hugepage selftests to live 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: lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, jonathan.cavitt@intel.com, matthew.auld@intel.com, daniel.vetter@intel.com, chris.p.wilson@linux.intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Convert the igt_mock_ppgtt_huge_fill and igt_mock_ppgtt_64K mock selftests into live selftests as their requirements have recently become platform-dependent. Additionally, apply necessary platform dependency checks to these tests. Signed-off-by: Jonathan Cavitt Reviewed-by: Matthew Auld --- .../gpu/drm/i915/gem/selftests/huge_pages.c | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c index defece0bcb81..375f119ab261 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c @@ -710,7 +710,7 @@ static void close_object_list(struct list_head *objects, } } -static int igt_mock_ppgtt_huge_fill(void *arg) +static int igt_ppgtt_huge_fill(void *arg) { struct i915_ppgtt *ppgtt = arg; struct drm_i915_private *i915 = ppgtt->vm.i915; @@ -784,7 +784,8 @@ static int igt_mock_ppgtt_huge_fill(void *arg) GEM_BUG_ON(!expected_gtt); GEM_BUG_ON(size); - if (expected_gtt & I915_GTT_PAGE_SIZE_4K) + if (expected_gtt & I915_GTT_PAGE_SIZE_4K && + GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) expected_gtt &= ~I915_GTT_PAGE_SIZE_64K; i915_vma_unpin(vma); @@ -831,7 +832,7 @@ static int igt_mock_ppgtt_huge_fill(void *arg) return err; } -static int igt_mock_ppgtt_64K(void *arg) +static int igt_ppgtt_64K(void *arg) { struct i915_ppgtt *ppgtt = arg; struct drm_i915_private *i915 = ppgtt->vm.i915; @@ -913,6 +914,17 @@ static int igt_mock_ppgtt_64K(void *arg) unsigned int offset = objects[i].offset; unsigned int flags = PIN_USER; + /* + * For modern GTT models, the requirements for marking a page-table + * as 64K have been relaxed. Account for this. + */ + + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { + expected_gtt = 0; + expected_gtt |= size & (SZ_64K | SZ_2M) ? I915_GTT_PAGE_SIZE_64K : 0; + expected_gtt |= size & SZ_4K ? I915_GTT_PAGE_SIZE_4K : 0; + } + for (single = 0; single <= 1; single++) { obj = fake_huge_pages_object(i915, size, !!single); if (IS_ERR(obj)) @@ -1910,8 +1922,6 @@ int i915_gem_huge_page_mock_selftests(void) SUBTEST(igt_mock_exhaust_device_supported_pages), SUBTEST(igt_mock_memory_region_huge_pages), SUBTEST(igt_mock_ppgtt_misaligned_dma), - SUBTEST(igt_mock_ppgtt_huge_fill), - SUBTEST(igt_mock_ppgtt_64K), }; struct drm_i915_private *dev_priv; struct i915_ppgtt *ppgtt; @@ -1962,6 +1972,8 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_ppgtt_sanity_check), SUBTEST(igt_ppgtt_compact), SUBTEST(igt_ppgtt_mixed), + SUBTEST(igt_ppgtt_huge_fill), + SUBTEST(igt_ppgtt_64K), }; if (!HAS_PPGTT(i915)) {