From patchwork Mon Mar 10 12:06:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 14009719 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 46263C28B2E for ; Mon, 10 Mar 2025 12:06:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 94AEF280014; Mon, 10 Mar 2025 08:06:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FD1B280009; Mon, 10 Mar 2025 08:06:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79CA3280014; Mon, 10 Mar 2025 08:06:46 -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 59F45280009 for ; Mon, 10 Mar 2025 08:06:46 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3199080EC9 for ; Mon, 10 Mar 2025 12:06:46 +0000 (UTC) X-FDA: 83205514812.28.D621B19 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf22.hostedemail.com (Postfix) with ESMTP id 60FC2C000A for ; Mon, 10 Mar 2025 12:06:44 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=c4uygRPz; spf=pass (imf22.hostedemail.com: domain of mripard@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=mripard@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741608404; 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=MAiWuLTy2HhCzLxQh95sk8oN4LVAaauwszog2HLs0oc=; b=gYuaR91KTwmXhjXJ5OhA104FsBloh5ITazXy5dMi8LlstEFWcrXbNCB1eQJrRmZKYEdCuB 20ACGeoPBHRSqiGcR8o+af2c2g1mRajxbrIo9QiAHyobS+M0jPZzmlEYDLSrByTbPtoDrT nVjFceldnkKPTX0hKnzaKhEd7bwwmIw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=c4uygRPz; spf=pass (imf22.hostedemail.com: domain of mripard@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=mripard@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741608404; a=rsa-sha256; cv=none; b=IIw6SubLe0ui8aaYHLObpAMCvqyW7PyKyE4ePG9VyaXf0KQfZKTSOi6Bc3BK4R5vVP4sbY WIfPo6nFC1+7X8CrMj9qv2M/kUa1krtJ811bLMS5BLopOlaA+WD0EDhNAfpTtxs+Gkhfjf 6pfGw2S5Otbib9BrluD3JfTYK5oWpYE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 7F3D6A458B2; Mon, 10 Mar 2025 12:01:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3DF7C4CEED; Mon, 10 Mar 2025 12:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741608403; bh=bMCIvn+7jf6RMiYjEqkNRC/cCXSSxQerkW6ogfdek4M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=c4uygRPz6bHzOv7JaNd0BKTZdiJEeNNcAfN7JlO1sp451josGYGwOPeVSWBgd+N12 QOw5/LBuUY8o2XXn8mk3aPWeFcHLDfF4dARIrSn4peA4LCdlIglwRYGe80L9TOm5Nh fvWbAvaafZU7hsRYue9WrYK6wXtSF1uVl//tLeDIrXiOtET1ST1idAgk0sOcpN66Qo XMSEACHHxWrEhXDsq2mFwDakCRpfhdwUZuF+V9Ym0SbSNxk+GszSTQGzQutE5uF9Dj 6rEwFHnGHfJlI3b/8CaV0AU7g2mk6SMB2CX3lBmI1fBYXzaIJa5H7iLWESsMAH0nBP iQ7NEvKYLtyYw== From: Maxime Ripard Date: Mon, 10 Mar 2025 13:06:15 +0100 Subject: [PATCH RFC 09/12] dma-buf: Clear cgroup accounting on release MIME-Version: 1.0 Message-Id: <20250310-dmem-cgroups-v1-9-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=1990; i=mripard@kernel.org; h=from:subject:message-id; bh=bMCIvn+7jf6RMiYjEqkNRC/cCXSSxQerkW6ogfdek4M=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnnrm5t/yVnmCnbdWIBb4tvabPfyl9udfO64jiO/quN4 GNJyz/dUcrCIMbFICumyBIjbL4k7tSs151sfPNg5rAygQxh4OIUgInsOsLIcPDV65S2uVZWc348 +bw4wjdK8HDKtbceyZUZ2688natTF8zI8LhqgYHRIbd71bsl7t4JEb5RWWed883UeuOfx6vX9BW 8ZwUA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Rspam-User: X-Rspamd-Queue-Id: 60FC2C000A X-Stat-Signature: r9i1dsp8mugqa69dn4qr6s3rc9sxpopb X-Rspamd-Server: rspam09 X-HE-Tag: 1741608404-394550 X-HE-Meta: U2FsdGVkX197Qyq9fhGB0+Weh/IS8Gb/ZzVNKG0u66wMmklU+9einMX5xAt6JUjlZvTXEtCVfki+WGvV/A6VaRL80lAAt8MxXRYOCVBn+bNgP4zOrMrT4EpKQxb/7/L6S99MQRQv58WxLNAOAkpFvqhohcZ0uUyghqCyjoPR2h5KdS551sru/dGBlkT1/EbDenx57vCPC9P3st1nfDuzv9rhMD8p3WWyQ2FWgY1AjkvwD933qI2m6voQ1u6DUhESQwrn9LFMV4xBfcWz5cZJ8636LUOK1tfjJK3CncmJGJ9gcrMYnrDqJajrRs4V9obAd2tqZgG/H+L1ixufFin2Ca6uaxpvNeKeCuDDbyop2y8M47JOccwpX1J+sgmfNqyYPpbIK5ao6wHOt4awnqRvhFbad6mQ7yjWY4K3SZOq0o4d8jhYJMy6oCd8Nkz/G7ck4gymju4d0DkfXmFYEpp+kiwSkLCoqT6G7iBOnbF9Tj7sOq0itaMFeyBjQlnc9A5RvsxYW+NQ5LYLLmKQAXqMRSKuTZ73i2cZmDmZ7Zu/nbiyhes2e8/NXU6JrvLVFZFPZMu2SFGGyq37aWtd6TcqYaGFFkOkEH4v7WsNkAaUqofbpXyg8bonwnwzfpcUpGx886QDKj2t9D/ZqKjzdqqZL86IZVwl3mF2Nf6tU32xSKAo2mcY0Mf3Xrva0jAVN1E+jtV5UrtiPB+PGhKfnMgnyHc5wKX8l5SIHVl0WQoswx/FhmYyfP5O7m2OPRTUOEb2PtMvJkN/KnNRiYb1TYY/IADur19cJwHYMxrXk2D75DiFXbvGGbXgQL5Eg2kEzAiDFsJBSAjbB3AGOAIq2036kB/tXQDjAXObQMJBGl89OY6n2PqiDprn1JWVz9CtR57XY+0MdiKbNfY1clgqrOKAW2q/tneXptIjxX1aIH1+KoWSYplkTxtEj+GY0i7Tlq6u2XkEs7OXatwQ6wKSSy9 BAtmxu71 pAbu0CJIAPmyIu4mHA77ffF8XWnWES+zPWqihpAWg/9tdOEucfW3mCOT0OUhdN/W0MjOcuJc+nI0gOdRgjtvjJB5830UnH1i2yFRfoeI1PaqDMJhnw4NHPbgjzoR+OvQDwggCiUNdzRKvH7WSJatSjltV5G617U/3gUgb45rZSB3DAqzr8Qr9pra9bn0VQiwze9n2//vuKmAD20VdZtQOzKy9Ngev5La2OhIKbv3aXr8LQZASYOzHaP0FVDAQnhW4++AkuOQeR/3Zh2vW7cw2xPdhVEYcCPMDbJT3wDdadRxl/S7i+Ar8W/za4GqyPtaa8xqrvi2h5UtLDWWDq/a+lfyZsEy4hO5a36ZIqluP3VL2HHQ= 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: In order to clean thing up when dma-heaps will allocate and register buffers in the dev cgroup, let's uncharge a released buffer for any (optional) cgroup controller. Signed-off-by: Maxime Ripard --- drivers/dma-buf/dma-buf.c | 7 +++++++ include/linux/dma-buf.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 5baa83b855156516a0a766bee0789b122473efb3..a95eef17f193454b018dc8177ddfd434d7b64473 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -11,10 +11,11 @@ * refining of this idea. */ #include #include +#include #include #include #include #include #include @@ -97,10 +98,16 @@ static void dma_buf_release(struct dentry *dentry) * * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active); dma_buf_stats_teardown(dmabuf); + +#ifdef CONFIG_CGROUP_DMEM + if (dmabuf->cgroup_pool) + dmem_cgroup_uncharge(dmabuf->cgroup_pool, dmabuf->size); +#endif + dmabuf->ops->release(dmabuf); if (dmabuf->resv == (struct dma_resv *)&dmabuf[1]) dma_resv_fini(dmabuf->resv); diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 36216d28d8bdc01a9c9c47e27c392413f7f6c5fb..111ca5a738ae0a816ba1551313dfb0a958720b6c 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -437,10 +437,15 @@ struct dma_buf { struct dma_fence_cb cb; wait_queue_head_t *poll; __poll_t active; } cb_in, cb_out; + +#ifdef CONFIG_CGROUP_DMEM + struct dmem_cgroup_pool_state *cgroup_pool; +#endif + #ifdef CONFIG_DMABUF_SYSFS_STATS /** * @sysfs_entry: * * For exposing information about this buffer in sysfs. See also