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 X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2C94C433DB for ; Wed, 10 Feb 2021 07:52:38 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6F27664E05 for ; Wed, 10 Feb 2021 07:52:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F27664E05 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 761726E8CF; Wed, 10 Feb 2021 07:52:34 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 92F1D6E21A; Wed, 10 Feb 2021 07:52:32 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E3A89AC97; Wed, 10 Feb 2021 07:52:30 +0000 (UTC) To: Daniel Vetter , Brian Welty References: <20210126214626.16260-1-brian.welty@intel.com> <20210126214626.16260-9-brian.welty@intel.com> From: Thomas Zimmermann Message-ID: Date: Wed, 10 Feb 2021 08:52:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Subject: Re: [Intel-gfx] [RFC PATCH 8/9] drm/gem: Associate GEM objects with drm cgroup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?Q?Christian_K=c3=b6nig?= , David Airlie , Kenny Ho , Eero Tamminen , dri-devel@lists.freedesktop.org, Chris Wilson , amd-gfx@lists.freedesktop.org, Tejun Heo , cgroups@vger.kernel.org, intel-gfx@lists.freedesktop.org Content-Type: multipart/mixed; boundary="===============1104485413==" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1104485413== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="t358AJk9LGksusmvn059A4ACV9zuTsn4c" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --t358AJk9LGksusmvn059A4ACV9zuTsn4c Content-Type: multipart/mixed; boundary="37ZsdYh6Dp4INO2q6vcaH93ikD1BsiH24"; protected-headers="v1" From: Thomas Zimmermann To: Daniel Vetter , Brian Welty Cc: Tvrtko Ursulin , Eero Tamminen , David Airlie , Kenny Ho , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Chris Wilson , amd-gfx@lists.freedesktop.org, Tejun Heo , cgroups@vger.kernel.org, =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: Subject: Re: [RFC PATCH 8/9] drm/gem: Associate GEM objects with drm cgroup References: <20210126214626.16260-1-brian.welty@intel.com> <20210126214626.16260-9-brian.welty@intel.com> In-Reply-To: --37ZsdYh6Dp4INO2q6vcaH93ikD1BsiH24 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Am 09.02.21 um 11:54 schrieb Daniel Vetter: > *: vmwgfx is the only non-gem driver, but there's plans to move at leas= t > vmwgfx internals (maybe not the uapi, we'll see) over to gem. Once that= 's > done it's truly all gpu memory. Do you have a URL to the discussion? While I recent worked on GEM, I thought that vmwgfx could easily switch=20 to the GEM internals without adopting the interface. Personally, I think we should consider renaming struct drm_gem_object et = al. It's not strictly GEM UAPI, but nowadays anything memory-related.=20 Maybe drm_mem_object would fit. Best regards Thomas >> --- >> drivers/gpu/drm/drm_gem.c | 89 +++++++++++++++++++++++++++++++++++++= ++ >> include/drm/drm_gem.h | 17 ++++++++ >> 2 files changed, 106 insertions(+) >> >> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c >> index c2ce78c4edc3..a12da41eaafe 100644 >> --- a/drivers/gpu/drm/drm_gem.c >> +++ b/drivers/gpu/drm/drm_gem.c >> @@ -29,6 +29,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -112,6 +113,89 @@ drm_gem_init(struct drm_device *dev) >> return drmm_add_action(dev, drm_gem_init_release, NULL); >> } >> =20 >> +/** >> + * drm_gem_object_set_cgroup - associate GEM object with a cgroup >> + * @obj: GEM object which is being associated with a cgroup >> + * @task: task associated with process control group to use >> + * >> + * This will acquire a reference on cgroup and use for charging GEM >> + * memory allocations. >> + * This helper could be extended in future to migrate charges to anot= her >> + * cgroup, print warning if this usage occurs. >> + */ >> +void drm_gem_object_set_cgroup(struct drm_gem_object *obj, >> + struct task_struct *task) >> +{ >> + /* if object has existing cgroup, we migrate the charge... */ >> + if (obj->drmcg) { >> + pr_warn("DRM: need to migrate cgroup charge of %lld\n", >> + atomic64_read(&obj->drmcg_bytes_charged)); >> + } >> + obj->drmcg =3D drmcg_get(task); >> +} >> +EXPORT_SYMBOL(drm_gem_object_set_cgroup); >> + >> +/** >> + * drm_gem_object_unset_cgroup - clear GEM object's associated cgroup= >> + * @obj: GEM object >> + * >> + * This will release a reference on cgroup. >> + */ >> +void drm_gem_object_unset_cgroup(struct drm_gem_object *obj) >> +{ >> + WARN_ON(atomic64_read(&obj->drmcg_bytes_charged)); >> + drmcg_put(obj->drmcg); >> +} >> +EXPORT_SYMBOL(drm_gem_object_unset_cgroup); >> + >> +/** >> + * drm_gem_object_charge_mem - try charging size bytes to DRM cgroup >> + * @obj: GEM object which is being charged >> + * @size: number of bytes to charge >> + * >> + * Try to charge @size bytes to GEM object's associated DRM cgroup. = This >> + * will fail if a successful charge would cause the current device me= mory >> + * usage to go above the cgroup's GPU memory maximum limit. >> + * >> + * Returns 0 on success. Otherwise, an error code is returned. >> + */ >> +int drm_gem_object_charge_mem(struct drm_gem_object *obj, u64 size) >> +{ >> + int ret; >> + >> + ret =3D drm_cgroup_try_charge(obj->drmcg, obj->dev, >> + DRMCG_TYPE_MEM_CURRENT, size); >> + if (!ret) >> + atomic64_add(size, &obj->drmcg_bytes_charged); >> + return ret; >> +} >> +EXPORT_SYMBOL(drm_gem_object_charge_mem); >> + >> +/** >> + * drm_gem_object_uncharge_mem - uncharge size bytes from DRM cgroup >> + * @obj: GEM object which is being uncharged >> + * @size: number of bytes to uncharge >> + * >> + * Uncharge @size bytes from the DRM cgroup associated with specified= >> + * GEM object. >> + * >> + * Returns 0 on success. Otherwise, an error code is returned. >> + */ >> +void drm_gem_object_uncharge_mem(struct drm_gem_object *obj, u64 size= ) >> +{ >> + u64 charged =3D atomic64_read(&obj->drmcg_bytes_charged); >> + >> + if (WARN_ON(!charged)) >> + return; >> + if (WARN_ON(size > charged)) >> + size =3D charged; >> + >> + atomic64_sub(size, &obj->drmcg_bytes_charged); >> + drm_cgroup_uncharge(obj->drmcg, obj->dev, DRMCG_TYPE_MEM_CURRENT, >> + size); >> +} >> +EXPORT_SYMBOL(drm_gem_object_uncharge_mem); >> + >> /** >> * drm_gem_object_init - initialize an allocated shmem-backed GEM ob= ject >> * @dev: drm_device the object should be initialized for >> @@ -156,6 +240,8 @@ void drm_gem_private_object_init(struct drm_device= *dev, >> obj->dev =3D dev; >> obj->filp =3D NULL; >> =20 >> + drm_gem_object_set_cgroup(obj, current); >> + >> kref_init(&obj->refcount); >> obj->handle_count =3D 0; >> obj->size =3D size; >> @@ -950,6 +1036,9 @@ drm_gem_object_release(struct drm_gem_object *obj= ) >> =20 >> dma_resv_fini(&obj->_resv); >> drm_gem_free_mmap_offset(obj); >> + >> + /* Release reference on cgroup used with GEM object charging */ >> + drm_gem_object_unset_cgroup(obj); >> } >> EXPORT_SYMBOL(drm_gem_object_release); >> =20 >> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h >> index 240049566592..06ea10fc17bc 100644 >> --- a/include/drm/drm_gem.h >> +++ b/include/drm/drm_gem.h >> @@ -37,6 +37,7 @@ >> #include >> #include >> =20 >> +#include >> #include >> =20 >> struct dma_buf_map; >> @@ -222,6 +223,17 @@ struct drm_gem_object { >> */ >> struct file *filp; >> =20 >> + /** >> + * @drmcg: >> + * >> + * cgroup used for charging GEM object page allocations against. Thi= s >> + * is set to the current cgroup during GEM object creation. >> + * Charging policy is up to the DRM driver to implement and should b= e >> + * charged when allocating backing store from device memory. >> + */ >> + struct drmcg *drmcg; >> + atomic64_t drmcg_bytes_charged; >> + >> /** >> * @vma_node: >> * >> @@ -417,4 +429,9 @@ int drm_gem_fence_array_add_implicit(struct xarray= *fence_array, >> int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device= *dev, >> u32 handle, u64 *offset); >> =20 >> +void drm_gem_object_set_cgroup(struct drm_gem_object *obj, >> + struct task_struct *task); >> +void drm_gem_object_unset_cgroup(struct drm_gem_object *obj); >> +int drm_gem_object_charge_mem(struct drm_gem_object *obj, u64 size); >> +void drm_gem_object_uncharge_mem(struct drm_gem_object *obj, u64 size= ); >> #endif /* __DRM_GEM_H__ */ >> --=20 >> 2.20.1 >> >=20 --=20 Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany (HRB 36809, AG N=C3=BCrnberg) Gesch=C3=A4ftsf=C3=BChrer: Felix Imend=C3=B6rffer --37ZsdYh6Dp4INO2q6vcaH93ikD1BsiH24-- --t358AJk9LGksusmvn059A4ACV9zuTsn4c Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEExndm/fpuMUdwYFFolh/E3EQov+AFAmAjkL0FAwAAAAAACgkQlh/E3EQov+D/ DA/9FuoxspimR/1k4JtNsUWDSx1lHZXLFoUIF3YYkJMb2+lU8r40EzEcaK4dCjMjNnJcWojEodwU tGeD495XQ86ZtwU/OMA9vFXVh624tywF3h9Tn4LTcX6Q3AqDk/SDTbJwVHM+7ADQlREhvlCX42N8 XKzQe5AuN5+Eu1jU/uTJokirswB+1voV2i/m2lECZt8KKDLV3INlkY1d9XdqoIpJN1GRSKxUdLEe 0x9m9dDUqW6mFH3RRprwl0/2yZ3qeZ/WNhEgWhN02GZ2/dWQQ2Hl72j5EQuT2ma6QK05hQakEF2q XXifa4i+EwR4v10sfK7Eb6wG3eD0TBjMZb4hkquJJXqK4RX78QGxoZ73ilvQyw4ESEgq8N0GvsTQ m+xP9BLuZaryZLP8yAjpzzFdDXFDXFKQykgPcgqXPCYkXorWtY6WAbI9AuRTQ7P0UC5EyJbKwubU r9m38RkjhDi7uIGeUv2/03Edkwsqcy1dud93GDFf3+IniGUbMUTn2yjWhuUK6bWiUua6PW+B0Fa+ vqzcwhk0qPo9u+Ul5f3OcW8ihS3UqzanqI+hp4e2LL2TcwznyXEgjjfEc5k44xGwIBUw1nZ5bIGS 7L7Fm08I8I/sxIk2d5e9UkDSEw0OePqoD8WQzNT/mhLiM2AY5OlXwxoMVpkLG79GMEozUiAQcjLS Wg4= =LnX9 -----END PGP SIGNATURE----- --t358AJk9LGksusmvn059A4ACV9zuTsn4c-- --===============1104485413== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1104485413==--