From patchwork Thu Jan 30 10:13:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Hellstr=C3=B6m?= X-Patchwork-Id: 13954455 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 C904DC02193 for ; Thu, 30 Jan 2025 10:13:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31EE310E924; Thu, 30 Jan 2025 10:13:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="JiNL/ngy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5362110E924; Thu, 30 Jan 2025 10:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738232033; x=1769768033; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qL3jR1nJHgHM1Q32LfCF3ZXSQoEzKFfqQNkVEannmBo=; b=JiNL/ngyRyTLEAr6FsxdP9RQNq94vtUwzpn4SDF97cyb0tkmaC/Tq5pP nLZ98bwkQud43By9mh4WEpUZBPaDb6mZvnfBoipEy4WwbBC4/fGdjbkhH 0PExoXu2TWiiet7x4f5V9fdWImakVuy/FlLWc8m5qRzuvj5XBsDh1dIrY E+8LVnrQUHc18GtWE3GM896mxSBK0SddhYTxTsCWZrFU7n3a/teqRnPYw mScXnDh7N9uXWv0PmZwZ3ZumZ2k4QHt8ODiz3PiizCXhdJgqwx4c2FHzm hZcLJO79DxKADWrI0GwtCY6HIK1KPUFCKLHRvb4c5JUNyK6oLo/ysRJOi w==; X-CSE-ConnectionGUID: h0hsHwfPSeiJEsGuSwWtng== X-CSE-MsgGUID: rrs3lMqWQxKdlw0ye+dj1w== X-IronPort-AV: E=McAfee;i="6700,10204,11330"; a="39036580" X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="39036580" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 02:13:52 -0800 X-CSE-ConnectionGUID: lZPitDiWR6GbXKFf4WWzZw== X-CSE-MsgGUID: xKWniVIlQ7OngknOnuVTjA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="140163490" Received: from lfiedoro-mobl.ger.corp.intel.com (HELO fedora..) ([10.245.246.79]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 02:13:49 -0800 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , =?utf-8?q?Christian_K=C3=B6nig?= , Matthew Brost , Paulo Zanoni , dri-devel@lists.freedesktop.org Subject: [PATCH v16 0/7] TTM shrinker helpers and xe buffer object shrinker Date: Thu, 30 Jan 2025 11:13:18 +0100 Message-ID: <20250130101325.3068-1-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.48.1 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 a previous series, *and obsoletes that one*. 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 introduces a backup implemententaion. Patch 2 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 3 Adds a simple error injection to the above code to help increase test coverage. Patch 4 Implements a macro for LRU iteration. Patch 5 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. v12: - Fix an indentation flaw. - Rebase v13: - Remove the backup base-class, and use direct calls for ttm_backup (Christian König). - Rebase on the ttm_backup changes. - Move shrunken bos from the LRU list to the unevictable list. - Provide an accessor function with sanity checks to set the - ttm_tt::backup field. - Update documentation. v14: - Update documentation of ttm_backup_bytes_avail(). - Work around converting between struct file * and struct ttm-backup *. - Don't set up backup for imported buffers. v15: - ttm_backup return value change. (Christian König) - ttm_pool restore/alloc implementation rework (Christian König) - Documentation update. - Remove cond_resched (Christian König) v16: - Two patches merged. Rebase. Cc: Christian König Cc: Matthew Brost Cc: Paulo Zanoni Cc: Thomas Hellström (7): drm/ttm: Provide a shmem backup implementation drm/ttm/pool, drm/ttm/tt: 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.c | 207 ++++++++++ drivers/gpu/drm/ttm/ttm_bo_util.c | 247 +++++++++++- drivers/gpu/drm/ttm/ttm_pool.c | 577 ++++++++++++++++++++++++--- drivers/gpu/drm/ttm/ttm_tt.c | 83 ++++ drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/tests/xe_bo.c | 6 +- drivers/gpu/drm/xe/xe_bo.c | 202 +++++++++- 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 | 74 ++++ include/drm/ttm/ttm_bo.h | 93 +++++ include/drm/ttm/ttm_pool.h | 8 + include/drm/ttm/ttm_tt.h | 69 +++- 18 files changed, 1814 insertions(+), 80 deletions(-) create mode 100644 drivers/gpu/drm/ttm/ttm_backup.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