Shared-memory allocator services (e.g., Android's gralloc) allocate dma-bufs on behalf of client processes in different cgroups. Today those allocations are charged to the allocator's own cgroup, leaving client cgroups with no visibility into their actual memory consumption and defeating resource limits.
This series adds memory cgroup accounting for dma-buf allocations, building on T.J. Mercier's earlier series [1] and incorporating feedback from previous versions and LPC discussions [2].
Patch 1 introduces the MEMCG_DMABUF stat and the obj_cgroup_reserve_dmabuf()/obj_cgroup_cancel_dmabuf() and mem_cgroup_commit_dmabuf()/mem_cgroup_uncharge_dmabuf() helpers in mm/memcontrol.c
Patch 2 wires up the charging policy: dma_buf_export() stores exp_info.objcg and updates the stat, a new charge_fd field in DMA_HEAP_IOCTL_ALLOC accepts a pidfd or cgroupfd to identify the target cgroup, and __GFP_ACCOUNT is removed from system-heap allocations to avoid double counting.
Patch 3 adds DMA_BUF_IOCTL_XFER_CHARGE, a general ioctl on any dma-buf fd to transfer charges post-allocation. This covers the double-hop allocator case (SurfaceFlinger -> gralloc -> kernel) and works for buffers from any exporter that opts in. Charging is gated by dmabuf->objcg being set at export time, ensuring that transfer is only applied for buffers backed by system memory where size reflects actual bytes. If the receiving cgroup lacks capacity for the charge, the ioctl returns -ENOMEM and the original charge is preserved.
Patches 4-7 add access control for cross-cgroup charging. Letting userspace decide who to charge needs to be a privileged operation because it has material impact on OOM decision and resource limits. Charging outside the caller's own memcg subtree requires CAP_SYS_RESOURCE. On top of that, LSM hooks gate the two charge_fd flavours: security_memcg_charge_task() gates the pidfd path (target identified by task credentials) and security_memcg_charge_cgroup() gates the cgroupfd path (target identified by cgroup directory label), with SELinux implementations using process2:charge_to and cgroup:charge_to permissions.
Patch 8 adds selftests. The tests and vmtest script were mostly written by an LLM, closely following the style of the surrounding tests and the virtme-ng setup. All code has been reviewed and tested.
Known limitations:
- Single-owner model: a dma-buf carries one memcg charge regardless of how many processes share it. - Only memcg accounting. CMA heaps would additionally need dmem controller integration. - If a transfer of an uncharged buffer fails, the buffer remains charged to the original cgroup. The allocator (userspace) is expected to handle this (retry, free, ...). - The LSM hooks are intentionally narrow. Broader cgroup access controls (e.g. for the memfd/kexec handover case [2]) could be a separate effort reusing the same pattern. - Only system heap sets exp_info.objcg today. Other exporters (DRM, V4L2, etc.) can opt in by setting it, but are not covered by this series. - Related to the above: lazy backing-store allocation is not supported. This can be extended later, e.g., by adding a flag on the dma-buf struct for explicitly marking when memory is committed.
Note on TTM/GPU accounting [3]: that effort charges system memory allocated for GPU buffers per page, with its own stats (gpu_active and gpu_reclaim). This series charges at the dma-buf level, for memory with no memory.stat category of its own; exporters whose memory is already charged by their allocator must not opt in, so the two do not overlap.
[1] https://lore.kernel.org/cgroups/20230109213809.418135-1-tjmercier@google.com... [2] https://lpc.events/event/20/contributions/2416/ [3] https://lore.kernel.org/all/20260706052330.1110909-1-airlied@gmail.com/
Signed-off-by: Albert Esteve aesteve@redhat.com --- Changes in v5: - Reject dma-buf reservations above INT_MAX pages to avoid nr_pages truncation (Sashiko) - Require CAP_SYS_RESOURCE for charge requests targeting outside caller's own memcg subtree (Sashiko) - Hold an obj_cgroup instead of a memcg in the dma-buf struct (Thomas Hellström) - Restore mem_cgroup_commit_dmabuf() so dma_buf_export() does not reach into memcg stat internals - Resolve the cgroup and run the LSM check against the same file in get_obj_cgroup_from_fd() - The cgroupfd hook now takes the file and checks the inode SID, so genfscon-labeled cgroups are covered - Rename the LSM hooks to security_memcg_charge_{task,cgroup}() - Replace dma_buf object class in SELinux with process2:charge_to and cgroup:charge_to - Link to v4: https://lore.kernel.org/r/20261104-v2_20230123_tjmercier_google_com-v4-0-181...
Changes in v4: - Remove memcg_account flag; exp_info.memcg != NULL is the opt-in - Centralize memcg bookkeeping in dma_buf_export() - Drop mem_cgroup_commit_dmabuf() - Make mem_cgroup_transfer_charge() generic (not dma-buf specific) - Add EXPORT_SYMBOL_GPL for reserve/cancel (system_heap is tristate) - Reorder: move xfer ioctl before LSM patches - Serialize dmabuf->memcg updates with the dma-buf resv lock instead of cmpxchg - Link to v3: https://lore.kernel.org/r/20261027-v2_20230123_tjmercier_google_com-v3-0-78d...
Changes in v3: - Split mem_cgroup_charge_dmabuf() into reserve/commit/cancel three-phase API - Extract mem_cgroup_get_from_fd() helper shared by allocate and xfer paths - Rename __padding to flags in struct dma_buf_transfer_charge - Fix UAF race: move mod_memcg_state() before cmpxchg in transfer - Add memcg_account opt-in flag; xfer returns -EOPNOTSUPP if unset - Wrap dma_buf_charge_cgroup hook in #ifdef CONFIG_CGROUPS - Fix TOCTOU in SELinux charge_cgroup xattr length handling - Link to v2: https://lore.kernel.org/r/20261021-v2_20230123_tjmercier_google_com-v2-0-ef6...
Changes in v2: - Move charge_pid_fd to charge_fd, accepting cgroupfd in addition to pidfd per Christian König. - New DMA_BUF_IOCTL_XFER_CHARGE ioctl for post-allocation charge transfer on any dma-buf, not just dma-heap buffers per Christian König and T.J. Mercier. - Moved __GFP_ACCOUNT removal to patch 1 per Barry Song. - dma-buf charge/uncharge helpers take struct dma_buf * directly to avoid the need for caller to manage size calculations. - Added test_xfer_charge_cgroupfd_self to dmabuf-heap selftests. - Added LSM and SELinux hooks for cgroupfd-based charging. - Rebased to v7.3-rc7. - Link to v1: https://lore.kernel.org/r/20260512-v2_20230123_tjmercier_google_com-v1-0-632...
--- Albert Esteve (7): dma-heap: charge dma-buf memory via explicit memcg dma-buf: transfer objcg charges via DMA_BUF_IOCTL_XFER_CHARGE lsm: Add memcg_charge_task LSM hook lsm: Add memcg_charge_cgroup LSM hook selinux: Restrict cross-cgroup memcg charging selinux: Restrict memcg charging to a cgroupfd target selftests/dmabuf-heaps: Add dma-buf memcg accounting tests
T.J. Mercier (1): memcg: Add MEMCG_DMABUF accounting infrastructure
Documentation/admin-guide/cgroup-v2.rst | 6 + drivers/dma-buf/dma-buf.c | 45 +++ drivers/dma-buf/dma-heap.c | 27 +- drivers/dma-buf/heaps/cma_heap.c | 3 +- drivers/dma-buf/heaps/system_heap.c | 19 +- drivers/tee/tee_heap.c | 3 +- include/linux/dma-buf.h | 10 + include/linux/dma-heap.h | 4 +- include/linux/lsm_hook_defs.h | 2 + include/linux/memcontrol.h | 56 +++ include/linux/security.h | 15 + include/uapi/linux/dma-buf.h | 26 ++ include/uapi/linux/dma-heap.h | 7 + mm/memcontrol.c | 271 +++++++++++++ security/security.c | 35 ++ security/selinux/hooks.c | 17 + security/selinux/include/classmap.h | 3 +- tools/testing/selftests/cgroup/Makefile | 2 +- tools/testing/selftests/cgroup/test_memcontrol.c | 447 ++++++++++++++++++++- tools/testing/selftests/dmabuf-heaps/config | 1 + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 237 ++++++++++- tools/testing/selftests/dmabuf-heaps/vmtest.sh | 226 +++++++++++ 22 files changed, 1446 insertions(+), 16 deletions(-) --- base-commit: 05441d697f7f9a927264f4058cbbc6a03dfcac9d change-id: 20260508-v2_20230123_tjmercier_google_com-f44fcfb16530
Best regards, -- Albert Esteve aesteve@redhat.com