From patchwork Fri Jun 14 10:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 13698572 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 D5200C41513 for ; Fri, 14 Jun 2024 10:26:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7254C10E17D; Fri, 14 Jun 2024 10:26:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="WmQiE9qd"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 061F210E17D; Fri, 14 Jun 2024 10:26:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718360763; x=1749896763; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Cxb7v58cdyetJNW4E0SiH40ZJwg+UWAUax4EBgb+oTs=; b=WmQiE9qdp2GEhjd2H5LGUbRPn4tqiVivWhzsrV+eluqD19b/KcWkM5Ev AT87prDl9qP8pgX+1JK7nwtFM8H3b1lrj49oLfyxgJnAAOKUZABlfWM/w 9A9ostoAX/Xg+lg0PrOVIAU2oFCbWecBoP5v9uvkBFGSeGibjSkvIimhp CIUSm9zru+jHxeno+rfxr8GfIpvjzTynghZVEXyDn4hTyVTxYqPHtpMjw E7kQIzaEN3r7mkOP/oh6ZC1JRYkoFsZq7LLG6rK13CHNndIOnQd+aH5bV s1TgOeJXB6TdftLKKXxkAuZ1l7m4M76iHQCQJGmJLBudV6V/8BpU8SomH A==; X-CSE-ConnectionGUID: QliL1hIMQg2jHMTONQ2H4g== X-CSE-MsgGUID: sWy86KDxRXSAir4s0x/4vw== X-IronPort-AV: E=McAfee;i="6700,10204,11102"; a="26659441" X-IronPort-AV: E=Sophos;i="6.08,237,1712646000"; d="scan'208";a="26659441" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2024 03:26:03 -0700 X-CSE-ConnectionGUID: /AwlJI8TTlCtYbrxiA/QQw== X-CSE-MsgGUID: igILMc5KSPiAs7OkqCHbIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,237,1712646000"; d="scan'208";a="45415490" Received: from dalessan-mobl3.ger.corp.intel.com (HELO fedora..) ([10.245.244.153]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2024 03:26:01 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Somalapuram Amaranath , =?utf-8?q?Christian_?= =?utf-8?q?K=C3=B6nig?= , Matthew Brost , dri-devel@lists.freedesktop.org Subject: [PATCH v4 00/12] TTM shrinker helpers and xe buffer object shrinker Date: Fri, 14 Jun 2024 12:25:36 +0200 Message-ID: <20240614102548.4364-1-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This series implements TTM shrinker / eviction helpers and an xe bo shrinker. It builds on two previous series, *and obsoletes these*. First https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg484425.html Second the previous TTM shrinker series https://lore.kernel.org/linux-mm/b7491378-defd-4f1c-31e2-29e4c77e2d67@amd.com/T/ Where the comment about layering https://lore.kernel.org/linux-mm/b7491378-defd-4f1c-31e2-29e4c77e2d67@amd.com/T/#ma918844aa8a6efe8768fdcda0c6590d5c93850c9 now addressed, and this version also implements shmem objects for backup rather than direct swap-cache insertions, which was used in the previuos series. It turns out that with per-page backup / shrinking, shmem objects appears to work just as well as direct swap-cache insertions with the added benefit that was introduced in the previous TTM shrinker series to avoid running out of swap entries isn't really needed. Patch 1-4 implements restartable LRU list iteration. Patch 5 implements a LRU walker + resv locking helper Patch 6 moves TTM swapping over to the walker. Patch 7 moves TTM eviction over to the walker. Patch 8 could in theory be skipped but introduces a possibility to easily add or test multiple backup backends, like the direct swap-cache insertion or even files into fast dedicated nvme storage for for example. Patch 9 introduces helpers in the ttm_pool code for page-by-page shrinking and recovery. It avoids having to temporarily allocate a huge amount of memory to be able to shrink a buffer object. It also introduces the possibility to immediately write-back pages if needed, since that tends to be a bit delayed when left to kswapd. Patch 10 Adds a simple error injection to the above code to help increase test coverage. Patch 11 Implements an xe bo shrinker and a common helper in TTM for shrinking. Patch 12-21 are really a separate POC series, for introducing drm_exec locking in TTM. The patch touches both drm_exec and dma-buf and is for now marked as an RFC: Patch 12 Increases (removes) the XE_PL_TT watermark. v2: - Squash obsolete revision history in the patch commit messages. - Fix a couple of review comments by Christian - Don't store the mem_type in the TTM managers but in the resource cursor. - Rename introduced TTM *back_up* function names to *backup* - Add ttm pool recovery fault injection. - Shrinker xe kunit test - Various bugfixes v3: - Address some review comments from Matthew Brost and Christian König. - Use the restartable LRU walk for TTM swapping and eviction. - Provide a POC drm_exec locking implementation for exhaustive eviction. (Christian König). v4: - Remove the RFC exhaustive eviction part. While the path to exhaustive eviction is pretty clear and demonstrated in v3, there is still some drm_exec work that needs to be agreed and implemented. - Add shrinker power management. On some hw we need to wake when shrinking. - Fix the lru walker helper for -EALREADY errors. - Add drm/xe: Increase the XE_PL_TT watermark. Cc: Somalapuram Amaranath Cc: Christian König Cc: Matthew Brost Cc: Thomas Hellström (12): drm/ttm: Allow TTM LRU list nodes of different types drm/ttm: Slightly clean up LRU list iteration drm/ttm: Use LRU hitches drm/ttm, drm/amdgpu, drm/xe: Consider hitch moves within bulk sublist moves drm/ttm: Provide a generic LRU walker helper drm/ttm: Use the LRU walker helper for swapping drm/ttm: Use the LRU walker for eviction drm/ttm: Add a virtual base class for graphics memory backup drm/ttm/pool: Provide a helper to shrink pages drm/ttm: Use fault-injection to test error paths drm/ttm, drm/xe: Add a shrinker for xe bos drm/xe: Increase the XE_PL_TT watermark drivers/gpu/drm/Kconfig | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 + drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_backup_shmem.c | 137 ++++++++ drivers/gpu/drm/ttm/ttm_bo.c | 463 ++++++++++++------------- drivers/gpu/drm/ttm/ttm_bo_util.c | 212 +++++++++++ drivers/gpu/drm/ttm/ttm_device.c | 29 +- drivers/gpu/drm/ttm/ttm_pool.c | 412 +++++++++++++++++++++- drivers/gpu/drm/ttm/ttm_resource.c | 264 +++++++++++--- drivers/gpu/drm/ttm/ttm_tt.c | 37 ++ drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/tests/xe_bo.c | 118 +++++++ drivers/gpu/drm/xe/tests/xe_bo_test.c | 1 + drivers/gpu/drm/xe/tests/xe_bo_test.h | 1 + drivers/gpu/drm/xe/xe_bo.c | 139 +++++++- drivers/gpu/drm/xe/xe_bo.h | 4 + drivers/gpu/drm/xe/xe_device.c | 8 + drivers/gpu/drm/xe/xe_device_types.h | 2 + drivers/gpu/drm/xe/xe_shrinker.c | 287 +++++++++++++++ drivers/gpu/drm/xe/xe_shrinker.h | 18 + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 3 +- drivers/gpu/drm/xe/xe_vm.c | 4 + include/drm/ttm/ttm_backup.h | 136 ++++++++ include/drm/ttm/ttm_bo.h | 48 ++- include/drm/ttm/ttm_pool.h | 5 + include/drm/ttm/ttm_resource.h | 99 +++++- include/drm/ttm/ttm_tt.h | 20 ++ 27 files changed, 2089 insertions(+), 375 deletions(-) create mode 100644 drivers/gpu/drm/ttm/ttm_backup_shmem.c create mode 100644 drivers/gpu/drm/xe/xe_shrinker.c create mode 100644 drivers/gpu/drm/xe/xe_shrinker.h create mode 100644 include/drm/ttm/ttm_backup.h