From patchwork Wed Oct 16 08:55:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 13837944 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 AFDD5D1AD2E for ; Wed, 16 Oct 2024 08:56:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F21B10E2D3; Wed, 16 Oct 2024 08:56:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="gLyK6nn1"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id EDF5C10E05B; Wed, 16 Oct 2024 08:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729068976; x=1760604976; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yIPWTSbgbnnx/z9UjBo1FPhW1IYNVNgiK/nAsrQ/+CU=; b=gLyK6nn1zbpuhLaPtswU7E7kSbPgR9oD5CSGNpXrC4CqDUOmhCERvKQ5 8+gKmxx6IhcXw3k/d4zrHAtvCzni4yvtqUC6s/BACsiTmaZwyQz0AT/Mq TT3ax5GdMQUmGPk/UjSP7kRZsTltyM0t9JseUEoCoKJ+Q/B84uleFMf+0 xfEA2w+r/R3R20Dx653626ok4vMEe53O04mggzE2zofwL+10+4kx4SmVT OqpUa4AqTXN6Lv9htoOyHbsiGOQN+WIgEfbWQp/4UxlMf5cIrVFn7U+e5 cUjzJXG2y1m+gtUy21rqH215w4hUTkzsYUwFVMOj7XEaqFtVAH9s/wtEU Q==; X-CSE-ConnectionGUID: EeGe/odITYKUyDqkvoqwNw== X-CSE-MsgGUID: I2BKDHq1Qq+g8Fy+Lp++cQ== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="16122961" X-IronPort-AV: E=Sophos;i="6.11,207,1725346800"; d="scan'208";a="16122961" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2024 01:56:15 -0700 X-CSE-ConnectionGUID: 2Wbh6F52TRakZD0bmm3siw== X-CSE-MsgGUID: X4kXCWgpQ2uTcN5sNaM6mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,207,1725346800"; d="scan'208";a="78184421" Received: from ettammin-mobl2.ger.corp.intel.com (HELO fedora..) ([10.245.246.80]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2024 01:56:13 -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 , Paulo Zanoni , dri-devel@lists.freedesktop.org, Simona Vetter Subject: [PATCH v11 0/8] TTM shrinker helpers and xe buffer object shrinker Date: Wed, 16 Oct 2024 10:55:51 +0200 Message-ID: <20241016085559.11840-1-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.46.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" 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. The series earlier consisted of a LRU traversal part and the current part. The LRU traversal part is merged, but is still mentioned in the history below. Patch 1 balances ttm_resource_cursor_fini() with an init function. It makes patch 5 more straightforward. Patch 2 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 3 introduces functionality 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. Patch 4 Adds a simple error injection to the above code to help increase test coverage. Patch 5 Implements a macro for LRU iteration. Patch 6 Introduces driver-facing helpers for shrinking. Patch 6 Implements the xe bo shrinker. Patch 7 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. v5: - Update also TTM kunit tests - Handle ghost- and zombie objects in the shrinker. - A couple of compile- and UAF fixes reported by Kernel Build Robot and Dan Carpenter. v6: - Address review comments from Matthew Brost on the restartable LRU traversal path. v7: - Split out TTM restartable LRU traversal path and merge that. - Adapt the review comments on that series. v8: - Address review comments from Matthew Brost as detailed in the respective patches. v9: - Rebase and fix compilation errors v10: - Use a LRU iteration macro rather than a function with a callback. - Rebasing and cleanups - Address some additional review comments from Matt Brost. - Drop the shrinker selftest. It was already merged as a swapout self-test. v11: - Move more core interaction to additional TTM helpers. - Don't back up without __GFP_FS, and don't start writeback without __GFP_IO. - Rebase. Cc: Somalapuram Amaranath Cc: Christian König Cc: Matthew Brost Cc: Paulo Zanoni Cc: Thomas Hellström (8): drm/ttm: Balance ttm_resource_cursor_init() and ttm_resource_cursor_fini() 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: Add a macro to perform LRU iteration drm/ttm: Add helpers for shrinking drm/xe: Add a shrinker for xe bos drm/xe: Increase the XE_PL_TT watermark drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_backup_shmem.c | 162 ++++++++++ drivers/gpu/drm/ttm/ttm_bo.c | 3 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 238 +++++++++++++- drivers/gpu/drm/ttm/ttm_pool.c | 419 ++++++++++++++++++++++++- drivers/gpu/drm/ttm/ttm_resource.c | 35 ++- drivers/gpu/drm/ttm/ttm_tt.c | 37 +++ drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/tests/xe_bo.c | 6 +- drivers/gpu/drm/xe/xe_bo.c | 194 +++++++++++- drivers/gpu/drm/xe/xe_bo.h | 36 +++ drivers/gpu/drm/xe/xe_device.c | 8 + drivers/gpu/drm/xe/xe_device_types.h | 2 + drivers/gpu/drm/xe/xe_shrinker.c | 258 +++++++++++++++ drivers/gpu/drm/xe/xe_shrinker.h | 18 ++ drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 3 +- include/drm/ttm/ttm_backup.h | 139 ++++++++ include/drm/ttm/ttm_bo.h | 92 ++++++ include/drm/ttm/ttm_pool.h | 6 + include/drm/ttm/ttm_resource.h | 11 +- include/drm/ttm/ttm_tt.h | 30 ++ 21 files changed, 1644 insertions(+), 56 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