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 A2DBDC83F17 for ; Mon, 14 Jul 2025 05:24:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 454258D0003; Mon, 14 Jul 2025 01:24:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4286B8D0001; Mon, 14 Jul 2025 01:24:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 365A48D0003; Mon, 14 Jul 2025 01:24:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 284A18D0001 for ; Mon, 14 Jul 2025 01:24:23 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E05DA14051D for ; Mon, 14 Jul 2025 05:24:22 +0000 (UTC) X-FDA: 83661729564.14.D63F12C Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by imf21.hostedemail.com (Postfix) with ESMTP id 1EFFD1C000A for ; Mon, 14 Jul 2025 05:24:20 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf21.hostedemail.com: 207.211.30.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=1752470661; 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=Dh6ZZVHCzipolZ/9T7La8YPSQAa/D4xfJjDoTZAsZ+VGSDwz+dlg8kHzMsBxeFRYUUOlK7 1t+nXqRSVtu2xJqnc4il3NzPo2DTdudSZS+NEpPJc/6Y/OX5NIA7dkmjvBeXOx/Jre+GrB D/LZsldazlOQY/kEuOo9TvSvSNmd4QU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752470661; a=rsa-sha256; cv=none; b=zff5uEIFRn8l5c0dkRemwE6mrDEB9j5V+UuMNpdAQcfeGunXrD0kUNs5N5DZX+v5FFwrMl ou5ECX35U2IyB6v3dI8x/68RISIiwq5J+B8K5V93G+Jpp/LrLykTes2lOm7XdXsl/OpTos 3o7DMq6V0GWV4kWX3/Jm8WEcLHKcdxo= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf21.hostedemail.com: 207.211.30.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-zxgitXA0NOqSjqvE1iwloA-1; Mon, 14 Jul 2025 01:24:19 -0400 X-MC-Unique: zxgitXA0NOqSjqvE1iwloA-1 X-Mimecast-MFC-AGG-ID: zxgitXA0NOqSjqvE1iwloA_1752470657 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CB8401809C84; Mon, 14 Jul 2025 05:24:17 +0000 (UTC) Received: from dreadlord.redhat.com (unknown [10.67.32.31]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 877B91977000; Mon, 14 Jul 2025 05:24:13 +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/18] ttm: hook up memcg placement flags. Date: Mon, 14 Jul 2025 15:18:29 +1000 Message-ID: <20250714052243.1149732-15-airlied@gmail.com> In-Reply-To: <20250714052243.1149732-1-airlied@gmail.com> References: <20250714052243.1149732-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: cUGvwpOPJGGTgvWfCLI6sfdj0ZYS3uSeih_dLk7bjvc_1752470657 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-Stat-Signature: 9e6bjkmdtqcfotiwjz3kwwq6ries7xny X-Rspamd-Queue-Id: 1EFFD1C000A X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1752470660-342388 X-HE-Meta: U2FsdGVkX1+RHH8CU+24/+W4zO19ySqNMO3jF0QVR6HpS8TVUwDBBP7i2mWVaszKIyA8Kkf/g9nbqHy8jCWkPJB76Y6UpowOlV42Hg9hn1ZVBNmVQK+nXlXUDLzMohqKrQ3tncpGgEVxxbYdDJnuI+cHz3ANJk+TK9LhOekrkQogp6SIfbns52QlpIYV3xhhevDxnOcsE+TBzTwYug7sb0N9tw+fy4J14sZWl6QgAfrGr5U6HB2/y6wfIL/AAqGJl48pkAIqtggZWCVv3kbZZoQlnw7zhwXpeC9Piw9hhLexpRwnaGhduYo5aHUUO2xYPeEaV4PPAmoREn9Tcjy8dE62m7wdolZSVU8qsCTCQBjBlVaNH1B8bUAoPz3VhpBnE/L4QeUudljE4UzQoZdCHfiwBUZ41Vz6lgI2IznGgsX9JXyaPgWPCqwkM9MD1iKzdVifqnJtg3tti0WWQlKgar1Dc9xwgGZ7Ehh2r+kawu8vc2uJLoPdWI2XYlfyl0RO0GvKEQtyBj5BEWfS16nYIhrrl61idnPGrdUq8xi/2H9QHxNMucgoFidFQn6Nu2m7rACvXPf4PiJo1/Hb2HSQJi/TNBJh0AQAL6/xK9ZoBCk8EWBgm552YZbL/9k5cnAh0LGgHejnPQTdL1NCquR+omi2W2EPMyAobHbjzwluA8wlPBZPdeqiA56zXaF7ZExoaFy2z7bQCDMgRQRyob68Yt5ajyatcW7OscAhUQoFnk9w4vXolQrjiRAurJIhSWMeYE8A7Pva5NuxGZX05lAqBX3OhdrJ54usi9gvPOAObQivKZtr5podTp1xnG8YDiWt8Rs56MQe0xW4vUEOGjZeOZmp3SLrkeZHvAQxqPg36b6KVCSot1k5s0+nm6OIipJJtFIW96MqoB4fTUB3Rik1kEbPNz6j0ph5i9QFFZN0NQXBiuUtQ/3KE3MfMLIkW6Sr9wwnBXCNq8A5LUr9MZ2 Jf+1tKz4 gPpAwasgUA3es9b7NMAXwCOLjSOua1f7lFNQDa0vQhEOCZB09F8hgugRTkJUnDwk+ToUnmDydwQYKo1mGpOV+LAnA5z1ndPEHSixmh8vVftLhrJyv8OusUD8wNqiXOr236qAEncUAhHRQQ9b0nCyeyzQ101eGzPLCkSXKDuDcAl9hhy18u9O9r4nDV0p45SGwkq9jmKKQqgBRdQqFofSnMEckYTtOlq8efsmIPoSY1OtmcVrV5bmUKWAxMguq0f9DyYSnCnnsna4c1X0993FC0LttACJmgeFe+ST24JEd+fdjggloLBN3kaMqYfDuqfkkV0Trvkv63s0WIIOcEroGSPbsDw39if9C/N8xtld1SnMXKkbPK1elIye2GlTTvPTXNYqX 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