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 BEA50C83F17 for ; Mon, 14 Jul 2025 05:24:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58AE28D0007; Mon, 14 Jul 2025 01:24:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53A6D8D0001; Mon, 14 Jul 2025 01:24:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 429698D0007; Mon, 14 Jul 2025 01:24:39 -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 2C7C18D0001 for ; Mon, 14 Jul 2025 01:24:39 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id F403414051D for ; Mon, 14 Jul 2025 05:24:38 +0000 (UTC) X-FDA: 83661730278.13.DFEDF4C Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by imf13.hostedemail.com (Postfix) with ESMTP id 2B79320003 for ; Mon, 14 Jul 2025 05:24:36 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=softfail (imf13.hostedemail.com: 207.211.30.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752470677; a=rsa-sha256; cv=none; b=EDMBhjN1JJm6ZTbXEahHhThoOrtxGm9lxURlI34DEFMIOWbaL6rL1kTUDEOBYSGqioZzgb qMppjx0AMnbBYd7i49l8LhRu5uNdglaGcV7Shg8IT1+y5ERd4XdpStYJS1MXoOtaTcDzmJ +aNUtJvX+pMQF9xUJU3SSuHGmKRpgUI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=softfail (imf13.hostedemail.com: 207.211.30.44 is neither permitted nor denied by domain of airlied@gmail.com) smtp.mailfrom=airlied@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752470677; 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=qVCuVqW9ep4v4AvgMWV+flouSdPcBWamgrlZwaRt9zg=; b=i/LuLxGxeqAgbFpF7PeBUNowfv4oElopupyg3vfMCHV7JvfFR5TXIHULpcbflvDmu2+3Cd IP8Qx7pdDZYrsU8GM497baf/TqJRMNaeT1tkZ47f3kd6tlvoY4OoeAYxasnTmCXmoTH08S 2jB5eiS7UZWSHE9ZIS/DqnqHyuogb9I= Received: from mx-prod-mc-02.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-55-nVn-a946PweL0cUgNiVzog-1; Mon, 14 Jul 2025 01:24:34 -0400 X-MC-Unique: nVn-a946PweL0cUgNiVzog-1 X-Mimecast-MFC-AGG-ID: nVn-a946PweL0cUgNiVzog_1752470673 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E13C195608A; Mon, 14 Jul 2025 05:24:33 +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 5816D1977000; Mon, 14 Jul 2025 05:24:28 +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 17/18] amdgpu: add support for memory cgroups Date: Mon, 14 Jul 2025 15:18:32 +1000 Message-ID: <20250714052243.1149732-18-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: 0UbwljTSg6HharnbfCcjKlq_VnCW128tWI5kyNXvc-8_1752470673 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable content-type: text/plain; charset=WINDOWS-1252; x-default=true X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2B79320003 X-Stat-Signature: so9n9mhej9akebxx3c638p1inmaxbufd X-Rspam-User: X-HE-Tag: 1752470676-42161 X-HE-Meta: U2FsdGVkX1855IQD1wO3vRmybKdT8B+nisP0k7/56ogc0cJ8Fx0gWLYwsmSBbrsOOizOJgZvZkTFHh/Di65Nb3Yluxy/1alwsy/UmuyQMSU7psW5awa0B0bes0AiWrtCexguw6FL4KoOFEtEy2k4E4LHeMFI/Z1kX6BwRDIES7y8/WbCR4pzgIrD8NfaV4ssj5xlUG50/xFU3/6fn2HlETWm64bPZkCiu2TWsZTiQvR93HpoxCSysrHSFBrmkY5hGLG7Fh7HYTulRDNOXm/OGYwHI1HUhLexgkrIevylCwvmfy/gpiHlBovYP7Ou2gXagtzKTNplQMqHWSc1BfxPtjEiE/ru7nWxnT7tAclzCboHuPTIsPD+U94tfqR3dxgOVJcFQlPfm1WaU0cXRNfjSPAxBQT+eJqpH7VAfCgjEVrDGVHKmF6vcEhkhL0qHNZ5tREDX/0LVMs9cEzZEoUaiW3lUvVd6mgPXUBQ6/JfpJFVP8k6YwFwy9srRX7SHDkoTCALLy3AvZzEIL7i3/3mfMCz01itZxhRdvlqsv0sjPAgrT2D/IagXlLBrb8WQL9teG3AnVDTJa7H8jq4BuyxQllUI6IvoXDNmybL59aIcjphm0TJtck678uVMFnlp19uHfjXhBP7lAxHz3iKHm05KtV6x9vWZotMnAacs7P0t2jlR1hnKiuhSC2/3uKoCxhj7qI+BpYj+rqR39UyJgEk56AJCKjVi/OhOCeWg5Hfr3pToSENYldBlbr371vFw8+vHfbrFYVhWVYt1Lz8mjVJeFv4Exci6UbrQUI2VZ65DoMLCEtnvm95gLEntp06ndufFTskCfvE9unAC32CC7fcH+8n6pw7fZqDLMXmSGdZDLL0T5VBMTHPLqbkczu1Fw/r8G2Q/0r/yMBF++Jbm4TxMOcQaR5OovO4CL1TSCa9Pd/qwmfBuKDY4/WD7zozbUQE9N5IQPmrBFR5wiCCqSk 7L1lr1eC 7eh1RlEEJoUxFcXmPXBWjsm0bJ2oY/UYA9rY/7BUK4OxnfCbU0ZPLIHGqEotZ1LhVh+eXRYf99U4c5JyHomt7wvMnX6YnFAaRQTsi4kYRzS1r1oKIsJcMb9ASamM/yQcndUrvL2ue0QpYbtmBr/pmRsKcDVUzK9WLrYxvVKZilslidxwdpRZV4bnmgMqrX3ZbOsBATzegiqFGwHaWEXx8YIiLCJqft5d8eDreeAoqcF0Tr3rxfoxV69RxNnzQenG3P/x6wPsqv6VPMgHMv5SQ/hxxLyoNV53xS8uLNe6taAKG99+U2TlulaMB3iRSBdFUneOkDYfnjvzhMlrAA8dagAi2LJDakV7i9V9IfuppI15BqFlISqiqdT33kpkQxXX4MmjDTKzZmN0WuxWH8puMzkPyjy8Bn4Qi2NSndLHS+tSwEDqesoDBLU0Ijyvo488H2FTFHM0YOkD001g= 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 support for adding a obj cgroup to a buffer object, and passing in the placement flags to make sure it's accounted properly. Signed-off-by: Dave Airlie --- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_gem.c index e5e33a68d935..d250183bab03 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -198,6 +198,7 @@ static void amdgpu_gem_object_free(struct drm_gem_objec= t *gobj) =09struct amdgpu_bo *aobj =3D gem_to_amdgpu_bo(gobj); =20 =09amdgpu_hmm_unregister(aobj); +=09obj_cgroup_put(aobj->tbo.objcg); =09ttm_bo_put(&aobj->tbo); } =20 @@ -225,6 +226,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev= , unsigned long size, =09bp.domain =3D initial_domain; =09bp.bo_ptr_size =3D sizeof(struct amdgpu_bo); =09bp.xcp_id_plus1 =3D xcp_id_plus1; +=09bp.objcg =3D get_obj_cgroup_from_current(); =20 =09r =3D amdgpu_bo_create_user(adev, &bp, &ubo); =09if (r) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index 73403744331a..6d5533703b33 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -158,7 +158,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *= abo, u32 domain) =09=09places[c].mem_type =3D =09=09=09abo->flags & AMDGPU_GEM_CREATE_PREEMPTIBLE ? =09=09=09AMDGPU_PL_PREEMPT : TTM_PL_TT; -=09=09places[c].flags =3D 0; +=09=09places[c].flags =3D TTM_PL_FLAG_MEMCG; =09=09/* =09=09 * When GTT is just an alternative to VRAM make sure that we =09=09 * only use it as fallback and still try to fill up VRAM first. @@ -173,7 +173,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *= abo, u32 domain) =09=09places[c].fpfn =3D 0; =09=09places[c].lpfn =3D 0; =09=09places[c].mem_type =3D TTM_PL_SYSTEM; -=09=09places[c].flags =3D 0; +=09=09places[c].flags =3D TTM_PL_FLAG_MEMCG; =09=09c++; =09} =20 @@ -657,16 +657,21 @@ int amdgpu_bo_create(struct amdgpu_device *adev, =09=09size =3D ALIGN(size, PAGE_SIZE); =09} =20 -=09if (!amdgpu_bo_validate_size(adev, size, bp->domain)) +=09if (!amdgpu_bo_validate_size(adev, size, bp->domain)) { +=09=09obj_cgroup_put(bp->objcg); =09=09return -ENOMEM; +=09} =20 =09BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo)); =20 =09*bo_ptr =3D NULL; =09bo =3D kvzalloc(bp->bo_ptr_size, GFP_KERNEL); -=09if (bo =3D=3D NULL) +=09if (bo =3D=3D NULL) { +=09=09obj_cgroup_put(bp->objcg); =09=09return -ENOMEM; +=09} =09drm_gem_private_object_init(adev_to_drm(adev), &bo->tbo.base, size); +=09bo->tbo.objcg =3D bp->objcg; =09bo->tbo.base.funcs =3D &amdgpu_gem_object_funcs; =09bo->vm_bo =3D NULL; =09bo->preferred_domains =3D bp->preferred_domain ? bp->preferred_domain : diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.h index 375448627f7b..8ebaf1bc202f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -55,6 +55,7 @@ struct amdgpu_bo_param { =09enum ttm_bo_type=09=09type; =09bool=09=09=09=09no_wait_gpu; =09struct dma_resv=09=09=09*resv; +=09struct obj_cgroup *objcg; =09void=09=09=09=09(*destroy)(struct ttm_buffer_object *bo); =09/* xcp partition number plus 1, 0 means any partition */ =09int8_t=09=09=09=09xcp_id_plus1; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 920b412156dd..a65e23b8c67e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -151,11 +151,13 @@ static void amdgpu_evict_flags(struct ttm_buffer_obje= ct *bo, =09=09=09amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_GTT | =09=09=09=09=09=09=09AMDGPU_GEM_DOMAIN_CPU); =09=09} +=09=09abo->placements[0].flags &=3D ~TTM_PL_FLAG_MEMCG; =09=09break; =09case TTM_PL_TT: =09case AMDGPU_PL_PREEMPT: =09default: =09=09amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_CPU); +=09=09abo->placements[0].flags &=3D ~TTM_PL_FLAG_MEMCG; =09=09break; =09} =09*placement =3D abo->placement; --=20 2.49.0