From patchwork Mon Mar 10 12:06:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 14009721 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 3228DC2BA1B for ; Mon, 10 Mar 2025 12:06:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDD81280016; Mon, 10 Mar 2025 08:06:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8C95280009; Mon, 10 Mar 2025 08:06:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3B07280016; Mon, 10 Mar 2025 08:06:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 91D35280009 for ; Mon, 10 Mar 2025 08:06:49 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 69836A9685 for ; Mon, 10 Mar 2025 12:06:49 +0000 (UTC) X-FDA: 83205514938.04.998FD33 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf19.hostedemail.com (Postfix) with ESMTP id E92791A0020 for ; Mon, 10 Mar 2025 12:06:46 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qP1HaEej; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of mripard@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=mripard@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741608406; 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:dkim-signature; bh=Gpo0bPdrgcuxeH56dKjEWiKh4kK4uPTuXruQIYpsdqY=; b=HhBNeT4pspyWyNM/YLxzGWtmP97DRyxa4lRb6gIdhHRn1z4RZn50zJHUgW9uqalaL5pMXr pgNNosyzJYACRdqcxqCa6CK9TZLgaCSWQRDhp+ZsmeYsvIz8XMkexUarF2Uxc+rtsMP8gM Dqa0C22W0hZrllvEJTFzu5MbGgav+KU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741608407; a=rsa-sha256; cv=none; b=Gx3yJWobvETsxX4qWP+6OWyFI9upmvQwNUMhlzYQ+u+7p1vV5ExIk2CsjafUnTRGl38pUv xPBt4Tga4Basxp8E+85ZwB1DmXHSstjWfscnEij4w+eV9uBNrMJEJTmVm06HaS5vlqIglk O2JljQg7E//8W3IrkTzGzoGgbwzli2I= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qP1HaEej; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of mripard@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=mripard@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 342E6A4599F; Mon, 10 Mar 2025 12:01:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 881E4C4CEF1; Mon, 10 Mar 2025 12:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741608406; bh=NXKrlxOk8nYj3oekFD8GiKq9/u4PNdR9ojkDiIpqr8Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qP1HaEejl3XbM+OS0ZKFaaD86jNWg/27gajc0J541SsR7ZFPhKVTG3ZBJjpoQMliu NOawWgEwaEwZ01wa9RTULuZgGivrBBZtKlDVAMzRxJDPnZAoKrNIUz/OMqTxQf68MV oyaDfZg98cxeS9aToEfD74iRQdNbpy6aqcpqBlADSmFpsqUKq0cg/k6/MaH2vfGyKW 6HCbzZuIqVzOOtJXoG2bQpZofznzIf+76AEZdiodRQm3L1e2cymwgusOb2W1/8vrC2 M1i0C9qr6qkLBJrKtljZQ4kUeY/hyStMuDlAMt7Sh2OLM1pXA2nCBEzZQs2jdbpcFl hz5IMtNseNp+g== From: Maxime Ripard Date: Mon, 10 Mar 2025 13:06:16 +0100 Subject: [PATCH RFC 10/12] dma-buf: cma: Account for allocations in dmem cgroup MIME-Version: 1.0 Message-Id: <20250310-dmem-cgroups-v1-10-2984c1bc9312@kernel.org> References: <20250310-dmem-cgroups-v1-0-2984c1bc9312@kernel.org> In-Reply-To: <20250310-dmem-cgroups-v1-0-2984c1bc9312@kernel.org> To: Andrew Morton , Marek Szyprowski , Robin Murphy , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Benjamin Gaignard , Brian Starkey , John Stultz , "T.J. Mercier" , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Tomasz Figa , Mauro Carvalho Chehab Cc: Hans Verkuil , Laurent Pinchart , linux-mm@kvack.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, Maxime Ripard X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2422; i=mripard@kernel.org; h=from:subject:message-id; bh=NXKrlxOk8nYj3oekFD8GiKq9/u4PNdR9ojkDiIpqr8Y=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnnrm7790W4odtyuqKjtsCfpWvTZgqvnjx9dp4mw4Vnx om7O58YdpSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAi4sUM/+OM1uZ9mxg4/6n9 j+bjKyIYp3zkEPha/IbRz9lBedkrhq0M/5Pe2ZUEOkbWVapK+j80WiT1S7Ppivsji5iFe/Z+XWB nwgEA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Stat-Signature: ohsdprboip5jpb8y4qfeaechdpwf8jn7 X-Rspamd-Server: rspam05 X-Rspam-User: X-Rspamd-Queue-Id: E92791A0020 X-HE-Tag: 1741608406-233504 X-HE-Meta: U2FsdGVkX190Aic9uS0X+/2os56ZuYpzs2cFpWK0f92dbaCBXNU2Iu9EiJcpIIVDGgT3v3/XJyFLxL2C2FP/LXHiAHUqRB6QC8PiiWrg+HDFuAmu4FGDicP2hNVV4iJ1Aa0FCLmEmfB1JvOGZI8PodC2F0ue8Rph/e+ZRkdvvZfgDYBACRoHm7cy0og6tz5H6GGDHC8tghmtmEOt8sK1B2IgYncLfC6xbNfXbN55Hjw5cbLC/fm1xJUq9rX3tMACUYN3LT/Htky3fdcwUopVY857HfFzHJ0TJd3iMf5RpSUjrRV7QhzJXXeUKztLHM1vfCdnZzeSRRM7c2PUhO7G4VgC8hjlxFYfl9H93Px3eTsTdpK9m+24SHDb/G+v3KOoFagPo+DLGpZcKYreAvvUEs6FZlPhYSBdBD2Zsw8tm0cRdgH0/iQCW2nLIvHXejPFwkbKm1AzlyeYXcgo5dctNnUN7KPwX9x4B5IIjYbQu42+ISYPfWTBzTDBWoMhZa7716L6UugNoGChFewhh6NSLoZYoJd8X/9cmtAWsKJ9p4XgFEAlWzppN9AdkBRkzi1nwLlHJ1jVGPJ6M0xpMMNi1IF6U9B0yKE8JI1whtaYSfbFrYNiIcUl7FmfmzddqgcCcpfHseX1G7CoZlJ4XJ88usPkB4UmuIuhZhECS0Fz6EAKrkZBIzjbdC3910a7saQdmsqRjWlCaO9G085G1lbniXYJIiHLJM3F1z6pmWhO48z2Tcx8IJuBAb5kKr9lz6avfBZ4ruroh4CQ4C8rcSEVGKSxvTc+wU2CcyKS/g5tHVh7KIG1gN9aWHf+PaGeIqjk59dXwtHYkQcwYroGo23IWCH5vuIWgmaqPEJ24ttk+9R1HD19tuV6ZUEqAAypQkKEncS/kGCmDa4i6M7SnoOQynwiL8fhExBsup4MobKGwKWiQmsm8TodEeTZkAucgB8gbZeH3rNNa2pDOv//uvX 2flAfkzD KohbSKrELLmr5V0UxKpKatky2ol/EY3pupvYHBMzd5a9yX2GZ5V4EkGavdMMF2Hc5c8kvA2AZ9usJgVW33SGeHXP8O4lqvNSDw8xV85vjyfShIiaZpKDhUZyvHAxERjJOZ9zjCfwf05crA/q+lVYulJNOcPv103/5ZfaPBKyh91uSzOI8WEyRwWZ9HpWpFL/us+WoLTKqNq3FPvEIrGZXlGpwGhPQZx3uQb904StvrWs0N7N2y/xZTAkQZQIy6QEHsN28cw6tzcFOZeQDE5S9yKOKjlo7jRFSXfb7sn+kri9+gCLxZ3HT+man00yw1tPkMRrJiq0nBJ+i1PEMhnxbm3bPTVwvvLPD6DAZ 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: Now that we have a DMEM region per CMA region, we can track the allocations of the CMA heap through DMEM. Signed-off-by: Maxime Ripard --- drivers/dma-buf/heaps/cma_heap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 9512d050563a9ad0a735230c4870c3d3b3b01b25..4951c41db3ba0cbd903b6d62787f51b83f4a1e7e 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -7,10 +7,11 @@ * * Also utilizing parts of Andrew Davis' SRAM heap: * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * Andrew F. Davis */ +#include #include #include #include #include #include @@ -276,23 +277,31 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap, unsigned long len, u32 fd_flags, u64 heap_flags) { struct cma_heap *cma_heap = dma_heap_get_drvdata(heap); + struct dmem_cgroup_pool_state *pool; struct cma_heap_buffer *buffer; DEFINE_DMA_BUF_EXPORT_INFO(exp_info); size_t size = PAGE_ALIGN(len); pgoff_t pagecount = size >> PAGE_SHIFT; unsigned long align = get_order(size); struct page *cma_pages; struct dma_buf *dmabuf; int ret = -ENOMEM; pgoff_t pg; + ret = dmem_cgroup_try_charge(cma_get_dmem_cgroup_region(cma_heap->cma), + size, &pool, NULL); + if (ret) + return ERR_PTR(ret); + buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); - if (!buffer) - return ERR_PTR(-ENOMEM); + if (!buffer) { + ret = -ENOMEM; + goto uncharge_cgroup; + } INIT_LIST_HEAD(&buffer->attachments); mutex_init(&buffer->lock); buffer->len = size; @@ -348,18 +357,23 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap, dmabuf = dma_buf_export(&exp_info); if (IS_ERR(dmabuf)) { ret = PTR_ERR(dmabuf); goto free_pages; } + + dmabuf->cgroup_pool = pool; + return dmabuf; free_pages: kfree(buffer->pages); free_cma: cma_release(cma_heap->cma, cma_pages, pagecount); free_buffer: kfree(buffer); +uncharge_cgroup: + dmem_cgroup_uncharge(pool, len); return ERR_PTR(ret); } static const struct dma_heap_ops cma_heap_ops = {