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 ABE13C433EF for ; Mon, 11 Apr 2022 10:37:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E52706B0072; Mon, 11 Apr 2022 06:37:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E028B6B0073; Mon, 11 Apr 2022 06:37:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA28A6B0074; Mon, 11 Apr 2022 06:37:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id B6FEB6B0072 for ; Mon, 11 Apr 2022 06:37:11 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 87BBC81972 for ; Mon, 11 Apr 2022 10:37:11 +0000 (UTC) X-FDA: 79344245862.03.5D430F2 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf29.hostedemail.com (Postfix) with ESMTP id 068B8120007 for ; Mon, 11 Apr 2022 10:37:10 +0000 (UTC) Received: by mail-pj1-f44.google.com with SMTP id e8-20020a17090a118800b001cb13402ea2so11889336pja.0 for ; Mon, 11 Apr 2022 03:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=sZ5r1Ulc6PwR+ueUKNqo2D8Zab24hQBuwaMfaw8Ofy0=; b=fc64tTXnjyhGNHfV0GQvoJYJRlkNoJju8a2bH+jOoLii9ffVQ8PzR/409RWEPd58II Ek2BaGkvbWWG3Dw/wkeS1D05l/BsPuJEzMzoSbPc8SJO7Aw883hKMKBzKisAlyJnTEzs UiG2jiyOxLVxmq+27F/+elTgNuy1YVxDl/EM8uAaMoMMhffcgfzUqnd4qFDkG0FXJcOm O2E7nImZ1DyCt9tIzxYaihygWUNomywo32J1THuGi+d5Oer13kkHMeVg2We6ou4FibWO yDmDW0KXvOduGY5DOEkV9WbHK55bBl6zTbAPFmZhQ1xEkKMRXjiT+oxWX6ckWIjAG+sr dAUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=sZ5r1Ulc6PwR+ueUKNqo2D8Zab24hQBuwaMfaw8Ofy0=; b=M5yLhWzlFhAnmg1gt5cHKVZGN6lXHOaOMMfzMntjjAmsKhU1zB7qqoFKPUPLJckzqL /5hMLilbmiXkiQ1w3tLMXeX7BfijBSe7Cc5b++MYBbPKz2GdV97bWx/Vy9pQgHcXamKa rm0FHqJU2FCZXBPvpGgvum79jub5YxEZoSM/rqZaK2N0jTpa1ynp7qsmAUwdhgr0uiVh 3LGXcBlpWV0hPIo+P1k3nGZKu0zoOoBU4C4IIc/Sim9CMxBJMjw5QsE8GloSIPlqoaKq VResXPahy/WmotAeCGnJvGCDPQWgW/Y5K5XOjhUz5DiW94Ub7+/rVw2WRM+OIfvRTM7t 0nZw== X-Gm-Message-State: AOAM5335+Kllvpf/w2Lcbza945oPfLZNy60APuyuB0YRa3o6S3YvI5XD K15KDQrEUyWqXoiRmp3mIwM= X-Google-Smtp-Source: ABdhPJzqE7fdczyeXzyQeDjOMudzBySH+60ePuOE2mP9NT+DcGJhwjaFeRriNyLNylES+uJmxSfCIw== X-Received: by 2002:a17:902:bd89:b0:156:8467:782b with SMTP id q9-20020a170902bd8900b001568467782bmr31684434pls.12.1649673429936; Mon, 11 Apr 2022 03:37:09 -0700 (PDT) Received: from hyeyoo ([114.29.24.243]) by smtp.gmail.com with ESMTPSA id x39-20020a056a0018a700b004fa7e6ceafesm35865007pfh.169.2022.04.11.03.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:37:08 -0700 (PDT) Date: Mon, 11 Apr 2022 19:37:01 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Catalin Marinas Cc: Will Deacon , Marc Zyngier , Arnd Bergmann , Greg Kroah-Hartman , Andrew Morton , Linus Torvalds , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 01/10] mm/slab: Decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN Message-ID: References: <20220405135758.774016-1-catalin.marinas@arm.com> <20220405135758.774016-2-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220405135758.774016-2-catalin.marinas@arm.com> X-Stat-Signature: ujg9hqqa89ozj51w8mqga1zuysyx9iiz Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=fc64tTXn; spf=pass (imf29.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 068B8120007 X-HE-Tag: 1649673430-999554 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 Tue, Apr 05, 2022 at 02:57:49PM +0100, Catalin Marinas wrote: > In preparation for supporting a dynamic kmalloc() minimum alignment, > allow architectures to define ARCH_KMALLOC_MINALIGN independently of > ARCH_DMA_MINALIGN. In addition, always define ARCH_DMA_MINALIGN even if > an architecture does not override it. > > After this patch, ARCH_DMA_MINALIGN is expected to be used in static > alignment annotations and defined by an architecture to be the maximum > alignment for all supported configurations/SoCs in a single Image. > ARCH_KMALLOC_MINALIGN, if different, is the minimum alignment guaranteed > by kmalloc(). > > Signed-off-by: Catalin Marinas > Cc: Andrew Morton > --- > include/linux/slab.h | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 373b3ef99f4e..d58211bdeceb 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -187,17 +187,30 @@ bool kmem_valid_obj(void *object); > void kmem_dump_obj(void *object); > #endif > > +/* > + * slob does not support independent control of ARCH_KMALLOC_MINALIGN and > + * ARCH_DMA_MINALIGN. > + */ > +#ifdef CONFIG_SLOB > +#undef ARCH_KMALLOC_MINALIGN > +#endif > + > /* > * Some archs want to perform DMA into kmalloc caches and need a guaranteed > * alignment larger than the alignment of a 64-bit integer. > - * Setting ARCH_KMALLOC_MINALIGN in arch headers allows that. > + * Setting ARCH_DMA_MINALIGN in arch headers allows that. > */ > -#if defined(ARCH_DMA_MINALIGN) && ARCH_DMA_MINALIGN > 8 > +#ifndef ARCH_DMA_MINALIGN > +#define ARCH_DMA_MINALIGN __alignof__(unsigned long long) > +#elif 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) > -#else > +#endif > + > +#ifndef ARCH_KMALLOC_MINALIGN > #define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long) > +#else > +#define KMALLOC_MIN_SIZE ARCH_KMALLOC_MINALIGN > +#define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE) > #endif > > /* > Sorry for the noise I made due to misunderstanding :) Now this patch looks good to me and I think it's worth adding. Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> and works fine with SLAB/SLOB/SLUB on my arm64 machine. Tested-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Thanks! -- Thanks, Hyeonggon