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 1F1E2C7EE29 for ; Fri, 9 Jun 2023 13:44:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23DA98E0003; Fri, 9 Jun 2023 09:44:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EC0E8E0002; Fri, 9 Jun 2023 09:44:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DBE18E0003; Fri, 9 Jun 2023 09:44:12 -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 F08C38E0002 for ; Fri, 9 Jun 2023 09:44:11 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B5221160275 for ; Fri, 9 Jun 2023 13:44:11 +0000 (UTC) X-FDA: 80883328302.10.58B9E72 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id D5DF24001B for ; Fri, 9 Jun 2023 13:44:09 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf17.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686318250; 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: in-reply-to:in-reply-to:references:references; bh=rFlvZfA8/0P8EySTejg2T/Rjzr2bQc+k0GXUDDPYqTQ=; b=nHRxHvtvJQ5dMeYw12wrzGp/N7aH3DkbW/zgVadLHInEosqAPYztfYNJsvA7axu2KBwHWn W45m9T6b3sNFjxcbbxaEquGEB78zHnA525HVum/9OrYSZ/yP1PptJRZY1HlrtqSPYH3yTT Dhq57syrJXNVvl07BU+0zEKdBmu4Tsg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf17.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686318250; a=rsa-sha256; cv=none; b=j4MGrQoHgsr5KVw2oucsQ4kxGj0+XeB6B2rVBnMMj2dPnc6yZUUPkejvWRjVZ+W2Sm2iQh Z3X/4uN9N8sGZoOVH+KL6sCnOAI2BYV5p7m8RTOsu+Yp81iFb5hJ8+EJsdfuofC0wsLzpW 0XM1wYcLsmNU0bWuRpnzTqmxdCmV2Q8= 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: D5DF24001B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: riu6cm6164nxcdahkfxceuxfqckadxxt X-HE-Tag: 1686318249-301907 X-HE-Meta: U2FsdGVkX1/dPBWnkeEeOhQgW49t+j9ErsRKRfeqpwn6TgEHSqVyVQp8d1INtTuqYha/qqdHY5n5TU0riifLmaACUfMW6QEZD0V6Ee20A4iawQxBj/lHAY2ETdXonK4S3jCkgnD752T2lQ48a0EkBhwWCCNfeFV4cXwMYb8pjuKuL6wO6Ny18aDL6nMS/MNef27elt87I969BNzX4RWxlcMruln5BPu3KgHr42J5KYVfMV0X9I+F36gKV8xrANgt1XN49Mdv0LXzyo4kJfvuLfRpAOXsDx+wDJXVKoCZ4NpF4srEx4tGPOmy0QO7NFStEzpGPR9mRPinU2rr/kUnIoko89cphnFv/4Vc8wqsu4OTSjMq6bMw4TDwUvPew0pmY822ogBs/2iJtpraa5j1zs8SiVTCpuvy/APL4y+2rWh+ymJYnnAbBBC1N+oX2RS5ecfJvNhvvefz3rn5xYotfyQ9yAQWjJYFc3aRlb8Na0mJVQP+TJVH4fNx3ro16E36NT5TliBHc/KV4YZjrAAHuzNudrvXQVnGfapnUlPB7keTyhzV8LTY0/oko6ELYDs3rMGSO3shbVoiBvb/+ZKMurm3SJLfFgPEKJFIp85zatEwpDEq/1MIliBKKvLwIZHhUjrEZXU63WKJ1qX8HHUirpK/p/mq9RkR+m6Lmh2tEgl2aOOeoNTqzqN9E+jIpyVyjXKUetE27vXv8owZGVG9Jiolnk3thzyL/+9+z1G7aqlo4F8jVIYEMXqTGRz3X8luAz4Liin7VI1sZytODnJc0dDpK6tCiEa4bHODUsMEsQIkSPmqonxQNSPix8M/9qW5rLl/swdJPfzIym91JB+LM6yQyAqmvnN7vUhW0fvqKwniqQJGoLRIvPCZf4agFKL2pfHJC7NLLvZ2A3CblhH6N65XmtwSRA6RIvu8OjnGgLpluxWuNoIiY8TkeClEv9hvmxJtGO1vDD0KAxz5k2t 6oDEgy/f qLDEfNpUM3G3t3Xp1eYEQ/6ssXJdI0RxRnUem6W+VWnCG7ZIn9yX6I2ZmgcMvknV1tYcCl15Wb3paDeXSrQusDEKvT1v/uQYjJBsYvS5eIGMi0jr4CO0V+a6CITXvhoHBxOmmNOGj5uJEddQKQJt7DXk4cvO5svhJpmQEvgAA7Rc3q3N70ZYCwQuSMu+NwtV56NMg02MnV2QSFBGDq1835U8EmvF9kHvHJgRw4x8AdP5WlBnaCFxcFvin0RDIiY6v4UPMSAdKLqu6SiVN09edRKRJRds/xqdFp7XF1jKQYF0NFjipjGo5cDyXfgYSY6Q+mzdMqT6F1kVIMAMpYZIZtvCiWIf3MyWf98IMrOV9Yfuv5aRTVB8FJ1qvKXaZElF9ZXPEXDEplsjR9KfMkeZHH3P1a0Q7QC89gL5gIpPLnnhdajgz7KqGi6WAfqmvOpG5GiE4L0yFCf5kROlmwqNUWtTfBg== 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: 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