From patchwork Mon Mar 10 12:06:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 14009722 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF6A9C28B30 for ; Mon, 10 Mar 2025 12:06:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6531280017; Mon, 10 Mar 2025 08:06:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B1862280009; Mon, 10 Mar 2025 08:06:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91DA9280017; Mon, 10 Mar 2025 08:06:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 45C1B280009 for ; Mon, 10 Mar 2025 08:06:52 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DDB571A0F1E for ; Mon, 10 Mar 2025 12:06:51 +0000 (UTC) X-FDA: 83205515022.02.B7CC203 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf27.hostedemail.com (Postfix) with ESMTP id 2D8A74001C for ; Mon, 10 Mar 2025 12:06:50 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JvjKiebn; spf=pass (imf27.hostedemail.com: domain of mripard@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=mripard@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741608410; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=M/hXfR8g68eBoox85oKau+18ZwOYjsbizCcyQMP9xRw=; b=Nu0gQ/s+FicsyIIbSEpzALOx+tkBiTaS0gi0np6EdLfIBTs4AmSlRBrgqWQFyY+rA9Jz0T WnIWJsjqUyf4A28GSbB/Y+zhZOgXq4pY5v0Hh3wwDBF/4x93w1BggvVow3AbCOD89Gjy/H vPt8xE/QGrXYxzyCr4oq/fpOYyd3GDE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JvjKiebn; spf=pass (imf27.hostedemail.com: domain of mripard@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=mripard@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741608410; a=rsa-sha256; cv=none; b=OAbMPSinoF8WlmoQ3fkOmawtsPlv+i4S1/RIBpMRi2L2hhOiaZG2nAMYWlEiLjV24nBmKO FAPuZ2W59HaWOKejn2VFSdD00gad0FD4hRfRajqkpMvcTvb5BD99iv3aoVijVgpq3ciJm+ 2ACV+jz+TyZJ1uefX2hpfotDeXBxAgg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 50BE0A45AEF; Mon, 10 Mar 2025 12:01:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AC88C4CEE5; Mon, 10 Mar 2025 12:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741608408; bh=Qsf/4cmIwOEBWG+KEjMk+VXbjNJ+CMnPc++S7Uaux44=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JvjKiebn6NPadaYopEROu2Wk78rdDJEvtjKTS7MkrdREUkAJTHFkGfSG4VjpCAIxq ttK+MqSZtwngZd9TC+nTvymEMN2Z1f0hr3lqfy10jJxQB3UHQr0XgrNUnK9i23DUrF zc1zrnOde4h44bOj69AwItqo98bkHzWaQhTwoWTxr+M2rJUk3HZWf07AceA84I0hfb 2drmUOmf6Ggo0nxrxKKe7iAypbLa5169lUFwKDmlZJPUPxw1F+kK0y3X8xeKel9j2a h6BqBn4N7fH7hWDFgvGuFE6oAcgmi2G1iKoh52DDhw/HW4x6dTT39dvzW4+xn6sBHC nr6zPuPrdq+aQ== From: Maxime Ripard Date: Mon, 10 Mar 2025 13:06:17 +0100 Subject: [PATCH RFC 11/12] drm/gem: Add cgroup memory accounting MIME-Version: 1.0 Message-Id: <20250310-dmem-cgroups-v1-11-2984c1bc9312@kernel.org> References: <20250310-dmem-cgroups-v1-0-2984c1bc9312@kernel.org> In-Reply-To: <20250310-dmem-cgroups-v1-0-2984c1bc9312@kernel.org> To: Andrew Morton , Marek Szyprowski , Robin Murphy , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Benjamin Gaignard , Brian Starkey , John Stultz , "T.J. Mercier" , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Tomasz Figa , Mauro Carvalho Chehab Cc: Hans Verkuil , Laurent Pinchart , linux-mm@kvack.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, Maxime Ripard X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3032; i=mripard@kernel.org; h=from:subject:message-id; bh=Qsf/4cmIwOEBWG+KEjMk+VXbjNJ+CMnPc++S7Uaux44=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnnrm7L3LlrwvOPawsFQufNnL1sEuPDM1N2vlzGOm3i9 7c1F51fc3aUsjCIcTHIiimyxAibL4k7Net1JxvfPJg5rEwgQxi4OAVgIpn+jAwNq5b4NK817Srv kizRirktpJJcwtdd9bHHKpDL4wLbQmlGhifBexJPKh1i3RB2LvSO9UxWBz/dvOu+Ovv4ZRNaNvt LMwEA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Rspam-User: X-Rspamd-Queue-Id: 2D8A74001C X-Rspamd-Server: rspam03 X-Stat-Signature: wwqq571cyf6pcgykq7z4pyxgfcrmm6xo X-HE-Tag: 1741608410-11007 X-HE-Meta: U2FsdGVkX19kboqmY9RG+FFB4fFTE/ztH1aD2xo55sJgMggiFxqGPz7AmnCrL59aHtYIPRg/em/3GKD6tODvhKPHjs/xJX5ukeMdJoxLbfNDk9ov3G5IK+DFh5KJ/Y1BUB4H/j2D9Rrvoju50HkOKa1+kUiq5ew9hfX6OxUgr9zKuPAqCZFUj37tv0/MZkEaV9fcZ1PIYIS0HzpogaEozlrzTPrh+lR6ou0P5afwjV1HG/QMrqGsMcCHlGqQRA14u0kdJ9kDMXG9IRpMMZBDw8rf4nH/x6Z1xb00rRrpeVqYoRB12/Qnm2aeQiyUKZOdhD/jVvQP8ck1L6jgAZlYnrm+16rcNxe4n0rgeAHeJplInBtw2KZUsv+S9dFC99eRuWSHmYejKtr+3XgVG9GG5qmFWJzdFLlZZxsu53Ll1tjAI1lM/t3pxr4X6rRx/rNFDVIIl0G4T4geQ6pU4MMqnELyvFPNq2JwVNya7e58Z0W5ieRht2lpqzEi5zXk/jfzGACV0Bzu6dPEhR4YWcAA4fpdo3BDgXUvn3UwP5YOoXw3Yxxu1VXv2ejwobLgul+ku0PGEaQ8+qfP4Zh3OeQMZ/l2OPIZT73t29d6jUBr6z19Tsh8SM/abxuggMtRcXWEpgrnx3M761zeSiLGquu26i4rzVcGVux/nbhQq0DSo5NH5ir/NLBAt/ghVBJ73KryVFIWgy8mcYulKL3bJYuO9N4CtkQTVs4Z/SIP7QHNw691C1rAM9aOVJKEn+0nGqNSWi7l682zaHuVCzyFN4STyqzfiteQRAnMd0v7c8U2h9HKrCR7KUVBxFC1Ggado3bg6dMBmMIFIPVNFSLwboJaPSnWOphXKfXJbiAOH4ABga+d9m5/sLCw69hWCQi01gKtcAWtK9zFLw3l+1bG+gj9dT13Lwz7jJR7yNjrdRSZDM2zap4Rv5us09ham71GqlyjFhVJnPYi5qOd3uVB7PV KXQ562II rrVRrOFMod+zBlT6HAUGmHjaBQ0MWKqAQUiBjy/yEOXvT0593ScQTntLrr+FeaO4R/ZMwzWMuXNq/LE4ZGQ4ZXdIqRjUXkQPoImsG83yun1HPSYWA6DL94nDAPKKZ3BTk1VUfwo0kzwr8NbqS8EitTF+AMhdpXnfvCo0eXL2ug3kmq6DugOMVGbLrPKPuhL7rzP6MWnatT7MVt3zHOg9Tph1b3WanW6CBaK5ZUx3RW/EkYOza8FQ11Mtfl3GgWxruqYTSA3NLaSOBr0HjY3S8QNRo76o3+GlsJYgE5PAeB0TQVb5EjWSbl/cRTUFvjQM0GhZZzmukJpn+7xC7a01AlTjrBwgrQ6EVQEOeGnujg7gRWB0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In order to support any device using the GEM support, let's charge any GEM DMA allocation into the dmem cgroup. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_gem.c | 5 +++++ drivers/gpu/drm/drm_gem_dma_helper.c | 6 ++++++ include/drm/drm_device.h | 1 + include/drm/drm_gem.h | 2 ++ 4 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index ee811764c3df4b4e9c377a66afd4967512ba2001..e04733cb49353cf3ff9672d883b106a083f80d86 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -108,10 +108,11 @@ drm_gem_init(struct drm_device *dev) dev->vma_offset_manager = vma_offset_manager; drm_vma_offset_manager_init(vma_offset_manager, DRM_FILE_PAGE_OFFSET_START, DRM_FILE_PAGE_OFFSET_SIZE); + return drmm_add_action(dev, drm_gem_init_release, NULL); } /** * drm_gem_object_init_with_mnt - initialize an allocated shmem-backed GEM @@ -973,10 +974,14 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private) * drm_gem_object_init(). */ void drm_gem_object_release(struct drm_gem_object *obj) { + + if (obj->cgroup_pool_state) + dmem_cgroup_uncharge(obj->cgroup_pool_state, obj->size); + if (obj->filp) fput(obj->filp); drm_gem_private_object_fini(obj); diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem_dma_helper.c index 16988d316a6dc702310fa44c15c92dc67b82802b..6236feb67ddd6338f0f597a0606377e0352ca6ed 100644 --- a/drivers/gpu/drm/drm_gem_dma_helper.c +++ b/drivers/gpu/drm/drm_gem_dma_helper.c @@ -104,10 +104,16 @@ __drm_gem_dma_create(struct drm_device *drm, size_t size, bool private) if (ret) { drm_gem_object_release(gem_obj); goto error; } + ret = dmem_cgroup_try_charge(dma_get_dmem_cgroup_region(drm->dev), + size, + &dma_obj->base.cgroup_pool_state, NULL); + if (ret) + goto error; + return dma_obj; error: kfree(dma_obj); return ERR_PTR(ret); diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index c91f87b5242d7a499917eb4aeb6ca8350f856eb3..58987f39ba8718eb768f6261fb0a1fbf16b38549 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -1,8 +1,9 @@ #ifndef _DRM_DEVICE_H_ #define _DRM_DEVICE_H_ +#include #include #include #include #include diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index fdae947682cd0b7b06db5e35e120f049a0f30179..95fe8ed48a26204020bb47d6074689829c410465 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -430,10 +430,12 @@ struct drm_gem_object { * @lru: * * The current LRU list that the GEM object is on. */ struct drm_gem_lru *lru; + + struct dmem_cgroup_pool_state *cgroup_pool_state; }; /** * DRM_GEM_FOPS - Default drm GEM file operations *