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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95BE7C28B30 for ; Mon, 10 Mar 2025 12:06:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5BC328000D; Mon, 10 Mar 2025 08:06:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0AB6280009; Mon, 10 Mar 2025 08:06:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAD6028000D; Mon, 10 Mar 2025 08:06:27 -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 9CB07280009 for ; Mon, 10 Mar 2025 08:06:27 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 321AC80ED0 for ; Mon, 10 Mar 2025 12:06:27 +0000 (UTC) X-FDA: 83205514014.29.95F10E3 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf14.hostedemail.com (Postfix) with ESMTP id 0D3B8100016 for ; Mon, 10 Mar 2025 12:06:22 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=c80JmNrl; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.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=1741608383; 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=okQp2kgUEqXkv1kykMsDL/WI8dfnie7Xh5dI+EPtu8o=; b=yzwAVQTFcF8HYGrx2w8YUk9nZhdtIGLh0BSEwJ+/s5WiQh3jZ2f3f8OpTHsJ9NDb+TO8na YBQHxkOFCcLkC90t57lA6IEyTDCwJnrO4bf3yE30VuojUpDuJ2JN6lZR+HhxbTxKfJfJum Xm37e7fZVVHuV4ms+UMIhTpvJPQCXOY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741608383; a=rsa-sha256; cv=none; b=vmq/LxIccIXOYnuv1cxj6DUS/n4duuf3J8uIEuNPQkQD6EK0WvKl0ttGcvlxGxqMsstGJ4 JDcniGhI1HSAiccvwyGSMYMBeziBwewXTdn1v7U8EVU5VEqOdd7wa6Bq/3u/dlVZDoX3yR GiS4pk5EpnH2ckVUaG1cIT26FhzbS+c= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=c80JmNrl; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.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 A8CD1A45A9B; Mon, 10 Mar 2025 12:00:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 298F9C4CEE5; Mon, 10 Mar 2025 12:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741608381; bh=puYqO1ssZSB45zTuCROfUk1S84tNyfEdp3lei2L6VhM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=c80JmNrlsGJu+gfhNVupnj0VWlns+4/pVC3RM86KgB8KiTDIDjyOrmWfyN7yFImN8 D6sLjtXhwC8KZTSCgFwwOxxJ3hNFK/jbduYa9iB4I8Q1aOwbZS04rJqv3dxTRkO2BQ dMT3I6EpHbyEVI0Fkp/ZotA5TSglVBTxOyiMnerpv4wvuscaQ8bxgw2WZiDIMI6KAB bDvqXJZI26oybrcgKHJNt+Tgvn6Yy2rVurTL0ZzCKW+hPmFZX6lh6XWrbyj2UyBxWW Q5TZ9vZ5QecLw/zLuCdRP1IiehVa/M0mFyHsQ0iWaoQkz+1O32/BHyZnOnVMuniHI8 Gvw70tpiJo1hw== From: Maxime Ripard Date: Mon, 10 Mar 2025 13:06:07 +0100 Subject: [PATCH RFC 01/12] cma: Register dmem region for each cma region MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250310-dmem-cgroups-v1-1-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=2737; i=mripard@kernel.org; h=from:subject:message-id; bh=puYqO1ssZSB45zTuCROfUk1S84tNyfEdp3lei2L6VhM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnnrm6QcLoZ+FMqrfl2ctqrL9OmXf+s871rqqPODINHk U8ldk/k6ChlYRDjYpAVU2SJETZfEndq1utONr55MHNYmUCGMHBxCsBErN8x/Hd9+sB2ccFetYu7 5+yPf/TV+aFc2Z/Zq+583HJu8v6FJzxmMzJsY3/16NtzE+Nb2dtWXe3Yb3b/v2PZ5QiZFqXqziO PK9/xAwA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Stat-Signature: e5paben43xy813hf4dyjk6sepgs8c4ep X-Rspamd-Server: rspam05 X-Rspam-User: X-Rspamd-Queue-Id: 0D3B8100016 X-HE-Tag: 1741608382-207160 X-HE-Meta: U2FsdGVkX19pCOg0RzyFpyewTxcHuSeIRvrc1snewOvtXEFaumH1QczFcDVzDY8JEXZ7pFKK3ASqerhaKCk4n5+FjsFPwmVQlsMZK+KBgfEJhjAqA6x/aWm1Xnos2LoWB/Elti389Oc6IjTUO2i1TzlYUZiotFo9gkILMvOi9Uq0f6uhPB+MlOV7NN2mCW64g0UkkP35w9BpqXdKDcBzlD6pV6b77PRMQ3tc9zE4SBnM5Lf9QbjZEFz/EG+o6IEy+xGfZChYmgyzMVpaNyaUcVXQw0tquML4uhzfHMKslJjHd4d7+p6QevvdfR22mJMRKF4wBhenzEDNBN5m7bOpH2bmp4XDLMbx05XYb+YYCIrnjk6Kc8rBAk67Zh0VQVVuXqSt/vGIeSI7MNEoNk62uHpXUpAZayNp3lbQbtL5+YLz4vcwUIj1cWWez+A4602f0cLILFf3NGf8FD1hyKVpi5W8QKqZRMLvO9ZJc5R7mQ75P8DJzsdeCheSneKkaHo6rYkzuwKxQ6f7GWu3btmx59meR/iDDfc/DNQj1T/FRQI2dCrUKMgCj7ZgT8HEyJd2eenF3T1cci0wl3WFHb7u81lJX4Pf0/ariehHONy9mA68xI7cyZeKk0kErTWUMh2o3pMMCiEX6LRvq3nmlVOMUxDraENZLsfHUk+344X4m69Tt3KUOGZbnhQ+ufolZYUFkZ8IDcEuJ2sDkiaILeyLJmACW6oV6MppCTsjVbKLhpVouR9jG9theTDd3U3NuYaWbOPUgeoHNZlTWvTcw4CWFxFxz73WJ6BrcH2Fn6/36h8I5llk9I8nxO9nphEpcrFLmQ55g10ULU0u7EMwdH4HgHnOIOB2m+GPr0x0aQ9qsZobqP8O8DOA0ze3NSXsREUHoURpydcxWK7ZdAjFuXvLle0AUyYBG9X+7BashvUAX4NfDaA6NAZ+XM49drp0ss04FCXGNi9AvUPtG4fsbqM 2Gw7xcDL kXUkfWTlw9wqA6PK1IOoZyeffpss2tyvDz3Ya9ybF4zfp70HNM/mHQ4LhGlX61BQ17jNpbM0vO0BFap6AX3gAD2rd52KtWsztM+fVXkZrfabXYAR2yjjRoWOb1bDLEKA67Wp4AAl/Jze2jw1vQoTyF2ol/0KWBt1moS9Ki/OiAkdEdvuiB3vkTHtoXXf4x1V9v1vr6mYaW0vB2HFf/L0nfnC0QXZKi4/I+nMzyirq90tY6hP9zkGtfiqUafGFsHOwVBPEbzauw/hqrBSsWtQ8NtC+52mZ/vouYD/3x5U88PqJDb1TkcxDbvXpDpJxPaCtc4vN5rc1nWbsYjhZqRi4sZ2DobzFjU4LRwhgxBQx7kZ0SDk= 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 the dmem cgroup has been merged, we need to create memory regions for each allocator devices might allocate DMA memory from. Since CMA is one of these allocators, we need to create such a region. CMA can deal with multiple regions though, so we'll need to create a dmem region per CMA region. Signed-off-by: Maxime Ripard --- mm/cma.c | 14 +++++++++++++- mm/cma.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mm/cma.c b/mm/cma.c index de5bc0c81fc232bf82cd7ef22f6097059ab605e2..41a9ae907dcf69a73e963830d2c5f589dfc44f22 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -21,10 +21,11 @@ #include #include #include #include #include +#include #include #include #include #include @@ -89,16 +90,25 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn, spin_unlock_irqrestore(&cma->lock, flags); } static void __init cma_activate_area(struct cma *cma) { + struct dmem_cgroup_region *region; unsigned long base_pfn = cma->base_pfn, pfn; struct zone *zone; + region = dmem_cgroup_register_region(cma_get_size(cma), "cma/%s", cma->name); + if (IS_ERR(region)) + goto out_error; + +#ifdef CONFIG_CGROUP_DMEM + cma->dmem_cgrp_region = region; +#endif + cma->bitmap = bitmap_zalloc(cma_bitmap_maxno(cma), GFP_KERNEL); if (!cma->bitmap) - goto out_error; + goto unreg_dmem; /* * alloc_contig_range() requires the pfn range specified to be in the * same zone. Simplify by forcing the entire CMA resv range to be in the * same zone. @@ -124,10 +134,12 @@ static void __init cma_activate_area(struct cma *cma) return; not_in_zone: bitmap_free(cma->bitmap); +unreg_dmem: + dmem_cgroup_unregister_region(region); out_error: /* Expose all pages to the buddy, they are useless for CMA. */ if (!cma->reserve_pages_on_error) { for (pfn = base_pfn; pfn < base_pfn + cma->count; pfn++) free_reserved_page(pfn_to_page(pfn)); diff --git a/mm/cma.h b/mm/cma.h index 8485ef893e99d8da5ee41eb03194b5b00ff088ba..e05d3eb7c173f3fe75ad7808968925c77d190c80 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -29,10 +29,13 @@ struct cma { atomic64_t nr_pages_failed; /* the number of CMA page released */ atomic64_t nr_pages_released; /* kobject requires dynamic object */ struct cma_kobject *cma_kobj; +#endif +#ifdef CONFIG_CGROUP_DMEM + struct dmem_cgroup_region *dmem_cgrp_region; #endif bool reserve_pages_on_error; }; extern struct cma cma_areas[MAX_CMA_AREAS]; -- 2.48.1