From patchwork Tue Apr 26 20:32:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 12827948 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 A1EC4C433EF for ; Tue, 26 Apr 2022 20:32:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A1396B0073; Tue, 26 Apr 2022 16:32:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 128E06B0074; Tue, 26 Apr 2022 16:32:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE5C36B0075; Tue, 26 Apr 2022 16:32:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id DDA556B0073 for ; Tue, 26 Apr 2022 16:32:42 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AE354274F7 for ; Tue, 26 Apr 2022 20:32:42 +0000 (UTC) X-FDA: 79400178564.25.34BE1AD Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf20.hostedemail.com (Postfix) with ESMTP id 205651C0060 for ; Tue, 26 Apr 2022 20:32:38 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2f4dfd09d7fso124170737b3.0 for ; Tue, 26 Apr 2022 13:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=YHzUgr9QNc7oDN5KkGpaITjDoktFxpsf4LNMdcVtpPFSiZ1kR5IoBtXE/XY92k9t9T 95VYIubjXmyZblFdrJAhW2MMy37VNzmyvZnc9wmsakyZJmXqDi8rB6XhcUSIwzfjchJC l9sy1K1FGT2luTvexMHuPDkejArUVYZW84GEE6MZGUYEXUPCXZ7+2fW+fYlTq9uOIUkz +lhMH3UOyj5f6NiVyT3UzgorhLTiTZLfygmSlAVB0bAg8preJ3FW9MSlqCjd1v0wKbzp HMcZXuhMkofdhk3JARWAupJW2lbSJfUbparW4zu76JIS1BFdxSyQCURJF5IHCb5NORG6 Vl/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=J/e5SHUlAZUEKDflJfDlrkuQw/i9o3+XpCVrJLX8Vyn1mdRXbjRnGNtFOoqdnkGPgT PVjLu9hoy8IXdzFikR32otgnr0tyTFUR3H6mfABm5EsxWf/n6d4zhl2T00WGBcdZxO4A qlPRnj/rWh+89OLo5nEX7MKxNFz91go1PSzAn/1mSd9G8MQkPZEXLBmGMs9Lhq+Ib8Ok lyd3IUKX7tkWszr6z6tT2cSqDyzy5zj8fPf8yxFUYVTzp3zB4QAxJw6wnjcnPK0Y8QEm 4QNl4/X3nscxI/RkgbwBM6dPwM1QbVeFucIFQX9bwo6wdHD9LFVCHtqW0Ue3fULd7r04 VpPw== X-Gm-Message-State: AOAM53230TfL7wS508BcIs5Y/ldPfSJTZWFPXnfgIIHOgR6HZhy6nPb0 WQ60FzotftY1JU+yRC8H8eUSrns= X-Google-Smtp-Source: ABdhPJzh1YP7CmiwmN8+/yV7PpIBnE6Eb3WcbLq40RItiIfk+iQBhhV7y3oqof4jQQkJj88sSYXnl/Q= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:709f:5eff:336a:4109]) (user=pcc job=sendgmr) by 2002:a05:6902:52:b0:645:bd1:970e with SMTP id m18-20020a056902005200b006450bd1970emr22523227ybh.413.1651005161361; Tue, 26 Apr 2022 13:32:41 -0700 (PDT) Date: Tue, 26 Apr 2022 13:32:30 -0700 Message-Id: <20220426203231.2107365-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v4 1/2] printk: stop including cache.h from printk.h 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 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=YHzUgr9Q; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 36VZoYgMKCFI9ww08805y.w86527EH-664Fuw4.8B0@flex--pcc.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=36VZoYgMKCFI9ww08805y.w86527EH-664Fuw4.8B0@flex--pcc.bounces.google.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 205651C0060 X-Rspam-User: X-Stat-Signature: k3huawggp7qys48k3mw8uej6hmgdq5gt X-HE-Tag: 1651005158-47553 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: An inclusion of cache.h in printk.h was added in 2014 in commit c28aa1f0a847 ("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit 3ec25826ae33 ("printk: Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it. We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header. This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch. Build tested using {allyesconfig,defconfig} x {arm64,x86_64}. Link: https://linux-review.googlesource.com/id/I8fd51f72c9ef1f2d6afd3b2cbc875aa4792c1fba Signed-off-by: Peter Collingbourne Reported-by: kernel test robot Reported-by: kernel test robot --- arch/arm64/include/asm/mte-kasan.h | 1 + arch/arm64/include/asm/percpu.h | 1 + drivers/firmware/smccc/kvm_guest.c | 1 + include/linux/printk.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h index a857bcacf0fe..9f79425fc65a 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -6,6 +6,7 @@ #define __ASM_MTE_KASAN_H #include +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h index 8f1661603b78..b9ba19dbdb69 100644 --- a/arch/arm64/include/asm/percpu.h +++ b/arch/arm64/include/asm/percpu.h @@ -10,6 +10,7 @@ #include #include #include +#include static inline void set_my_cpu_offset(unsigned long off) { diff --git a/drivers/firmware/smccc/kvm_guest.c b/drivers/firmware/smccc/kvm_guest.c index 2d3e866decaa..89a68e7eeaa6 100644 --- a/drivers/firmware/smccc/kvm_guest.c +++ b/drivers/firmware/smccc/kvm_guest.c @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/include/linux/printk.h b/include/linux/printk.h index 1522df223c0f..8e8d74edf121 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include From patchwork Tue Apr 26 20:32:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 12827949 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 DF4B4C433EF for ; Tue, 26 Apr 2022 20:32:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CFB06B0074; Tue, 26 Apr 2022 16:32:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 65B8B6B0075; Tue, 26 Apr 2022 16:32:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AA5E6B0078; Tue, 26 Apr 2022 16:32:45 -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 36E386B0074 for ; Tue, 26 Apr 2022 16:32:45 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 1B48A80F2F for ; Tue, 26 Apr 2022 20:32:45 +0000 (UTC) X-FDA: 79400178690.11.3EE8D0D Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf09.hostedemail.com (Postfix) with ESMTP id 7973B140043 for ; Tue, 26 Apr 2022 20:32:41 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2f825f8c944so23818017b3.15 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=hoE5KcqFym3n7saOJzPOfo0iDI6HflsjKViwJjVPIcfFnsQe57pZdH0atKb1ViHGKx l/BdO10qcU3YwMZ9aNtBhsJo3jOmnmS+Zh61vk+tOVovpo5BV/im8waLjxI8vo6n9DdR aIAq5nYEC35ONRDTpQ6D00JmCTYY+Jhtb/+jVOV/ys2yT/AFDxVwAxX3s+55szDq9yo4 Oms88R9doRhVANbWRpi4EjseVLiq7nBLSl5GeDU5EA8TJ7k5n8z3CwZM1EI20RU/fnZ1 ww+7s06n1U0wmaZe6EAJFKCNFAsJcTT401MmjqZA29fxtqHHzCmpOwlAvZcK0CWnoTIe lavA== X-Gm-Message-State: AOAM5309y026mxETvNpCkJOSWUzU4aes042NuEoFWIOeJnUy6Ee2IOp9 /USUuP/Bw7xHx63Z4DfDAVm1G+I= 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-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 7973B140043 X-Stat-Signature: bgp78ck445rtjffuswzss7e87hzag1yy Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=NzL50QDr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of 361ZoYgMKCFQByy2AA270.yA8749GJ-886Hwy6.AD2@flex--pcc.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=361ZoYgMKCFQByy2AA270.yA8749GJ-886Hwy6.AD2@flex--pcc.bounces.google.com X-Rspam-User: X-HE-Tag: 1651005161-26693 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: 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; }