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 4FBF9C77B7F for ; Fri, 19 May 2023 15:49:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2975900004; Fri, 19 May 2023 11:49:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD7B0900003; Fri, 19 May 2023 11:49:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9F6F900004; Fri, 19 May 2023 11:49:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BD1A4900003 for ; Fri, 19 May 2023 11:49:13 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8C7C4120AEB for ; Fri, 19 May 2023 15:49:13 +0000 (UTC) X-FDA: 80807438586.27.05AB594 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id B029140007 for ; Fri, 19 May 2023 15:49:11 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf27.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=1684511351; 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=/EPtlSexHreaxWpeqzdR4iEbWsq2TKfqkEgt8dtxO/U=; b=laU3fxZScw6rZvyHqgtpN7Pv6W3CoWanur05jbO7CFG1KhzFMp0qERDeplsh5VruHP/yCM cEXkwk2dremYdNuI0VkEi0REvC55/RTu5sntSqiXhuCRdJcfEPmhl2XXwbErb8vtk6bwKU jmX0bFY52tp+QcpHmAbcZbAfNpZOto8= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf27.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=1684511351; a=rsa-sha256; cv=none; b=1KKUQ+oakXKGzRAVabxw90ZajjIH/mWEmGgvvwwJhQRBAQlvktQo0g27a8cbfU+sK6DCYm TUk6vmgcX2IEBFZhZQPG0W9LnJx6Q37ckpQ+EHNbdNr4S2mc7qIibotooLb9XC84EJUc4s XFslIvdV4oz5NjLhSX7zrxbHsZjc/Z8= 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 BCFA061138; Fri, 19 May 2023 15:49:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4E51C433D2; Fri, 19 May 2023 15:49:06 +0000 (UTC) Date: Fri, 19 May 2023 16:49:04 +0100 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: Re: [PATCH v4 01/15] mm/slab: Decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN Message-ID: References: <20230518173403.1150549-1-catalin.marinas@arm.com> <20230518173403.1150549-2-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230518173403.1150549-2-catalin.marinas@arm.com> X-Rspamd-Queue-Id: B029140007 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ipdnxjbwp7z7mq1o7byxdp1j5dz3a5j9 X-HE-Tag: 1684511351-87403 X-HE-Meta: U2FsdGVkX19Q7H1rqV5S3yZGIHCp3X68Gpu3BZJHx1jv8iCFzsqqvKP6wGKPwmuZ2QazOW9qtC6FsXPM98abr0LXoP1TxIcRESLnlhlXalmZoiIaq4lEMWNOaBzSTM7314MbHeb12Lw26KTt+2orZ9YyfILrbb+nNLJFNSTyxYXB6aL4101LDjbAqqh5LSAsYd6080p9PhwNo0ikR5xJM1JGnho3IhsDDF10lgmCRX2MKWxu1ncASPxtFYHVFYpPrEdvA+1z1ISL8LaSDzbumtx9yGsOzdv4wMgTcRmI6ra/xomfZtZSUJIez8fyjvu3xsMgM7VKCY1bNHBpt3d2VwFQdDabkMVK6wKqDAHugcR+EdmUVUuHtitfFLv9/d4WvU/Gx1exI+u2z1Em+k4dSLAJPkRuW7P/abPZz5EUqCmIBZUkLxQMuISQn6AwBPPdVywbgSO/bZI0Gs3HxHtc51Kl3jQum586BBAkZqsK/NDw0IBCVHewecMpbZpXkEnDHefjSF8+eO11bYzHAGJrGnVe3GuarRDJFyhZKzgruSn/mv1k3wfWEflfPu4ZOOT9YMrTtnkBFNruBYXUzuEJhwcoMXiyWY3gH0KWb7wC6OMaQGq8QFAcDlVSBsLUMz6huQ6udVegkKO2qcSCDBqhjwEXI88dXVW28wIi/MkDtZghrrETLhmaLjF+Y32ryzJvtFcHmRxdIJBI7+hO+2xj5GAsDF47i/I3bWbdveusJ2Ph/l9GAORZ2bLsed2BwRfs43DJbZ3wVPWDbXlSUH9NfqTS0BEV4KbImNsJTyWw9dgINWnwpq32i8KjdunoPNQ2euoyHaAO2jmanpi2dO8eXCfeDDbzGvniLSp3WTLrapyqyhwyl0YOAGXi2IM6+yraUWvtv612rt4prhU91WGEt0YYafHXLRqtGWZCI058offJs+zotXoElJX6pC+nexeinezuQCAVjLkmDUrAHAB mSg4OhDD iRVKd8Rq1YSYzNKr2kdi3fJg2vXRoKzFeA3/HnlYofHjnRJELsiCfH9/v2Ma8vco3P0oRlPh0fbFecEgeSP39LYcwVTI5E+C7/DZUD1KwBsspDipyeCnbtJZvR1227UZV7r4MEzxZO0bBcK1FVgIoCM7j3rQxgmn8kNMJws+P2uIk/0l/ZEmBiHvYAo7n48VsPcopYtOxRFvGGDhM0PvCDW773upKVsZAOY1O/NNQZQsySJtE46zQf/HSR+BcPR/ePOv2caMvSuCki7LJGdz66AgyrUj/QBRzrEYhCj5poQ3cHnuoIlNQlorew8LYmfxfm0oHDestJ63CFowOya8JXDOoleakDCraHoU7cMhy1WC1rV9wsvMc0GQqjHw2wgsHLNqZraMxvZ2B6aHxQcuJKzTSCDmEXwGSddLuH1zX7RfVsCwBEy6ZiFizPIimESR20nAjxhfYtLf1r/Pw0HUere1FxA== 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 Thu, May 18, 2023 at 06:33:49PM +0100, Catalin Marinas wrote: > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 6b3e155b70bf..3f76e7c53ada 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -235,14 +235,24 @@ 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 > + > +#ifndef ARCH_KMALLOC_MINALIGN > #define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long) > #endif > > +#if ARCH_KMALLOC_MINALIGN > 8 > +#define KMALLOC_MIN_SIZE ARCH_KMALLOC_MINALIGN > +#define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE) > +#endif And another fixup here (reported by the test robot; I pushed the fixups to the git branch): diff --git a/include/linux/slab.h b/include/linux/slab.h index 3f76e7c53ada..50dcf9cfbf62 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -246,9 +246,7 @@ void kmem_dump_obj(void *object); #ifndef ARCH_KMALLOC_MINALIGN #define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long) -#endif - -#if ARCH_KMALLOC_MINALIGN > 8 +#elif ARCH_KMALLOC_MINALIGN > 8 #define KMALLOC_MIN_SIZE ARCH_KMALLOC_MINALIGN #define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE) #endif -- Catalin