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 EE3B130E83F; Mon, 18 Aug 2025 13:00:02 +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=1755522003; cv=none; b=PQupArSZxab+2Dm2cLP4BFPHZuZiTI2EmE76tY0LiPoVdw8/M1GI/2kj6o1ybwglkXkPCcqjnhZ57wxxb4MWXyoYFO213D5yn1w4XQmsvkhQgYho+XRmMPZ10kr0i6eDvEsjNfzFGs6Qng+YRFC6cIcxi6Tp2URUlGZudh/tkNM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755522003; c=relaxed/simple; bh=pyzUB/Ta4JTc5JhdqflzO4W60jwc22g+3e9GeV2kZ0k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Spn6VvelL+AuB9Nn+8IpmP8HzWzGERUIx3ZfgeE3kizGCzth09EWdaKKHfkcML/x9rcX+OXJT5lsFAowYpx1VKhgZw2kfYkUw4fECyEwSiPeVWv3sWFXuPr8/MfUhMR0L0mvpJ0eub3yzbP30La4hqX9mgmrdXLuSbsRckg+m9M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lqCILdZ9; 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="lqCILdZ9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F994C4CEEB; Mon, 18 Aug 2025 13:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755522002; bh=pyzUB/Ta4JTc5JhdqflzO4W60jwc22g+3e9GeV2kZ0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lqCILdZ9Ab29Eh5Bpzv72azluK9zn7KrO+fO3M2Ee9z8Oe6KPRDS+51bIiglx3XR9 /SYeoFDJNZxMS2yvt+3uk1NN2vFzbkNJskG2fyZAV63xRpKKtMZDyF/HrIP0+PUkK+ fgIcDXlwFDn3xxqtKVAEf5qE7zWvmv4KnPK2nSII= 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.12 153/444] platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches Date: Mon, 18 Aug 2025 14:42:59 +0200 Message-ID: <20250818124454.640498671@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124448.879659024@linuxfoundation.org> References: <20250818124448.879659024@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.12-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 0528af4ed8d6..2c67d9758e6b 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -561,12 +561,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