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 19308C46CD2 for ; Wed, 24 Jan 2024 18:08:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9277410EA5E; Wed, 24 Jan 2024 18:08:21 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E5E610EB3B for ; Wed, 24 Jan 2024 18:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706119700; x=1737655700; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0IEvon0HcsRd+hHbry6g5BVUfA/vMvTLbZOjG3VaTWc=; b=NrqSVvemccpuLQIq1zIZgcUsLv8iS9n9Zjj+2N3A8NitOyITLo2ZagwU JWrzn0ASl8/3M32uDe86xXUFNzw5vqFGyuPIzjEWKeG2WITR93mPm94Ac MOF38YXoE1xZQmRb+EFFiXGPdunhhHK93/dFJWHvtzuvDaxMCo2BkFDU2 GJiP8pGcA6zBdZv/oxPLflB5J0uRVyW8NSnfmj2Ft0DWZvxqkflyv23XA Stp6E6yVNyghq9POs6fhDy7V1mdI2b1HT4abGu8XPYUdDDXKd4NuDX0we kz4gb9f4zCqoNpaL0p7/a9BdAWlHFk23dbLfzPfgMCBca9sDiTuMFvVFl A==; X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="400785214" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="400785214" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2024 10:08:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="909734537" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="909734537" Received: from gmcfarla-mobl1.ger.corp.intel.com (HELO mwauld-mobl1.intel.com) ([10.252.15.165]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2024 10:08:17 -0800 From: Matthew Auld To: igt-dev@lists.freedesktop.org Subject: [PATCH i-g-t 1/5] lib/xe/ioctl: introduce xe_bb_size() helper Date: Wed, 24 Jan 2024 18:07:09 +0000 Message-ID: <20240124180713.268843-1-matthew.auld@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" We have a number of tests open coding this, plus some tests lacking any handling for the prefetch size, leading to CAT errors due to overfetch hitting an invalid page. End goal is to fix all the tests that are missing the overfetch handling first, using the new helper, and then convert all the places that were open coding this. Signed-off-by: Matthew Auld Cc: Zbigniew Kempczyński --- lib/xe/xe_ioctl.c | 6 ++++++ lib/xe/xe_ioctl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/lib/xe/xe_ioctl.c b/lib/xe/xe_ioctl.c index d3f9905ee..da2a7af51 100644 --- a/lib/xe/xe_ioctl.c +++ b/lib/xe/xe_ioctl.c @@ -51,6 +51,12 @@ uint32_t xe_cs_prefetch_size(int fd) return 4096; } +uint64_t xe_bb_size(int fd, uint64_t reqsize) +{ + return ALIGN(reqsize + xe_cs_prefetch_size(fd), + xe_get_default_alignment(fd)); +} + uint32_t xe_vm_create(int fd, uint32_t flags, uint64_t ext) { struct drm_xe_vm_create create = { diff --git a/lib/xe/xe_ioctl.h b/lib/xe/xe_ioctl.h index 03932561d..2b30f1d98 100644 --- a/lib/xe/xe_ioctl.h +++ b/lib/xe/xe_ioctl.h @@ -18,6 +18,7 @@ #define DRM_XE_UFENCE_WAIT_MASK_U64 0xffffffffffffffffu uint32_t xe_cs_prefetch_size(int fd); +uint64_t xe_bb_size(int fd, uint64_t reqsize); uint32_t xe_vm_create(int fd, uint32_t flags, uint64_t ext); int __xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo, uint64_t offset, uint64_t addr, uint64_t size, uint32_t op, -- 2.43.0