Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp1526686pxb; Fri, 21 Jan 2022 22:16:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJycHFCACglrihqaXFn4sTtybct4+xPH5IlL6Z+c6eXmliEaDaxQTjsxnLJBqSq5PzSZI1/W X-Received: by 2002:a63:35c1:: with SMTP id c184mr5100634pga.581.1642832203930; Fri, 21 Jan 2022 22:16:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642832203; cv=none; d=google.com; s=arc-20160816; b=Z7uHbcpc04QjI+Lk6wqSMeRrJ8cRP2OzKei0SqjVNhzG8No/zOZhv7SKmZpx9LVzKQ zhsvYe/gHh/9IStGzTxpqkQ4hbLpbHHN68VqDfHIhnDuAE4/1eagGK7J7wuVn+CEiaLi iwV1edypZwmALooco/R7Of5+qczU06egskvt4gVzkXTWNxviDHQWSF7C/k4zL1ZV/LQT uJ5zlMt0te1L82QGB474r4qVtGvtRjIGOn4+4XWi5Ct/exb6lbJV3ljFjY4i7YUiiTCF 6xTxHtR/AsqBw2QuHLHVRVKWJxAwV2wpb2zgQD0VyTa7lvjPjz3mZc6W/jwtavq8t3OO Mv0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eaFQS7DX/c4gyzk10pyqze/m+I+C8kV2GBnwkda0lCY=; b=ABYRGD2/SioNbvqCr0hsBhGtA8GdvA1JKDi5sZL2/PQnd/2WlA12iACEv1YiFp2H2Q ku5U5S3J7SdSKGVcH6/cH012p6lxlF3vWyzk8AmxGhMpe5wEy4+gqB5tHLao0FNgnDYY c9zxJUGezSMfi/MENld3phjktJ/vIpSmZZGubgEXOnU+aJxlgbhO5AwXLF7kEcVqltRS yoVNjLQtv6GEzUsj2+k/KpP3FLfBfKqgDf9Wg7Q8+F4SEH0kcswR5AptAZqeEL4CFY6u 4FY8641PdlcCX93usLL3IxesGCvZkeNF4P98jiDrb6yTz4h2kqZKT79VQCAxOqjSjn8b mH6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=WmCxd5Gx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ls6si16382129pjb.130.2022.01.21.22.16.31; Fri, 21 Jan 2022 22:16:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=WmCxd5Gx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232774AbiAUTvx (ORCPT + 99 others); Fri, 21 Jan 2022 14:51:53 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:50426 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbiAUTvt (ORCPT ); Fri, 21 Jan 2022 14:51:49 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: bbeckett) with ESMTPSA id 87E9D1F465B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1642794708; bh=qJBTRmyi9jDfM31GVctlUir6LnB5ZIPa2X5lbTLEuQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WmCxd5GxJg4nCXzqxOrII12RwEhRP7YNe8DkovWANA5rD1tmfjL1e611hjfv45T/V 4z4A948x1us4VuYe3iR0dwde0GQT3s/EFkSOqvQZNVmczTb7vupz/ad/Y91brYb5Dz FMvXSUMMNTR6RDW9tLUM6mrZ2C3PQ0Ej/r9tcTEl7iRziSVSyoJO3ji9isXRkSr7kz 4f7LBKGVWAuJb2XOcNfyH7dqwrpHuW/JyOCz1e5JDmCh7R3YT/kimX2Kzth99smdwb rgpTvZYmXfYjc7iKNgdsVC0UutISk9c1CS3qA6NE8KS+g9Pj7hDDF5bT0btUHJ4GeV 5x2Qx8rk0o8xA== From: Robert Beckett To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter Cc: Robert Beckett , kernel test robot , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/5] drm/i915: add gtt misalignment test Date: Fri, 21 Jan 2022 19:50:38 +0000 Message-Id: <20220121195040.2145227-5-bob.beckett@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220121195040.2145227-1-bob.beckett@collabora.com> References: <20220121195040.2145227-1-bob.beckett@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org add test to check handling of misaligned offsets and sizes v4: * remove spurious blank lines * explicitly cast intel_region_id to intel_memory_type in misaligned_pin Reported-by: kernel test robot Signed-off-by: Robert Beckett --- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index b80788a2b7f9..f082b5ff3b5e 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -22,10 +22,12 @@ * */ +#include "gt/intel_gtt.h" #include #include #include "gem/i915_gem_context.h" +#include "gem/i915_gem_region.h" #include "gem/selftests/mock_context.h" #include "gt/intel_context.h" #include "gt/intel_gpu_commands.h" @@ -1067,6 +1069,120 @@ static int shrink_boom(struct i915_address_space *vm, return err; } +static int misaligned_case(struct i915_address_space *vm, struct intel_memory_region *mr, + u64 addr, u64 size, unsigned long flags) +{ + struct drm_i915_gem_object *obj; + struct i915_vma *vma; + int err = 0; + u64 expected_vma_size, expected_node_size; + + obj = i915_gem_object_create_region(mr, size, 0, 0); + if (IS_ERR(obj)) + return PTR_ERR(obj); + + vma = i915_vma_instance(obj, vm, NULL); + if (IS_ERR(vma)) { + err = PTR_ERR(vma); + goto err_put; + } + + err = i915_vma_pin(vma, 0, 0, addr | flags); + if (err) + goto err_put; + i915_vma_unpin(vma); + + if (!drm_mm_node_allocated(&vma->node)) { + err = -EINVAL; + goto err_put; + } + + if (i915_vma_misplaced(vma, 0, 0, addr | flags)) { + err = -EINVAL; + goto err_put; + } + + expected_vma_size = round_up(size, 1 << (ffs(vma->resource->page_sizes_gtt) - 1)); + expected_node_size = expected_vma_size; + + if (IS_DG2(vm->i915) && i915_gem_object_is_lmem(obj)) { + /* dg2 should expand lmem node to 2MB */ + expected_vma_size = round_up(size, I915_GTT_PAGE_SIZE_64K); + expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_2M); + } + + if (vma->size != expected_vma_size || vma->node.size != expected_node_size) { + err = i915_vma_unbind(vma); + err = -EBADSLT; + goto err_put; + } + + err = i915_vma_unbind(vma); + if (err) + goto err_put; + + GEM_BUG_ON(drm_mm_node_allocated(&vma->node)); + +err_put: + i915_gem_object_put(obj); + cleanup_freed_objects(vm->i915); + return err; +} + +static int misaligned_pin(struct i915_address_space *vm, + u64 hole_start, u64 hole_end, + unsigned long end_time) +{ + struct intel_memory_region *mr; + enum intel_region_id id; + unsigned long flags = PIN_OFFSET_FIXED | PIN_USER; + int err = 0; + u64 hole_size = hole_end - hole_start; + + if (i915_is_ggtt(vm)) + flags |= PIN_GLOBAL; + + for_each_memory_region(mr, vm->i915, id) { + u64 min_alignment = i915_vm_min_alignment(vm, (enum intel_memory_type)id); + u64 size = min_alignment; + u64 addr = round_up(hole_start + (hole_size / 2), min_alignment); + + /* we can't test < 4k alignment due to flags being encoded in lower bits */ + if (min_alignment != I915_GTT_PAGE_SIZE_4K) { + err = misaligned_case(vm, mr, addr + (min_alignment / 2), size, flags); + /* misaligned should error with -EINVAL*/ + if (!err) + err = -EBADSLT; + if (err != -EINVAL) + return err; + } + + /* test for vma->size expansion to min page size */ + err = misaligned_case(vm, mr, addr, PAGE_SIZE, flags); + if (min_alignment > hole_size) { + if (!err) + err = -EBADSLT; + else if (err == -ENOSPC) + err = 0; + } + if (err) + return err; + + /* test for intermediate size not expanding vma->size for large alignments */ + err = misaligned_case(vm, mr, addr, size / 2, flags); + if (min_alignment > hole_size) { + if (!err) + err = -EBADSLT; + else if (err == -ENOSPC) + err = 0; + } + if (err) + return err; + } + + return 0; +} + static int exercise_ppgtt(struct drm_i915_private *dev_priv, int (*func)(struct i915_address_space *vm, u64 hole_start, u64 hole_end, @@ -1136,6 +1252,11 @@ static int igt_ppgtt_shrink_boom(void *arg) return exercise_ppgtt(arg, shrink_boom); } +static int igt_ppgtt_misaligned_pin(void *arg) +{ + return exercise_ppgtt(arg, misaligned_pin); +} + static int sort_holes(void *priv, const struct list_head *A, const struct list_head *B) { @@ -1208,6 +1329,11 @@ static int igt_ggtt_lowlevel(void *arg) return exercise_ggtt(arg, lowlevel_hole); } +static int igt_ggtt_misaligned_pin(void *arg) +{ + return exercise_ggtt(arg, misaligned_pin); +} + static int igt_ggtt_page(void *arg) { const unsigned int count = PAGE_SIZE/sizeof(u32); @@ -2180,12 +2306,14 @@ int i915_gem_gtt_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_ppgtt_fill), SUBTEST(igt_ppgtt_shrink), SUBTEST(igt_ppgtt_shrink_boom), + SUBTEST(igt_ppgtt_misaligned_pin), SUBTEST(igt_ggtt_lowlevel), SUBTEST(igt_ggtt_drunk), SUBTEST(igt_ggtt_walk), SUBTEST(igt_ggtt_pot), SUBTEST(igt_ggtt_fill), SUBTEST(igt_ggtt_page), + SUBTEST(igt_ggtt_misaligned_pin), SUBTEST(igt_cs_tlb), }; -- 2.25.1