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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2B90C433F5 for ; Tue, 26 Apr 2022 20:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354978AbiDZUf6 (ORCPT ); Tue, 26 Apr 2022 16:35:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354965AbiDZUfx (ORCPT ); Tue, 26 Apr 2022 16:35:53 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF3641A61E9 for ; Tue, 26 Apr 2022 13:32:44 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2f4e17a5809so123701607b3.2 for ; Tue, 26 Apr 2022 13:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ltoHorK2wXcd+a1S2OPAtE1WX5XYl1FW0si4xQoCroE=; b=NzL50QDr4Qx2Wmcu5b5/caaxWCFPCsWoZ8IrIkN2tZwE48j9h9dxAFyrvRmG6HzEgJ MPxYFBCQ7dcnIt6/MbMN5QuFdkeNHjxiCsJGiqUzGY+p31fGozQOjsGbHon+C8zA7fGN 9EJvF9UWojx7/MYjlzobRutT8+e+zb0BQ1jH5rvjYEULqDNznTuSO36ZzlfkWnXIVYt3 udT6td888NFbkQ361IAlXc+NZITcxoYg1BInJSgez+pJ4wbzgbtVkQjml8IpCmpuv8ff jBEFewk4xn4G3n4jEALq5fep9zwyuEY3aLiYoFRjdk5cfocjm0fn6ZBlHJqL7mpRzO9d 5ETg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ltoHorK2wXcd+a1S2OPAtE1WX5XYl1FW0si4xQoCroE=; b=rQe4RA+HtK3njboADYCEinzI05BozL3LeUc9V9vHNPEQ1Dl6sWpJqrFHCL4tmK+uB2 fluZRdN3iPZ+ZD1cmhiS11HseXSbrNpokBM/4TFbZWD4xrPk+Zr0mWsudrPqUyh0m9Ow RIlGbaBWM0XVN8wxaEPvGr+ZP5UkjWKhAc6wozUkA/tUamXK6zSjrBXKAobnKFzZywjC zCcF9jzzAHUFfOHlotIWI67JBEAel+yqUUVtgkp+TMKG1z40xoJfEewWi3Gi9QHR9K4+ eIbiJaXbpe8cu3I/nNPADKpx1yKNE9LmIpmCWkW1AA+T70+9Xuphfn8xo2+tjCAjYQsl 7mjA== X-Gm-Message-State: AOAM533YpiU7VAG/pD8OIZnnybqWb5S7W7OVQ8zCToGtX7STKvzqIqlM itxm3Czv37Cb1h+8N5/NXqsJsuE= X-Google-Smtp-Source: ABdhPJxNY3ncovCwIEUfGZWoHEe0RfFGEUNq4+teJxTrSaV1EC/58nkZBxTEmZ5+Nh614RPM9VgIGQg= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:709f:5eff:336a:4109]) (user=pcc job=sendgmr) by 2002:a81:9146:0:b0:2f7:da3d:8bfa with SMTP id i67-20020a819146000000b002f7da3d8bfamr13154889ywg.206.1651005163884; Tue, 26 Apr 2022 13:32:43 -0700 (PDT) Date: Tue, 26 Apr 2022 13:32:31 -0700 In-Reply-To: <20220426203231.2107365-1-pcc@google.com> Message-Id: <20220426203231.2107365-2-pcc@google.com> Mime-Version: 1.0 References: <20220426203231.2107365-1-pcc@google.com> X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v4 2/2] mm: make minimum slab alignment a runtime property From: Peter Collingbourne To: Andrey Konovalov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , Catalin Marinas Cc: Peter Collingbourne , Linux ARM , Linux Memory Management List , Linux Kernel Mailing List , vbabka@suse.cz, penberg@kernel.org, roman.gushchin@linux.dev, iamjoonsoo.kim@lge.com, rientjes@google.com, Herbert Xu , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Eric Biederman , Kees Cook Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_KASAN_HW_TAGS is enabled we currently increase the minimum slab alignment to 16. This happens even if MTE is not supported in hardware or disabled via kasan=off, which creates an unnecessary memory overhead in those cases. Eliminate this overhead by making the minimum slab alignment a runtime property and only aligning to 16 if KASAN is enabled at runtime. On a DragonBoard 845c (non-MTE hardware) with a kernel built with CONFIG_KASAN_HW_TAGS, waiting for quiescence after a full Android boot I see the following Slab measurements in /proc/meminfo (median of 3 reboots): Before: 169020 kB After: 167304 kB Link: https://linux-review.googlesource.com/id/I752e725179b43b144153f4b6f584ceb646473ead Signed-off-by: Peter Collingbourne Reviewed-by: Andrey Konovalov Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Tested-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Acked-by: David Rientjes Reviewed-by: Catalin Marinas --- v4: - add a dependent patch to fix the build with CONFIG_JUMP_LABEL disabled v3: - go back to ARCH_SLAB_MINALIGN - revert changes to fs/binfmt_flat.c - update arch_slab_minalign() comment to say that it must be a power of two v2: - use max instead of max_t in flat_stack_align() arch/arm64/include/asm/cache.h | 17 ++++++++++++----- include/linux/slab.h | 12 ++++++++++++ mm/slab.c | 7 +++---- mm/slab_common.c | 3 +-- mm/slob.c | 6 +++--- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index a074459f8f2f..22b22dc1b1b5 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -6,6 +6,7 @@ #define __ASM_CACHE_H #include +#include #define CTR_L1IP_SHIFT 14 #define CTR_L1IP_MASK 3 @@ -49,16 +50,22 @@ */ #define ARCH_DMA_MINALIGN (128) +#ifndef __ASSEMBLY__ + +#include +#include + #ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT) #elif defined(CONFIG_KASAN_HW_TAGS) -#define ARCH_SLAB_MINALIGN MTE_GRANULE_SIZE +static inline size_t arch_slab_minalign(void) +{ + return kasan_hw_tags_enabled() ? MTE_GRANULE_SIZE : + __alignof__(unsigned long long); +} +#define arch_slab_minalign() arch_slab_minalign() #endif -#ifndef __ASSEMBLY__ - -#include - #define ICACHEF_ALIASING 0 #define ICACHEF_VPIPT 1 extern unsigned long __icache_flags; diff --git a/include/linux/slab.h b/include/linux/slab.h index 373b3ef99f4e..2c7190db4cc0 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -209,6 +209,18 @@ void kmem_dump_obj(void *object); #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) #endif +/* + * Arches can define this function if they want to decide the minimum slab + * alignment at runtime. The value returned by the function must be a power + * of two and >= ARCH_SLAB_MINALIGN. + */ +#ifndef arch_slab_minalign +static inline size_t arch_slab_minalign(void) +{ + return ARCH_SLAB_MINALIGN; +} +#endif + /* * kmalloc and friends return ARCH_KMALLOC_MINALIGN aligned * pointers. kmem_cache_alloc and friends return ARCH_SLAB_MINALIGN diff --git a/mm/slab.c b/mm/slab.c index 0edb474edef1..97b756976c8b 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3009,10 +3009,9 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, objp += obj_offset(cachep); if (cachep->ctor && cachep->flags & SLAB_POISON) cachep->ctor(objp); - if (ARCH_SLAB_MINALIGN && - ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1))) { - pr_err("0x%px: not aligned to ARCH_SLAB_MINALIGN=%d\n", - objp, (int)ARCH_SLAB_MINALIGN); + if ((unsigned long)objp & (arch_slab_minalign() - 1)) { + pr_err("0x%px: not aligned to arch_slab_minalign()=%d\n", objp, + (int)arch_slab_minalign()); } return objp; } diff --git a/mm/slab_common.c b/mm/slab_common.c index 2b3206a2c3b5..33cc49810a54 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -154,8 +154,7 @@ static unsigned int calculate_alignment(slab_flags_t flags, align = max(align, ralign); } - if (align < ARCH_SLAB_MINALIGN) - align = ARCH_SLAB_MINALIGN; + align = max_t(size_t, align, arch_slab_minalign()); return ALIGN(align, sizeof(void *)); } diff --git a/mm/slob.c b/mm/slob.c index 40ea6e2d4ccd..3bd2669bd690 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -478,7 +478,7 @@ static __always_inline void * __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller) { unsigned int *m; - int minalign = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + int minalign = max_t(size_t, ARCH_KMALLOC_MINALIGN, arch_slab_minalign()); void *ret; gfp &= gfp_allowed_mask; @@ -555,7 +555,7 @@ void kfree(const void *block) sp = virt_to_folio(block); if (folio_test_slab(sp)) { - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, arch_slab_minalign()); unsigned int *m = (unsigned int *)(block - align); slob_free(m, *m + align); } else { @@ -584,7 +584,7 @@ size_t __ksize(const void *block) if (unlikely(!folio_test_slab(folio))) return folio_size(folio); - align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + align = max_t(size_t, ARCH_KMALLOC_MINALIGN, arch_slab_minalign()); m = (unsigned int *)(block - align); return SLOB_UNITS(*m) * SLOB_UNIT; } -- 2.36.0.rc2.479.g8af0fa9b8e-goog 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 1C260C433F5 for ; Tue, 26 Apr 2022 20:34:00 +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:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ik/AL3hsHDpmuQZQJDWD8S+C1etsURkeaE2cIxmMeGA=; b=klfbBbiVwC53uHMgrWcX1m8B8/ 6UjSSBKrHahnP8psW+8+qAk27sufRyxUE2D85O3H017yT7f/YHX8AOLRzGcoIrBjX0N/02lbHINPR VY7KEQ2H57D/XR8+uus4rTFQInWjMEBbgiPpxzF6QXge+5Vi8wbo4Jf5lH16tswuXBHeB8qJCxxyW tdUQUIN3V1LxAyHLRoMsRE3OK5ycG9j5Z/u1S60zgXc3Y71pwPkW99JRH5UTgKqHh3G4IXTupBamV IHhGR96VYKI3+/+J3Lkf8/hizANfs9vTm/9b6AKJX4tfPhstiv9WmTn4ttlAX5QI3FBFhb57qnE0g vzaSCB7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njRrn-00GBPW-Vk; Tue, 26 Apr 2022 20:33:00 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njRrb-00GBKR-Vq for linux-arm-kernel@lists.infradead.org; Tue, 26 Apr 2022 20:32:49 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2f4e28ae604so122217827b3.8 for ; Tue, 26 Apr 2022 13:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ltoHorK2wXcd+a1S2OPAtE1WX5XYl1FW0si4xQoCroE=; b=NzL50QDr4Qx2Wmcu5b5/caaxWCFPCsWoZ8IrIkN2tZwE48j9h9dxAFyrvRmG6HzEgJ MPxYFBCQ7dcnIt6/MbMN5QuFdkeNHjxiCsJGiqUzGY+p31fGozQOjsGbHon+C8zA7fGN 9EJvF9UWojx7/MYjlzobRutT8+e+zb0BQ1jH5rvjYEULqDNznTuSO36ZzlfkWnXIVYt3 udT6td888NFbkQ361IAlXc+NZITcxoYg1BInJSgez+pJ4wbzgbtVkQjml8IpCmpuv8ff jBEFewk4xn4G3n4jEALq5fep9zwyuEY3aLiYoFRjdk5cfocjm0fn6ZBlHJqL7mpRzO9d 5ETg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ltoHorK2wXcd+a1S2OPAtE1WX5XYl1FW0si4xQoCroE=; b=SGRs0YKgBtjjFdMdVQhZY1r5TfsBamzh+dNx8hk31PCTEw8jhc/9f/DeopX2r+m+Ye 25c3zxTtQlqGKN/ZE+rOryFDfvcJD+QKViSBn9jGakDo/eNIFQUIJOH4x0FBiUr/by7I 80FnqyQrOgBe6Axv1trd0C+QKW0F6ewagXIelC3zqlIOL7hVND+aEUn8eJ4cnIkz/Yke AvDDYMXZ3QeKVWWJvqbFvvfwhcYPtErBN0VdMaXk0oCdPQYgfDQrJRKUcBW9dO4vq/ww diVgvRuWbMazQn1dUpg+Fh9+PyYpXji2VNwLpElRQzMjNgUzAf0xOzF2sK9m81V0IQdt c6UQ== X-Gm-Message-State: AOAM532RuTc9HcS6tHa9tiUGEsJtSkn2FIKmV+hJh/3cv7l8zPc2HVcl lu99EDiaTqAFjwAqg6ow4vQq82w= X-Google-Smtp-Source: ABdhPJxNY3ncovCwIEUfGZWoHEe0RfFGEUNq4+teJxTrSaV1EC/58nkZBxTEmZ5+Nh614RPM9VgIGQg= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:709f:5eff:336a:4109]) (user=pcc job=sendgmr) by 2002:a81:9146:0:b0:2f7:da3d:8bfa with SMTP id i67-20020a819146000000b002f7da3d8bfamr13154889ywg.206.1651005163884; Tue, 26 Apr 2022 13:32:43 -0700 (PDT) Date: Tue, 26 Apr 2022 13:32:31 -0700 In-Reply-To: <20220426203231.2107365-1-pcc@google.com> Message-Id: <20220426203231.2107365-2-pcc@google.com> Mime-Version: 1.0 References: <20220426203231.2107365-1-pcc@google.com> X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v4 2/2] mm: make minimum slab alignment a runtime property From: Peter Collingbourne To: Andrey Konovalov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , Catalin Marinas Cc: Peter Collingbourne , Linux ARM , Linux Memory Management List , Linux Kernel Mailing List , vbabka@suse.cz, penberg@kernel.org, roman.gushchin@linux.dev, iamjoonsoo.kim@lge.com, rientjes@google.com, Herbert Xu , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Eric Biederman , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220426_133248_059609_8231E8A3 X-CRM114-Status: GOOD ( 21.50 ) 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 When CONFIG_KASAN_HW_TAGS is enabled we currently increase the minimum slab alignment to 16. This happens even if MTE is not supported in hardware or disabled via kasan=off, which creates an unnecessary memory overhead in those cases. Eliminate this overhead by making the minimum slab alignment a runtime property and only aligning to 16 if KASAN is enabled at runtime. On a DragonBoard 845c (non-MTE hardware) with a kernel built with CONFIG_KASAN_HW_TAGS, waiting for quiescence after a full Android boot I see the following Slab measurements in /proc/meminfo (median of 3 reboots): Before: 169020 kB After: 167304 kB Link: https://linux-review.googlesource.com/id/I752e725179b43b144153f4b6f584ceb646473ead Signed-off-by: Peter Collingbourne Reviewed-by: Andrey Konovalov Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Tested-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Acked-by: David Rientjes Reviewed-by: Catalin Marinas --- v4: - add a dependent patch to fix the build with CONFIG_JUMP_LABEL disabled v3: - go back to ARCH_SLAB_MINALIGN - revert changes to fs/binfmt_flat.c - update arch_slab_minalign() comment to say that it must be a power of two v2: - use max instead of max_t in flat_stack_align() arch/arm64/include/asm/cache.h | 17 ++++++++++++----- include/linux/slab.h | 12 ++++++++++++ mm/slab.c | 7 +++---- mm/slab_common.c | 3 +-- mm/slob.c | 6 +++--- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index a074459f8f2f..22b22dc1b1b5 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -6,6 +6,7 @@ #define __ASM_CACHE_H #include +#include #define CTR_L1IP_SHIFT 14 #define CTR_L1IP_MASK 3 @@ -49,16 +50,22 @@ */ #define ARCH_DMA_MINALIGN (128) +#ifndef __ASSEMBLY__ + +#include +#include + #ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT) #elif defined(CONFIG_KASAN_HW_TAGS) -#define ARCH_SLAB_MINALIGN MTE_GRANULE_SIZE +static inline size_t arch_slab_minalign(void) +{ + return kasan_hw_tags_enabled() ? MTE_GRANULE_SIZE : + __alignof__(unsigned long long); +} +#define arch_slab_minalign() arch_slab_minalign() #endif -#ifndef __ASSEMBLY__ - -#include - #define ICACHEF_ALIASING 0 #define ICACHEF_VPIPT 1 extern unsigned long __icache_flags; diff --git a/include/linux/slab.h b/include/linux/slab.h index 373b3ef99f4e..2c7190db4cc0 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -209,6 +209,18 @@ void kmem_dump_obj(void *object); #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) #endif +/* + * Arches can define this function if they want to decide the minimum slab + * alignment at runtime. The value returned by the function must be a power + * of two and >= ARCH_SLAB_MINALIGN. + */ +#ifndef arch_slab_minalign +static inline size_t arch_slab_minalign(void) +{ + return ARCH_SLAB_MINALIGN; +} +#endif + /* * kmalloc and friends return ARCH_KMALLOC_MINALIGN aligned * pointers. kmem_cache_alloc and friends return ARCH_SLAB_MINALIGN diff --git a/mm/slab.c b/mm/slab.c index 0edb474edef1..97b756976c8b 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3009,10 +3009,9 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, objp += obj_offset(cachep); if (cachep->ctor && cachep->flags & SLAB_POISON) cachep->ctor(objp); - if (ARCH_SLAB_MINALIGN && - ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1))) { - pr_err("0x%px: not aligned to ARCH_SLAB_MINALIGN=%d\n", - objp, (int)ARCH_SLAB_MINALIGN); + if ((unsigned long)objp & (arch_slab_minalign() - 1)) { + pr_err("0x%px: not aligned to arch_slab_minalign()=%d\n", objp, + (int)arch_slab_minalign()); } return objp; } diff --git a/mm/slab_common.c b/mm/slab_common.c index 2b3206a2c3b5..33cc49810a54 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -154,8 +154,7 @@ static unsigned int calculate_alignment(slab_flags_t flags, align = max(align, ralign); } - if (align < ARCH_SLAB_MINALIGN) - align = ARCH_SLAB_MINALIGN; + align = max_t(size_t, align, arch_slab_minalign()); return ALIGN(align, sizeof(void *)); } diff --git a/mm/slob.c b/mm/slob.c index 40ea6e2d4ccd..3bd2669bd690 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -478,7 +478,7 @@ static __always_inline void * __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller) { unsigned int *m; - int minalign = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + int minalign = max_t(size_t, ARCH_KMALLOC_MINALIGN, arch_slab_minalign()); void *ret; gfp &= gfp_allowed_mask; @@ -555,7 +555,7 @@ void kfree(const void *block) sp = virt_to_folio(block); if (folio_test_slab(sp)) { - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, arch_slab_minalign()); unsigned int *m = (unsigned int *)(block - align); slob_free(m, *m + align); } else { @@ -584,7 +584,7 @@ size_t __ksize(const void *block) if (unlikely(!folio_test_slab(folio))) return folio_size(folio); - align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + align = max_t(size_t, ARCH_KMALLOC_MINALIGN, arch_slab_minalign()); m = (unsigned int *)(block - align); return SLOB_UNITS(*m) * SLOB_UNIT; } -- 2.36.0.rc2.479.g8af0fa9b8e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel