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 78A3CC3DA6D for ; Fri, 23 May 2025 04:39:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC8F06B0082; Fri, 23 May 2025 00:39:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7A6A6B0083; Fri, 23 May 2025 00:39:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B686A6B0085; Fri, 23 May 2025 00:39:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 97D7E6B0082 for ; Fri, 23 May 2025 00:39:42 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0A8A81D453A for ; Fri, 23 May 2025 04:39:42 +0000 (UTC) X-FDA: 83472919404.29.165C68F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id 34756180002 for ; Fri, 23 May 2025 04:39:40 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qlCKyVVK; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of kees@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kees@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747975180; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tjfvfIVeVuhN6efUDy77xTsKvPQ+XlcesPdymh1L3qU=; b=JTFwXhw8LBBEm+OU78V8oszEgtcyU7VITLMWalj0gxTuedGr5zHiR7XDkpIKFQPdmWfqQ6 S4LykUxxPqun28kciPS8QIX6rH/ZeKKFeUQ/h7AR9RBv8pcUiXPWT6wbYrtwcI4krOszwm P33GtRB/jBc/oyd7em7TX5lTIic2sw8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qlCKyVVK; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of kees@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kees@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747975180; a=rsa-sha256; cv=none; b=NTct38qhNKIEYQc7/LVmgJUuBLaAcK669Eq6unnfv1OXfVUqdkARKjmze12UBAEQ+NQnt7 DB5lRrKLai691U81hgr7CmUMGED0N0DnDltRXTJLMGMxGnfYyi9e40m5Xv5RCut59igqMo 5n1+zsYxC4IcGCum0gxrmNfjozHlKRo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CBDF15C6D24; Fri, 23 May 2025 04:37:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B20AC4AF0D; Fri, 23 May 2025 04:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747975178; bh=NLp+yNLHFbt0GV+WqSgZP5Jpw7SgnlmemsBZjPqNKQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlCKyVVKLEZ335sLpg+xeLE2/qJ62IS1vyetoyVip+Yyuu60s5XnBtQe5q0zKHjkY etIn1cA5kgQZxhhqM+nSxGwqYnlKxif2/cg4HxcmNEaoJHzj2/Pcc2IIer9ePMC4cd uGYmI/++s2hmct2fKbHy78u8wyTDLJ9Qr3pbUq4On2urBYfO/BnItaRSZDMTze51z2 9SqS6uc8MgyJZ7iZNxcJfybotHxmcUdOg9IQMoBb5yyyEv89ZE92csR4rfVug2cgbq pJXOOhWsQy2pRnAaCatN/HP5mgoiLLeblf2rFZpESNcCsQJC/We44mKVQiW8lD++UD FomvAY7ZOyPhQ== From: Kees Cook To: Arnd Bergmann Cc: Kees Cook , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Vitaly Kuznetsov , Henrique de Moraes Holschuh , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Rafael J. Wysocki" , Len Brown , Masami Hiramatsu , Ard Biesheuvel , Mike Rapoport , Michal Wilczynski , Juergen Gross , Andy Shevchenko , "Kirill A. Shutemov" , Roger Pau Monne , David Woodhouse , Usama Arif , "Guilherme G. Piccoli" , Thomas Huth , Brian Gerst , kvm@vger.kernel.org, ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-mm@kvack.org, "Gustavo A. R. Silva" , Christoph Hellwig , Marco Elver , Andrey Konovalov , Andrey Ryabinin , Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kselftest@vger.kernel.org, sparclinux@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH v2 04/14] x86: Handle KCOV __init vs inline mismatches Date: Thu, 22 May 2025 21:39:14 -0700 Message-Id: <20250523043935.2009972-4-kees@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250523043251.it.550-kees@kernel.org> References: <20250523043251.it.550-kees@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=6526; i=kees@kernel.org; h=from:subject; bh=NLp+yNLHFbt0GV+WqSgZP5Jpw7SgnlmemsBZjPqNKQ0=; b=owGbwMvMwCVmps19z/KJym7G02pJDBn6v3/M6Lj0TL3UZvEPryO2U1XiwmeUWRnm7Ltu8Tv7T fejWHWxjhIWBjEuBlkxRZYgO/c4F4+37eHucxVh5rAygQxh4OIUgIncPMDIMF2RL/S7vLKpfM2M t8x3m+UdDqwvS9xyTbb4p4asf8qChQw/nnGmzL67VZLb8E8Q7+r/36asCDud1Su0ufrUxFOvRAJ YAA== X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 34756180002 X-Stat-Signature: oypmta1bobmut55c5qhfwd68rzcj8thn X-Rspam-User: X-HE-Tag: 1747975180-495511 X-HE-Meta: U2FsdGVkX19RCsQ6djsALxc0RTqTb+uLkHzoC6uR96vqiZoVFvwUuDqYmRZoHh9FNzmCyavozD4tbv16nG4SfWpRIABwvn2lqvvMOTTZRhOsyhjv0W3y/APmVJF+3PR70tB0xmpC91uKoNpHmFcTCiFFAaxJ6Kd2BUUEhU8anl5chi4zgftQawgFXeLp8H4Fj9YYI7pOM58O+CA1t33+pnTc1TKT/NUXV0r98hArixy5IB5LQ4bvR6rBp0g8dQdiPBexwoc8h449nda4zaO+lkF4et6mqvRnBLwh0uWhDHtKQOcgQ7wl6ewf+1Mj92hzB79h31uHkOWjPvZ/Jrl887IKnHCxWuuwhAatYtJ2hruM0s4SUCiMWdpZKI+iK2ufnGPjfVYknqFTYaYF+TqVGRtjxnaNGN+3pLrnFI+YBRphUI75OKjQAgh/WjjhjN/UQuWUkCeB5SgvT+/8xG9zbVqNQhpq4JHzs/21x22KJqXPlFFVZROXQ2rxFWJI02WODfIdYwo69VnAYBnI2EXmAdt6M0aR2hXnbGyMMXHX4QKHhdXE+5SxolsNXF0RGO+v2KWye4ePfPj/YLG4sJV6BeH7X6jL85OkFPCVdk/cYFPkBA9zCTgPH87JjdXj+nTgBpitxagwdxNLUKxNJ2QUiavBKX8RIgJBL/92kXdomWhCnT3A+Fo6fFZCXQqY7F1WwJFrCKgQ56RikuCpdr1nnaW+4bbriE/nnPU+CDMU7zeCHBczmon/CoSbaA/oSNJz1Mx/8NLxcTAWbWFCDyjTrw1wL7cidOm8oJHJRQCgrJlizqpTvDppybAQPXzX5NXwBQEUFpJnPVE/oV8GSIbZk+Eq97hKuZbwK7mz8YOBKNNb52zqjyHcJiwzAjKMP+XGyUdhTiD3RFx3W1S9Zsx/EdnEq5XaoC0LO17AuKlmZhd3RBYnken+y2oz1szYIIS2mLs3ctULvZAm1b8qFlx y8lWfSr1 u+C+8+7LsZ4S72ySARI6GnWDzP8X+Jd//RJJdVv3ojmlsmBA027/GotLJQH8sXTKs6XP+1vHAU3SP2FlI+dI792eMnzXMpduqyBr/zKx0fRGRDzfzwnlFIBDGiW/ds4XCYjn/fhZTu/6CGqnXnrxy23Y1CR0S5tuN5RMEsmmGML9FP1ea+KaI/JIN8oOdoAoV2VnTG5PJ7vvem6zfDuucB4+7b58pl+AxbitdZQ8cE7Sm9LPKOwXgXDSPbpJiJRtNoGC1w2GOfXbJBvkP0zi3AjggCnptbRlhqYxQ9h3iBN8t9LMMqAtLldAjJqom/EHAjZVnmX4S+E9h9P3+zZ+m6oDBcqvVhrSzdmxdSNpsJK4lwe7c6EckFNKQPAqI7QTO0A3GQ8yTgGm/wOn1qiSrS9NiOZ3IgPprKDzzf38F7px0vnm3f6eF64yam5G8ABgUa6f0faaKmhGudegWW9Knv3e2ez6pXZ/pH9GjWjaeeB8EYlRfmoAkCTuoOFdf7MtzJ2WF6PFMoaBNDplkkIEp9Axz0WrhtGZCFuegqGx9VSAyGdro2pmJt6Lr6cgNleofbzM4riAdfccerAxQkeUaXffMwVk1JflN8o5a/TBF/9bfaSRz6+z2n7Sff4X54LkRiflFAoIh75LxJZEUKg0POLbPPTr6OATZZFq+JuuHOA+3+clyt1MjMXtnoaBaSnaaR6ws5KpHqutizoBKCTujC8aBg4EG5Y7Q0dYat/Ia7I154Livh+xIw5l8j08Dt9OrksrUAQ2xeOTKGAc6B8IH5TjrY2kaNzRPsb+s 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: List-Subscribe: List-Unsubscribe: When KCOV is enabled all functions get instrumented, unless the __no_sanitize_coverage attribute is used. To prepare for __no_sanitize_coverage being applied to __init functions, we have to handle differences in how GCC's inline optimizations get resolved. For x86 this means forcing several functions to be inline with __always_inline. Signed-off-by: Kees Cook --- Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Vitaly Kuznetsov Cc: Henrique de Moraes Holschuh Cc: Hans de Goede Cc: "Ilpo Järvinen" Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Masami Hiramatsu Cc: Ard Biesheuvel Cc: Mike Rapoport Cc: Michal Wilczynski Cc: Juergen Gross Cc: Andy Shevchenko Cc: "Kirill A. Shutemov" Cc: Roger Pau Monne Cc: David Woodhouse Cc: Usama Arif Cc: "Guilherme G. Piccoli" Cc: Thomas Huth Cc: Brian Gerst Cc: Cc: Cc: Cc: Cc: Cc: Cc: --- arch/x86/include/asm/acpi.h | 4 ++-- arch/x86/include/asm/realmode.h | 2 +- include/linux/acpi.h | 4 ++-- include/linux/bootconfig.h | 2 +- include/linux/efi.h | 2 +- include/linux/memblock.h | 2 +- arch/x86/kernel/kvm.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 5ab1a4598d00..a03aa6f999d1 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -158,13 +158,13 @@ static inline bool acpi_has_cpu_in_madt(void) } #define ACPI_HAVE_ARCH_SET_ROOT_POINTER -static inline void acpi_arch_set_root_pointer(u64 addr) +static __always_inline void acpi_arch_set_root_pointer(u64 addr) { x86_init.acpi.set_root_pointer(addr); } #define ACPI_HAVE_ARCH_GET_ROOT_POINTER -static inline u64 acpi_arch_get_root_pointer(void) +static __always_inline u64 acpi_arch_get_root_pointer(void) { return x86_init.acpi.get_root_pointer(); } diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index f607081a022a..e406a1e92c63 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h @@ -78,7 +78,7 @@ extern unsigned char secondary_startup_64[]; extern unsigned char secondary_startup_64_no_verify[]; #endif -static inline size_t real_mode_size_needed(void) +static __always_inline size_t real_mode_size_needed(void) { if (real_mode_header) return 0; /* already allocated. */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index e72100c0684f..ae76c8915000 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -759,13 +759,13 @@ int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count) #endif #ifndef ACPI_HAVE_ARCH_SET_ROOT_POINTER -static inline void acpi_arch_set_root_pointer(u64 addr) +static __always_inline void acpi_arch_set_root_pointer(u64 addr) { } #endif #ifndef ACPI_HAVE_ARCH_GET_ROOT_POINTER -static inline u64 acpi_arch_get_root_pointer(void) +static __always_inline u64 acpi_arch_get_root_pointer(void) { return 0; } diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h index 3f4b4ac527ca..25df9260d206 100644 --- a/include/linux/bootconfig.h +++ b/include/linux/bootconfig.h @@ -290,7 +290,7 @@ int __init xbc_get_info(int *node_size, size_t *data_size); /* XBC cleanup data structures */ void __init _xbc_exit(bool early); -static inline void xbc_exit(void) +static __always_inline void xbc_exit(void) { _xbc_exit(false); } diff --git a/include/linux/efi.h b/include/linux/efi.h index 7d63d1d75f22..e3776d9cad07 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1334,7 +1334,7 @@ struct linux_efi_initrd { bool xen_efi_config_table_is_usable(const efi_guid_t *guid, unsigned long table); -static inline +static __always_inline bool efi_config_table_is_usable(const efi_guid_t *guid, unsigned long table) { if (!IS_ENABLED(CONFIG_XEN_EFI)) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index bb19a2534224..b96746376e17 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -463,7 +463,7 @@ static inline void *memblock_alloc_raw(phys_addr_t size, NUMA_NO_NODE); } -static inline void *memblock_alloc_from(phys_addr_t size, +static __always_inline void *memblock_alloc_from(phys_addr_t size, phys_addr_t align, phys_addr_t min_addr) { diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 921c1c783bc1..72f13d643fca 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -420,7 +420,7 @@ static u64 kvm_steal_clock(int cpu) return steal; } -static inline void __set_percpu_decrypted(void *ptr, unsigned long size) +static __always_inline void __set_percpu_decrypted(void *ptr, unsigned long size) { early_set_memory_decrypted((unsigned long) ptr, size); } diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index e7350c9fa3aa..0518d5b1f4ec 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -559,12 +559,12 @@ static unsigned long __init tpacpi_check_quirks( return 0; } -static inline bool __pure __init tpacpi_is_lenovo(void) +static __always_inline bool __pure tpacpi_is_lenovo(void) { return thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO; } -static inline bool __pure __init tpacpi_is_ibm(void) +static __always_inline bool __pure tpacpi_is_ibm(void) { return thinkpad_id.vendor == PCI_VENDOR_ID_IBM; } -- 2.34.1