From patchwork Mon Mar 10 12:06:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 14009720 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 853F0C282DE for ; Mon, 10 Mar 2025 12:06:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D570E280015; Mon, 10 Mar 2025 08:06:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0D7E280009; Mon, 10 Mar 2025 08:06:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA8C2280015; Mon, 10 Mar 2025 08:06:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 75EF7280009 for ; Mon, 10 Mar 2025 08:06:48 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E1561140EFC for ; Mon, 10 Mar 2025 12:06:47 +0000 (UTC) X-FDA: 83205514896.12.C1D4E4C Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id 476EC40012 for ; Mon, 10 Mar 2025 12:06:41 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jYajrhN2; spf=pass (imf11.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=1741608402; 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=vtaL2J7N0oTbl1MHl5ArMcsI3B4im3wv7pnEmXWMF74=; b=t9CYwGig4mfqXbTNZwtBMw32D6u4QQA9V5MaNP7eaW5N8+XE3z/mwVARMtxcdZehRF4hVD EVR+0TnQ3ffqGNnfIt6sGD/yaD4iBt6o7fAwR6Xx6d0sd3VZnNrlJVFFNF7KxWJ1n0PWmK gBjKab6k1UgzRHPp16xRW2KRMV5vZiE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jYajrhN2; spf=pass (imf11.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=1741608402; a=rsa-sha256; cv=none; b=Xlu+yi8VemjoNy9EPe1ad49DVe+oor29yJMOEC3CPXCfUeikA6WRnDeWJK4+UYLO4ZNSOW VeE6hcbWCOQEWGPeSkn7cks43RHW/Z1jFYrFyG3L6PhnbxJBpAqkWj9na37pV38gaGlqij qXhudwFUK6Ipklpj+YaSMJwyv9dLYDg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id B1B80A45AF0; Mon, 10 Mar 2025 12:01:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41403C4CEE5; Mon, 10 Mar 2025 12:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741608400; bh=2NdYbFXqIu49ZMyAqVsyt9MyeVTM3FWe9Y2AJpwIrVQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jYajrhN2FOK3TJWdSOSKnA5oMw9VDNtRvtBCins3Bmp0nNI7ucd/hvhBSHpBuqXnB DZxNW1+a2aHyxnK0A9Fhi801grDQHgLQbP9q6YSvN3TyjhiipsaoEXi4iVGNfQITLV z/f4jxpJmEAmk5mySweb9jjh8hKeTrCnr+SrE/WTTFy9N0QcT8yeoI77qcDcyCyy2E vRAFsOF5L80KPBdeA+eL3rszThdAdsNd0ShRgdkd4DQaIabptpC91PIrJzNzl6Pr0F DOm2EIZIbujiQev4qPzWpV6fKuoappVRYnSB2WD0v78u+e0i5g1HBvmQMQ9KMJUWuR zRSpjxAyz59eg== From: Maxime Ripard Date: Mon, 10 Mar 2025 13:06:14 +0100 Subject: [PATCH RFC 08/12] dma: Provide accessor to dmem region MIME-Version: 1.0 Message-Id: <20250310-dmem-cgroups-v1-8-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=2370; i=mripard@kernel.org; h=from:subject:message-id; bh=2NdYbFXqIu49ZMyAqVsyt9MyeVTM3FWe9Y2AJpwIrVQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOnnrm75peFiuvT/C+0FG88Ve/+4tJ7nMofXWwHp6uCju 0uFJq8621HKwiDGxSArpsgSI2y+JO7UrNedbHzzYOawMoEMYeDiFICJHOhgZPi5Vj9p5r1FnYXK 4WFVDrwO+/8m2DX4nU/0zHXaXl8cMIuR4VS1X+61qKWurquOzrrzfObMiw++peSIhMTvsi6Keiw jzAUA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 476EC40012 X-Stat-Signature: qowu9gjqphnct8i6hjqpstcdi9eu14qi X-Rspam-User: X-HE-Tag: 1741608401-227516 X-HE-Meta: U2FsdGVkX1+pGwOahLmMPGqx6e8piC8axOkyj8g+kyDsjKxCHVcAxGn0QNbXaNJi210SBMxfCvmEeGKODkR87aZbz4iLyc+rLJwI95RsF1KsBRSzOmlik7ayKHkhb+aR/lePDwAxYX0K9AWM2FH4I/PjpTc7CgqY3HYTrxzSYc6/2heXNdQH4YwHlb1859sv4eCiDWaJOwgdvA95ht5oNaZPo7FzuuccWM29tG0lHPufCMLTXRorZki/iFD5vdetfibycN2niBWan0LRqSUr5LwpMbRzwHLgfWRaBCioAe3yjiWCa2Oz9Xd2SWL0vQc+lgkuXjYVV21wK0fod7gQxIxTwnMIU7hh9RgRYBctJiSNCm5SdTZTc2K7qpPLW9mTxESMFExLVbnrZaLNtDLa+h4EZMykfGHhBbGRznQRlkb6awO7Z82wuNrQKCs3RxPly6hKzxwB9uX/ddBAJf5xg0Z0tbgbkybziNXPB4FoATjtjgZ06CAE77nLloWCqs0DgP0Xr3wtjv1iCvcuUK9maUVUVHNORnxwhbngqxowBE5Gu90x9imR3z1MYObZL0UZi1WBv8tXTOlk/MrWUkoec19L3QraloD4PdBSBxlIflfzbgnGr8VCbI8oFDxcM1d0HJnFDwjutBtaDtoN841//zGCOfC/B5E/DD6MXM+7GjKb631tm60kmgyMSw8niJh6mlrbE27TA80skeHFUPcdeOrLL00PdwjRuDTi2sgnu7SOAu1b2vySqCLuKn7T5k0lFxCprnJOiZN5F87fv/kelZaCvBy7plSELaBI/8NKy63OgF2wFLnuIvfsJp590b5ksV02yVP0+hYmeJyAJ/KIajuroeb7baYaC7A0jxgiqfKZAQRP/me+a5o/rdklq5Nr1Dkekb7kOfNjCxFMPVa95GWqgcmiMRUiRNn1ND7Zymsm4TWE1UJRPix/CYMsuojueC2xfHwUUrDG1IfYiph J8dRrnEb xHCg3gVAA4ChyL6q67rx3wxrMKshnFSffDAim49LUlpVDsS6PVow/dc7Y5mKJS06McZQ6YhW8IitQxZoaBrIN5NabDAOGdER+xJs+Bu5ft8P+1S/vAhVJNZqkqKhAcYk8e45JEemen6zfsfjIjg7BykUOXjYZLnEIQKet7CMSnQkaWwwXjTZ7qBZA03/NhC4u7JMfVyAmNucvr0wFOWq0DgjGwyFVm2/prgse2QSazbOzLzhoYSbsd99pRMZ+yKS9UWAktuyzkzlekDhJOibBARZJtzVRD5EnCv6V/REDxBEPOobb/CYuYcDtV/eBcFgh6ZzF 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: Consumers of the DMA API will have to know which DMA region their device allocate from in order for them to charge the memory allocation in the right one. Let's provide an accessor for that region. Signed-off-by: Maxime Ripard --- include/linux/dma-mapping.h | 11 +++++++++++ kernel/dma/mapping.c | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index b79925b1c4333ce25e66c57d8ac1dae5c7b7fe37..75f5ca1d11a6297720742cea1359c7f28c23d741 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -351,10 +351,21 @@ static inline bool dma_need_sync(struct device *dev, dma_addr_t dma_addr) { return false; } #endif /* !CONFIG_HAS_DMA || !CONFIG_DMA_NEED_SYNC */ +#if IS_ENABLED(CONFIG_HAS_DMA) && IS_ENABLED(CONFIG_CGROUP_DMEM) +struct dmem_cgroup_region * +dma_get_dmem_cgroup_region(struct device *dev); +#else +static inline struct dmem_cgroup_region * +dma_get_dmem_cgroup_region(struct device *dev) +{ + return NULL; +} +#endif + struct page *dma_alloc_pages(struct device *dev, size_t size, dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp); void dma_free_pages(struct device *dev, size_t size, struct page *page, dma_addr_t dma_handle, enum dma_data_direction dir); int dma_mmap_pages(struct device *dev, struct vm_area_struct *vma, diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 7bc3957512fd84e0bf3a89c210338be72457b5c9..e45d63700183acb03c779f969ae33803dcf5cf1b 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -608,10 +608,26 @@ static int __init dma_init_dmem_cgroup(void) default_dmem_cgroup_region = region; return 0; } core_initcall(dma_init_dmem_cgroup); + +struct dmem_cgroup_region * +dma_get_dmem_cgroup_region(struct device *dev) +{ + struct dmem_cgroup_region *region; + + region = dma_coherent_get_dmem_cgroup_region(dev); + if (region) + return region; + + if (dma_alloc_direct(dev, get_dma_ops(dev))) + return dma_direct_get_dmem_cgroup_region(dev); + + return default_dmem_cgroup_region; +} +EXPORT_SYMBOL(dma_get_dmem_cgroup_region); #endif void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag, unsigned long attrs) {