From mboxrd@z Thu Jan 1 00:00:00 1970 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 63110C83000 for ; Mon, 30 Jun 2025 04:52:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02BA38D000C; Mon, 30 Jun 2025 00:52:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 004718D0001; Mon, 30 Jun 2025 00:52:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5B578D000C; Mon, 30 Jun 2025 00:52:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D2B738D0001 for ; Mon, 30 Jun 2025 00:52:08 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 96DE31603A1 for ; Mon, 30 Jun 2025 04:52:08 +0000 (UTC) X-FDA: 83610845136.19.27BC9AA Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [205.139.111.44]) by imf15.hostedemail.com (Postfix) with ESMTP id BB6FBA0005 for ; Mon, 30 Jun 2025 04:52:06 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf15.hostedemail.com: 205.139.111.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751259126; 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; bh=5E4MVvUcstZMFsvG410MSacZnqBbxLrvP+wy6QOGIcQ=; b=cfU6xPPZp1Jqt61ATQSbYJWvgs7kHSMSDD0bgtDzE2Rg4ZVhkodIlxnDSNUAic50QPr8O/ XSjbR2qOO4/lJYPAA0oRwi0ZcJBHAGH5OtkCe9VMlaoX53wxXck+J2Y2UWGBaRzAn71lOl Em0ZiYf2ifSdUQFhooVTTF9IRDTALQo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751259126; a=rsa-sha256; cv=none; b=0ZJZuwGeNw8vpJNUzusy37hUcAx1wIAItbRheClaE46lpx+AaTfYLeDo0r9DTZiBr447JB O/xMWmdTM6ki+La9bExUyTn4V6RJJeKIP56j/gO1wcoirElw3FQda2wAPzVKqvuRy9cP/R h/gp18K1bauqhX/s6CXwrgnyT+jOXRI= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf15.hostedemail.com: 205.139.111.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-512-2-xU7Sf7PEObPb9a9K-3-A-1; Mon, 30 Jun 2025 00:51:58 -0400 X-MC-Unique: 2-xU7Sf7PEObPb9a9K-3-A-1 X-Mimecast-MFC-AGG-ID: 2-xU7Sf7PEObPb9a9K-3-A_1751259116 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C1DEF1956077; Mon, 30 Jun 2025 04:51:56 +0000 (UTC) Received: from dreadlord.redhat.com (unknown [10.67.24.96]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 936571956095; Mon, 30 Jun 2025 04:51:51 +0000 (UTC) From: Dave Airlie To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Johannes Weiner , Christian Koenig Cc: Dave Chinner , Kairui Song , Dave Airlie Subject: [PATCH 14/17] ttm: hook up memcg placement flags. Date: Mon, 30 Jun 2025 14:49:33 +1000 Message-ID: <20250630045005.1337339-15-airlied@gmail.com> In-Reply-To: <20250630045005.1337339-1-airlied@gmail.com> References: <20250630045005.1337339-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: mJY1wmnz_WTdV7ymh630iy3RbbrmU492nS6VjZxTASU_1751259116 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BB6FBA0005 X-Stat-Signature: 5imqj5nzqreje8c9jcqfy3mna6h6poyg X-HE-Tag: 1751259126-489908 X-HE-Meta: U2FsdGVkX1/xckXYBRZ4RuKQXOw7Gn4tzJgEz+yvx60Zy94eWtXoHceUlHy6TWKghxDIsZUZhTLEnQMyZJjebbvsO/d35mcz+oWbD0qG95pHeSKJW3hd0qrTTuojGhktL8rhHQMnD/tcV5GETUY21h5gBwTFIOgIkh7yrjlLtGtsIpaHt7+qUfj4Eq0CqpuSZ1VYgJGUtoYwmnha2BuxLQES3WiJ7u9no4g2xXn/GvY9Psn7YlpFUDWp29wQuFpisRWs37e7Yfnrur6F0YcUI6bc4gAZqXKjGRvBxR3xe8ZCI+faLp/tm3UYS7VYb8HW+uOQpxjnsNDzDNk2NE2UBH01S0jnBWg0+KliqynlE2obLlLXh4eunVUxqyIpBlmHfp1Pcu0yToLaXSK/2KefEAJRXNNicGbZ3yc9rwnjuFjlFQb1eM10RXUKADgHX5x+3KApPc6qmf1B1K6lRM2K8cAJks6v8UaLzEm6U5IjFEKF6FpLnk0Jm3ujAdUDKTKH6mxvVxMpU8gg4Rfn6aRqtmaoPJ2RMgNWM0H+jG4wsvGcmxoZLJrycFE36FzxW7mR8INA0fltkd0Iwylz1ynAFLAioe3nTVCf1mcGUikR3iTtIcGjzsLe5xfFignP1FamS4Eo7YvUkvv7WOaxiCNhjbbAJtgSMPOiKCN02IJyRmGDqyiVhKA6AiTthgM5l8UIGJp5/sgAM4zaxVb9aVbgrctrLmKAJvt3uW3CNWZvR1fj2hdToivdTijH07l7Jeb200x48OyCKbtX6ni/rU28cyzICzl7JUXmNT549BohtJaE90G2nl4CPahymK+ayhPRy0fmdICHy7gBMetNCplpBIrloyhaaax1oIjDFdbQrFO47JFb115PWrQ/EKyouijouV9q12z+TYU8nEjX/37Tlq5eUxNIDw/fb83dkq9WVOa52tMbEK8QpOEXBvWlRMUih/wONhH2R1x77/b65MG j/GQjuBl yrFz6Q3ZJyKRHrZuqsJPpYaJa/RVEMDbgO9ssQwg6UhgrcRBwXZZ6hxBvPIZal0N3jpvg4hqh06cWac0a1b9/cW3kLuZmmsZ2YCBpFmb3dU7OQT7MHePSdbsCJCZVlfOsQbgFaDc6HnL26t3SQcfjdcabaUwopY6K6ViVhfB2CcFt/CMU2PygD4IoTtoly7E+7ar93hZT7vVK/TEPKcADaTXb35+/X4/p6zyS5hqEvgk0Yajb/96KEKvDCaIZKoOMCQgvnxxOfG+3G2/NyDtXbVrj3W4sEuob2pGyYBKnHJA9e90BtapQ9OSEmkH1PHwidpMwCS2R3dSSDgf2gHYgKs8OxhrqXH2sXTzJzQ/Mg/50v10JrcDvWDRrRome9SDmwSDLM7THN98msQS5Fxpx3MUumixsgiSqXA+XeVPR7ZMHdM8= 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: From: Dave Airlie This adds a placement flag that requests that any bo with this placement flag set gets accounted for memcg if it's a system memory allocation. Signed-off-by: Dave Airlie --- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 6 +++--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- include/drm/ttm/ttm_placement.h | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index af04bb8e2c2a..273757974b9f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -142,7 +142,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_obj= ect *bo, =09=09=09goto out_err; =20 =09=09if (mem->mem_type !=3D TTM_PL_SYSTEM) { -=09=09=09ret =3D ttm_bo_populate(bo, false, ctx); +=09=09=09ret =3D ttm_bo_populate(bo, mem->placement & TTM_PL_FLAG_MEMCG, c= tx); =09=09=09if (ret) =09=09=09=09goto out_err; =09=09} diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo= _util.c index 764d1cf1ecbe..b5521d1bd517 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -167,7 +167,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, =09src_man =3D ttm_manager_type(bdev, src_mem->mem_type); =09if (ttm && ((ttm->page_flags & TTM_TT_FLAG_SWAPPED) || =09=09 dst_man->use_tt)) { -=09=09ret =3D ttm_bo_populate(bo, false, ctx); +=09=09ret =3D ttm_bo_populate(bo, dst_mem->placement & TTM_PL_FLAG_MEMCG, = ctx); =09=09if (ret) =09=09=09return ret; =09} @@ -354,7 +354,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo= , =20 =09BUG_ON(!ttm); =20 -=09ret =3D ttm_bo_populate(bo, false, &ctx); +=09ret =3D ttm_bo_populate(bo, mem->placement & TTM_PL_FLAG_MEMCG, &ctx); =09if (ret) =09=09return ret; =20 @@ -511,7 +511,7 @@ int ttm_bo_vmap(struct ttm_buffer_object *bo, struct io= sys_map *map) =09=09pgprot_t prot; =09=09void *vaddr; =20 -=09=09ret =3D ttm_bo_populate(bo, false, &ctx); +=09=09ret =3D ttm_bo_populate(bo, mem->placement & TTM_PL_FLAG_MEMCG, &ctx= ); =09=09if (ret) =09=09=09return ret; =20 diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_v= m.c index c5ad447debe3..dddc904f8727 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -226,7 +226,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vm= f, =20 =09=09ttm =3D bo->ttm; =09=09err =3D ttm_bo_populate(bo, -=09=09=09=09 false, +=09=09=09=09 bo->resource->placement & TTM_PL_FLAG_MEMCG, =09=09=09=09 &ctx); =09=09if (err) { =09=09=09if (err =3D=3D -EINTR || err =3D=3D -ERESTARTSYS || diff --git a/include/drm/ttm/ttm_placement.h b/include/drm/ttm/ttm_placemen= t.h index b510a4812609..4e9f07d70483 100644 --- a/include/drm/ttm/ttm_placement.h +++ b/include/drm/ttm/ttm_placement.h @@ -70,6 +70,9 @@ /* Placement is only used during eviction */ #define TTM_PL_FLAG_FALLBACK=09(1 << 4) =20 +/* Placement should account mem cgroup */ +#define TTM_PL_FLAG_MEMCG=09(1 << 5) + /** * struct ttm_place * --=20 2.49.0