From patchwork Fri Mar 29 14:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 13610702 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 5A9EFCD1283 for ; Fri, 29 Mar 2024 14:57:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82CD910E38D; Fri, 29 Mar 2024 14:57:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="JGLcA3o6"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC08710F5BB; Fri, 29 Mar 2024 14:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711724257; x=1743260257; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=vFy2dYXY3O3rzKgt8ngBG0u2CYhT2Yxe3yK2GK5ODEI=; b=JGLcA3o6TMSKvhYKoZmYZjEOHvQ6pLKACTRUYRlsCCWNRKWVgTmjK+ay ZLjCsU0sluWltWDZOMFlDXqzoVgkRw5DiR9VZNF5FaVFd9l63XQGDadXC Yg6FOU7QIlumplE4G3fy8aMSZUCTs5sbQX9XQQyrqTQubULvX6Z0/jnnx re3nNbj0zKffEhlqHi3syeex1T6DW+eHxtATsDfaS/Pdo5MazGZZ9asPl 9KBl+4tEa9CB/OX5Se100NfKg1X9UEpp4KqtGrjWc9eJJNOd1VXWa8/q4 0XI4Cwc68FM5jaWtNbLEu/ITMrUWr+gt3J361XPsvbIc2LpjTr3krQsYY g==; X-CSE-ConnectionGUID: pYkQpAr/SLCeZjvfcIRrNA== X-CSE-MsgGUID: IOHn5GHcRymyZks3f6Q0pQ== X-IronPort-AV: E=McAfee;i="6600,9927,11028"; a="7023659" X-IronPort-AV: E=Sophos;i="6.07,165,1708416000"; d="scan'208";a="7023659" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2024 07:57:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,165,1708416000"; d="scan'208";a="47962414" Received: from satiarax-mobl1.gar.corp.intel.com (HELO fedora..) ([10.249.254.13]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2024 07:57:21 -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?= , dri-devel@lists.freedesktop.org Subject: [RFC PATCH 0/8] TTM shrinker helpers and xe buffer object shrinker Date: Fri, 29 Mar 2024 15:56:59 +0100 Message-ID: <20240329145707.3087-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. First https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg484425.html for patch 1-4, which IMO still could be reviewed and pushed as a separate series. 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. In any case, patch 1-4 are better described in their separate series. (RFC is removed for those). Patch 5 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 6 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 7 introduces a LRU walk helper for eviction and shrinking. It's currently xe-only but not xe-specific and can easily be moved to TTM when used by more than one driver or when eviction is implemented using it. Patch 8 introduces a helper callback for shrinking (Also ready to be moved to TTM) and an xe-specific shrinker implementation. Testing: ATM I don't think we have good tests to cover the shrinking functionality The series has been tested with a hack that continously creates TTM_TT buffer objects until system memory and swap space is exhausted, and then reads them back and frees them. However, these tests seem to be very slow. Ideally a similar test on a machine with very fast solid state or similar storage should be set up. Ideally also verifying content preservation. Cc: Somalapuram Amaranath Cc: Christian König Cc: Thomas Hellström (8): drm/ttm: Allow TTM LRU list nodes of different types drm/ttm: Use LRU hitches drm/ttm, drm/amdgpu, drm/xe: Consider hitch moves within bulk sublist moves drm/ttm: Allow continued swapout after -ENOSPC falure drm/ttm: Add a virtual base class for graphics memory backup drm/ttm/pool: Provide a helper to shrink pages. drm/xe, drm/ttm: Provide a generic LRU walker helper drm/xe: Add a shrinker for xe bos 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 | 1 + drivers/gpu/drm/ttm/ttm_device.c | 33 ++- drivers/gpu/drm/ttm/ttm_pool.c | 391 ++++++++++++++++++++++++- drivers/gpu/drm/ttm/ttm_resource.c | 231 ++++++++++++--- drivers/gpu/drm/ttm/ttm_tt.c | 34 +++ drivers/gpu/drm/xe/Makefile | 2 + drivers/gpu/drm/xe/xe_bo.c | 123 ++++++-- drivers/gpu/drm/xe/xe_bo.h | 3 + drivers/gpu/drm/xe/xe_device.c | 8 + drivers/gpu/drm/xe/xe_device_types.h | 2 + drivers/gpu/drm/xe/xe_shrinker.c | 237 +++++++++++++++ drivers/gpu/drm/xe/xe_shrinker.h | 18 ++ drivers/gpu/drm/xe/xe_ttm_helpers.c | 224 ++++++++++++++ drivers/gpu/drm/xe/xe_ttm_helpers.h | 63 ++++ drivers/gpu/drm/xe/xe_vm.c | 4 + include/drm/ttm/ttm_backup.h | 136 +++++++++ include/drm/ttm/ttm_device.h | 2 + include/drm/ttm/ttm_pool.h | 4 + include/drm/ttm/ttm_resource.h | 96 +++++- include/drm/ttm/ttm_tt.h | 19 ++ 23 files changed, 1683 insertions(+), 91 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 drivers/gpu/drm/xe/xe_ttm_helpers.c create mode 100644 drivers/gpu/drm/xe/xe_ttm_helpers.h create mode 100644 include/drm/ttm/ttm_backup.h