From patchwork Sun Nov 6 22:01:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13033624 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 29754C4332F for ; Sun, 6 Nov 2022 22:02:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B77918E0007; Sun, 6 Nov 2022 17:02:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B26F58E0001; Sun, 6 Nov 2022 17:02:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EF668E0007; Sun, 6 Nov 2022 17:02:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 925D98E0001 for ; Sun, 6 Nov 2022 17:02:09 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 57B00AAABF for ; Sun, 6 Nov 2022 22:02:09 +0000 (UTC) X-FDA: 80104391178.22.54169BC Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf30.hostedemail.com (Postfix) with ESMTP id CB81C80006 for ; Sun, 6 Nov 2022 22:02:08 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5C4DCB80D3D; Sun, 6 Nov 2022 22:02:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D987C4314A; Sun, 6 Nov 2022 22:02:02 +0000 (UTC) From: Catalin Marinas To: Linus Torvalds , Arnd Bergmann , Christoph Hellwig , Greg Kroah-Hartman Cc: Will Deacon , Marc Zyngier , Andrew Morton , Herbert Xu , Ard Biesheuvel , Isaac Manjarres , Saravana Kannan , Alasdair Kergon , Daniel Vetter , Joerg Roedel , Mark Brown , Mike Snitzer , "Rafael J. Wysocki" , Robin Murphy , linux-mm@kvack.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 04/13] mm/slab: Allow kmalloc() minimum alignment fallback to dma_get_cache_alignment() Date: Sun, 6 Nov 2022 22:01:34 +0000 Message-Id: <20221106220143.2129263-5-catalin.marinas@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221106220143.2129263-1-catalin.marinas@arm.com> References: <20221106220143.2129263-1-catalin.marinas@arm.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667772129; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hb/JMHhuvRMmjdAuUa9IyIxKSZUdxwl7w/JwapC56BM=; b=1Jq5gFA0cNeZld9aeRGAbwg5clgMhcpgJ/02MUt3I+ljTFjdiL207T+ie5n75HTYuar1Hx kpvGXYFWZfaMupuBBBenxjaWlyUrc2vg8zf6a17vxkVxFtKOaGtJiFSE3Wq1B3BxElF29o dqbDtxOPShZsmv9I58GjVZ8kGng5yzw= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of cmarinas@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667772129; a=rsa-sha256; cv=none; b=Fve3BrztlSKkZcEv9XnuQKcRZHQrNUcYBmKfOyBXtFM3DwzP4NlhACeTbhDkZrOqf8KyPC tElvH96TSLbaB+nDKroAspV7cXyasE5A7XCfeNwBXVvDMmrW/w/ZIWBn+QUereDhhvNdJl 7ky2uzT26FBrBdLQVF+KeeKqee4lxXI= Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of cmarinas@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: CB81C80006 X-Stat-Signature: 76qx4ns7ebqss39q5c8wopgcx6j31ioq X-HE-Tag: 1667772128-500277 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: For architecture with ARCH_DMA_MINALIGN larger than ARCH_KMALLOC_MINALIGN, if no default swiotlb buffer is available, fall back to a kmalloc() minimum alignment which is safe for DMA. Signed-off-by: Catalin Marinas Cc: Andrew Morton --- I'm not particularly fond of the slab_common.c code probing the default swiotlb. In one incarnation I had a __weak arch_kmalloc_minalign() overridden by the arch code but decided there wasn't anything arm64 specific in there. mm/slab.c | 6 +----- mm/slab.h | 2 ++ mm/slab_common.c | 40 +++++++++++++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 59c8e28f7b6a..6e31eb027ef6 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1241,11 +1241,7 @@ void __init kmem_cache_init(void) * Initialize the caches that provide memory for the kmem_cache_node * structures first. Without this, further allocations will bug. */ - kmalloc_caches[KMALLOC_NORMAL][INDEX_NODE] = create_kmalloc_cache( - kmalloc_info[INDEX_NODE].name[KMALLOC_NORMAL], - kmalloc_info[INDEX_NODE].size, - ARCH_KMALLOC_FLAGS, 0, - kmalloc_info[INDEX_NODE].size); + new_kmalloc_cache(INDEX_NODE, KMALLOC_NORMAL, ARCH_KMALLOC_FLAGS); slab_state = PARTIAL_NODE; setup_kmalloc_cache_index_table(); diff --git a/mm/slab.h b/mm/slab.h index 0202a8c2f0d2..d0460e0f6760 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -288,6 +288,8 @@ int __kmem_cache_create(struct kmem_cache *, slab_flags_t flags); struct kmem_cache *create_kmalloc_cache(const char *name, unsigned int size, slab_flags_t flags, unsigned int useroffset, unsigned int usersize); +void __init new_kmalloc_cache(int idx, enum kmalloc_cache_type type, + slab_flags_t flags); extern void create_boot_cache(struct kmem_cache *, const char *name, unsigned int size, slab_flags_t flags, unsigned int useroffset, unsigned int usersize); diff --git a/mm/slab_common.c b/mm/slab_common.c index 33b1886b06eb..b62f27c2dda7 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include #include @@ -852,9 +854,30 @@ void __init setup_kmalloc_cache_index_table(void) } } -static void __init +static unsigned int __kmalloc_minalign(void) +{ + int cache_align = dma_get_cache_alignment(); + + /* + * If CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC is not enabled, + * ARCH_KMALLOC_MINALIGN matches ARCH_DMA_MINALIGN. + */ + if (!IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) || + cache_align < ARCH_KMALLOC_MINALIGN || io_tlb_default_mem.nslabs) + return ARCH_KMALLOC_MINALIGN; + + pr_info_once("No default DMA bounce buffer, increasing the kmalloc() minimum alignment to %d\n", + cache_align); + return cache_align; +} + +void __init new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) { + unsigned int minalign = __kmalloc_minalign(); + unsigned int aligned_size = kmalloc_info[idx].size; + int aligned_idx = idx; + if (type == KMALLOC_RECLAIM) { flags |= SLAB_RECLAIM_ACCOUNT; } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) { @@ -867,10 +890,17 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) flags |= SLAB_CACHE_DMA; } - kmalloc_caches[type][idx] = create_kmalloc_cache( - kmalloc_info[idx].name[type], - kmalloc_info[idx].size, flags, 0, - kmalloc_info[idx].size); + if (minalign > ARCH_KMALLOC_MINALIGN) { + aligned_size = ALIGN(aligned_size, minalign); + aligned_idx = __kmalloc_index(aligned_size, false); + } + + if (!kmalloc_caches[type][aligned_idx]) + kmalloc_caches[type][aligned_idx] = create_kmalloc_cache( + kmalloc_info[aligned_idx].name[type], + aligned_size, flags, 0, aligned_size); + if (idx != aligned_idx) + kmalloc_caches[type][idx] = kmalloc_caches[type][aligned_idx]; /* * If CONFIG_MEMCG_KMEM is enabled, disable cache merging for