From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 483D534164F; Tue, 26 Aug 2025 13:19:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214353; cv=none; b=pR8JaeZeoFK1VjIsDOq7VHwdaY3LLcAD4RPNVOWP5FvZoEv/jw1akieklI/OcgsJ1365WuKKcO4qtxdy84bt+7NcPSsrlkg6JWJlN+kIB9q49KrLJkRac4SMw/T0Es5Sq+kKhv+7hDHKdGQXPHepZOH9tkYbD6qjTIu/x+u8nyU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214353; c=relaxed/simple; bh=yLdnNaRdYmfWE/y62TQS2d4UNx7CBjTZreF1qmy3Jlw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WYUTzAGEITk5kguYztUtzlWrh/i6nTe7ns7xsQTSkUC+aRvrkNBGQ3VaHeJR8dOI0BbAXbI2y2EhiQlPTpG86nbaS/2tIzvy2nbfA7vAIXzMV43jzpu8LkIxb4mKA/PvLYtZErJ7v5MLcqKTl+N/RNx91dbhYWkRgAwE5utXnc4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JnDSIW4I; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JnDSIW4I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62CD4C4CEF1; Tue, 26 Aug 2025 13:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214352; bh=yLdnNaRdYmfWE/y62TQS2d4UNx7CBjTZreF1qmy3Jlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JnDSIW4I/Yi3vzzUqZ6sf42mWOEP7uuD3bTw+cYylWtJerah4RwyVOCwk3loffTca r7xa4Neowg93TufVcDMnd3TGMY+krAuqFjZhmcagSUVDFclb9j/u94E+Dnf38trGc8 5eMmjlp2IKez+egJ1MKOgknq+r0PdhqkI86gf8jY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kees Cook , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.1 106/482] platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches Date: Tue, 26 Aug 2025 13:05:59 +0200 Message-ID: <20250826110933.446135483@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook [ Upstream commit 6418a8504187dc7f5b6f9d0649c03e362cb0664b ] 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[1], we have to handle differences in how GCC's inline optimizations get resolved. For thinkpad_acpi routines, this means forcing two functions to be inline with __always_inline. Link: https://lore.kernel.org/lkml/20250523043935.2009972-11-kees@kernel.org/ [1] Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20250529181831.work.439-kees@kernel.org Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/thinkpad_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 17d74434e604..c0977ffec96c 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -544,12 +544,12 @@ static unsigned long __init tpacpi_check_quirks( return 0; } -static inline bool __pure __init tpacpi_is_lenovo(void) +static __always_inline bool __pure __init 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 __init tpacpi_is_ibm(void) { return thinkpad_id.vendor == PCI_VENDOR_ID_IBM; } -- 2.39.5