From patchwork Mon Mar 10 12:06:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 14009723 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 526D9C28B30 for ; Mon, 10 Mar 2025 12:06:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98266280018; Mon, 10 Mar 2025 08:06:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9303F280009; Mon, 10 Mar 2025 08:06:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81ECE280018; Mon, 10 Mar 2025 08:06:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6230B280009 for ; Mon, 10 Mar 2025 08:06:54 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 508F7B7F32 for ; Mon, 10 Mar 2025 12:06:54 +0000 (UTC) X-FDA: 83205515148.14.C54E2B8 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf09.hostedemail.com (Postfix) with ESMTP id 7C619140002 for ; Mon, 10 Mar 2025 12:06:52 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=oEVjNg3f; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.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=1741608412; 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=/brESwjvUiBW9ywZZAyEO6xLdJhkWDU1Iob6viL7wns=; b=6Rb4ngL0ITfcQPhYNRQLW0ZGWbUntpB8VoDJeEOElYJRQfN3qH2CVgw4ZCgs8mVqlrcHZi eycQK4blI3sB4z6a06U4vgJssT5LjvNKuYGH++4M2g/rthfj+SE3qQTcAY+KLmQwt4EnpF UPmtFIy02CHBzJD+NT/WbcqxnsYYuYI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741608412; a=rsa-sha256; cv=none; b=uj9744vQ6igcp6IiyjgcF8i7BscslEhRgEPqV6CfzAfJyZMyynZckjPvduYHIrEwailsYG +cmeANPAUK8jiP9HGDgXizm3bCjN1YXdDHFKF0YKqFbNdm9cKS3fcjZu1lqrVG0iMgXmqH OveKXM9Yx3yIz6JkY6BDq4Y1/TwimIk= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=oEVjNg3f; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.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 A4F2BA4599F; Mon, 10 Mar 2025 12:01:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B990C4CEE5; Mon, 10 Mar 2025 12:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741608411; bh=7pH3VC/kTZvZyXEwWyZXDmfZRfenpkkRjJncy/YaV3A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oEVjNg3fibaFagVdlIbk1zBQgRtK4seXDgW44TGzwkQ40PmG4N59lYT+i2hjQ5l03 NA6f1fLNP8lcsn9t2x7thW/+0wFqWl1lNQwn5emhsN+Qm5+zGTO8TqmVCBlLiZNaiF OgPH/VIaPn14p9iOs4NrV5TAKskCUJoMdusz5wcDhMolyNdyGa1OnKb1njCHwNN+Wn BtXSC8CYNyCjeNV/fE609L74FQslohr/mle3ggF1fH8TF2nA4YnRFcGyCVPmS4+Plf xK+5UbDA3sytdfkGm4HmEcfHeLQdRJwFr4I+93ghEJCXwvZi1+K+ouJwqyEt/fcySB tFZezpIY8/SOg== From: Maxime Ripard Date: Mon, 10 Mar 2025 13:06:18 +0100 Subject: [PATCH RFC 12/12] media: videobuf2: Track buffer allocations through the dmem cgroup MIME-Version: 1.0 Message-Id: <20250310-dmem-cgroups-v1-12-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=3070; i=mripard@kernel.org; h=from:subject:message-id; bh=7pH3VC/kTZvZyXEwWyZXDmfZRfenpkkRjJncy/YaV3A=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnnrm6/ZsdQ+MWVYVbt25WiJm9cVq1kbvIv1+nqNj8Uw cQw8Zh/RykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACaiH8jI8G9RwTMV4c9c83xf z/EMmLjgxVIR86M37d8sdLg43++uTQbDf9/VGd8tpSbXPHmhXr3q3hpj4wk3k392pC04ujVyhVh VDjsA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Rspam-User: X-Rspamd-Queue-Id: 7C619140002 X-Rspamd-Server: rspam08 X-Stat-Signature: qcwttcost5j8k36tzptaw1yy7rqcth37 X-HE-Tag: 1741608412-15769 X-HE-Meta: U2FsdGVkX18L5I/1qzbKYC90uaJeLOyiYeoAJvMl3mU3MrNwnNg1Sbn+tyPaWnX5TS5DL4SIL76zii8MKlviPGnRVlT25eOMYgio3na87FRR4TOqjum6hx27f6zVW+fdedgEtNMrrRJIY3+DMLXwf8YmUjnKo0GyQ9fnCx/Wlr/SmLazGPjFl74DKWeazh2LCs/z2yOfILQL5bgfLLlHdbDmiKB+f+nvBGPnxOo3fBDV5HY/CbBdBTCcZa/ExlhjfalqA91wCKQnIEReaXf0u/t3SHYOGyWEKpBY8uw4YwCeuFpqyMaVDqyahIsoiBYG+SPyP2uq+DxmvYmZ05di5BJJ3RE53JFexAnq5TSG2vUODpVPPHVofqv5o3gS0XHcqJZI4JX7mjTNJ+KzzJO93axFERGkVBR40+e+3UMCZLZ9TbKZl1ZgTtroKVQRSWnCv8NWgDv3SYJ7mHdUVw0KIgSv1tuBqXQ8jQXk/GBWk0R9vfgeajCRdvdw/7k6ZLXjVSPQrdbjMVH4vx3KW4Yf3TuEZ/3aEGfSqL9zTa9rvAfX+WuRm+VzlWl6crFh4gnVEyE8rgTkHINe6AYgzCQOAFE5BuGZ9l66CbC9R3Y56a6bzxmxzquZPdsLVkxzd8XTLTaQSW8ewFbYTLW1xpsm/XcEG6ll0PsQzcVZ/0t4SCPZaGeSCfevfzR8hOh9YnEnt4VYmh7YpqceZtpDK9jUmrkbnOu3clIptkpIVnapcEFfUnxYDsIHF4lNN47lvyouh2hNjf6/Ppu8f6o6fiJmRXKE05njSEV+4RbWIcVkM3N3/0zFXrQ+/P3c/g9ylCfSgOSIc2G0Jlm5QFEtyD5I+kMTadRgnzJ9TLu1h3BzmTxY2XeP9B45cA9/LM3jGunXsMOXC7n3/z+3xOlBta1oniFyagesvukyGNunED2WhvhJN1007RDAMw3d/hv8aI7b2BZUkeBw96/o2W5vEvc eZDLgkG0 NI4ZMYB5X3vgBH29dEWjD+64zXY4js6kSN6Hhyi3S4Iu9E5Q2N5eDzZaDZp3lxTeH0swWIyEnhVP/F2PBtHWGk5hEjgXvZdeJ9R0AGR84bv/yHH9cgQCeoQGwVFEmplda5g+Aovh4ov4EhEwN9JQ+OyJUkiVo84qFjwGHlDwNVb27jXicxhrMQvWbmbUYpRXU/yon5Oth9XkR8j4AcS8jZEpt2vhnu0movkvxkfHTqNNuruAo8bUIGo9Nthm8kFCnWMiOE39j+FLIVDg3A6uoNlMktJq5KbzbZEAE36wdkdK46J4iE7RLqKXIaSY3sttoYMlttY9/TRHRs0cw+0KAxQDEG6ZRefVw0TMj7DMivTDZP8w= 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: The dmem cgroup allows to track any DMA memory allocation made by the userspace. Let's charge our allocations in videobuf2 to enable proper memory tracking. Signed-off-by: Maxime Ripard --- drivers/media/common/videobuf2/videobuf2-dma-contig.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c index a13ec569c82f6da2d977222b94af32e74c6c6c82..48384e18030812f4f89f1c225c38def2ac6aa3ca 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c @@ -8,10 +8,11 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation. */ +#include #include #include #include #include #include @@ -40,10 +41,14 @@ struct vb2_dc_buf { struct sg_table *sgt_base; /* DMABUF related */ struct dma_buf_attachment *db_attach; +#ifdef CONFIG_CGROUP_DMEM + struct dmem_cgroup_pool_state *cgroup_pool_state; +#endif + struct vb2_buffer *vb; bool non_coherent_mem; }; /*********************************************/ @@ -169,10 +174,14 @@ static void vb2_dc_put(void *buf_priv) struct vb2_dc_buf *buf = buf_priv; if (!refcount_dec_and_test(&buf->refcount)) return; +#ifdef CONFIG_CGROUP_DMEM + dmem_cgroup_uncharge(buf->cgroup_pool_state, buf->size); +#endif + if (buf->non_coherent_mem) { if (buf->vaddr) dma_vunmap_noncontiguous(buf->dev, buf->vaddr); dma_free_noncontiguous(buf->dev, buf->size, buf->dma_sgt, buf->dma_dir); @@ -230,10 +239,11 @@ static int vb2_dc_alloc_non_coherent(struct vb2_dc_buf *buf) static void *vb2_dc_alloc(struct vb2_buffer *vb, struct device *dev, unsigned long size) { + struct dmem_cgroup_pool_state *pool; struct vb2_dc_buf *buf; int ret; if (WARN_ON(!dev)) return ERR_PTR(-EINVAL); @@ -249,25 +259,34 @@ static void *vb2_dc_alloc(struct vb2_buffer *vb, buf->size = size; /* Prevent the device from being released while the buffer is used */ buf->dev = get_device(dev); + ret = dmem_cgroup_try_charge(dma_get_dmem_cgroup_region(dev), size, &pool, NULL); + if (ret) + return ret; + if (buf->non_coherent_mem) ret = vb2_dc_alloc_non_coherent(buf); else ret = vb2_dc_alloc_coherent(buf); if (ret) { dev_err(dev, "dma alloc of size %lu failed\n", size); + dmem_cgroup_uncharge(pool, size); kfree(buf); return ERR_PTR(-ENOMEM); } buf->handler.refcount = &buf->refcount; buf->handler.put = vb2_dc_put; buf->handler.arg = buf; +#ifdef CONFIG_CGROUP_DMEM + buf->cgroup_pool_state = pool; +#endif + refcount_set(&buf->refcount, 1); return buf; }