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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6A9DC7EE29 for ; Fri, 9 Jun 2023 13:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5hc5PB4mNeRPNraKmx7kbwuvrP/bmimb6iC/2sA8TEM=; b=o/ZhPZFLmGIEvb lXhKDb3M/qWUQewiMLdjsyq2nl9SUJvFmU5AE9QydnYpuVofbPSfO6qMaGNFgTaR24vX9gZ7zdD+z IR+UdbQ9EdqQNCof+Dl50PGRW5yQd0a4ihAhqY41pjnvZt/BGT21y1SWwoOWcBklUdM2YggkEFDEM zXBXzZCA+MpG8nLoBQ2EcXZHN0NrbJuTyKEEfXOPzPSTKmwDWbCnRHoAmfauSGU/I5zEsSmy8KFVT x4oiizLJbygwA8g/8Ouz+wAt9Z4EnPnCWxd6ybofHzaKSgjB549XH2PllAyS+nvj402F+8UsxcaIZ 7ixo3f9KUFPTiR7mLUWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7cPU-00D9oX-3A; Fri, 09 Jun 2023 13:44:12 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q7cPR-00D9np-25 for linux-arm-kernel@lists.infradead.org; Fri, 09 Jun 2023 13:44:11 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id BA52C60EB6; Fri, 9 Jun 2023 13:44:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DE1FC433D2; Fri, 9 Jun 2023 13:44:04 +0000 (UTC) Date: Fri, 9 Jun 2023 14:44:01 +0100 From: Catalin Marinas To: Vlastimil Babka Cc: Linus Torvalds , Christoph Hellwig , Robin Murphy , Arnd Bergmann , Greg Kroah-Hartman , 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" , Jonathan Cameron , linux-mm@kvack.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v6 01/17] mm/slab: Decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN Message-ID: References: <20230531154836.1366225-1-catalin.marinas@arm.com> <20230531154836.1366225-2-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230609_064409_726092_C1A6652A X-CRM114-Status: GOOD ( 22.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 09, 2023 at 02:32:57PM +0200, Vlastimil Babka wrote: > On 5/31/23 17:48, Catalin Marinas wrote: > > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > > index 0ee20b764000..3288a1339271 100644 > > --- a/include/linux/dma-mapping.h > > +++ b/include/linux/dma-mapping.h > > @@ -545,7 +545,7 @@ static inline int dma_set_min_align_mask(struct device *dev, > > > > static inline int dma_get_cache_alignment(void) > > { > > -#ifdef ARCH_DMA_MINALIGN > > +#ifdef ARCH_HAS_DMA_MINALIGN > > return ARCH_DMA_MINALIGN; > > #endif > > return 1; > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index 6b3e155b70bf..50dcf9cfbf62 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -235,12 +235,20 @@ void kmem_dump_obj(void *object); > > * alignment larger than the alignment of a 64-bit integer. > > * Setting ARCH_DMA_MINALIGN in arch headers allows that. > > */ > > -#if defined(ARCH_DMA_MINALIGN) && ARCH_DMA_MINALIGN > 8 > > +#ifdef ARCH_DMA_MINALIGN > > +#define ARCH_HAS_DMA_MINALIGN > > +#if ARCH_DMA_MINALIGN > 8 && !defined(ARCH_KMALLOC_MINALIGN) > > #define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN > > -#define KMALLOC_MIN_SIZE ARCH_DMA_MINALIGN > > -#define KMALLOC_SHIFT_LOW ilog2(ARCH_DMA_MINALIGN) > > +#endif > > #else > > +#define ARCH_DMA_MINALIGN __alignof__(unsigned long long) > > +#endif > > It seems weird to make slab.h responsible for this part, especially for > #define ARCH_HAS_DMA_MINALIGN, which dma-mapping.h consumes. Maybe it would > be difficult to do differently due to some dependency hell, but minimally I > don't see dma-mapping.h including slab.h so the result is > include-order-dependent? Maybe it's included transitively, but then it's > fragile and would be better to do explicitly? True, there's a risk that it doesn't get included with some future header refactoring. What about moving ARCH_DMA_MINALIGN to linux/cache.h? Alternatively, I could create a new linux/dma-minalign.h file but I feel since this is about caches, having it in cache.h makes more sense. asm/cache.h is also where most archs define the constant (apart from mips, sh, microblaze). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel