Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: patches@lists.linux.dev, stable@vger.kernel.org
Cc: "Kees Cook" <kees@kernel.org>,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
	"Sasha Levin" <sashal@kernel.org>,
	hansg@kernel.org, platform-driver-x86@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 45/51] platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches
Date: Sun,  3 Aug 2025 20:36:37 -0400	[thread overview]
Message-ID: <20250804003643.3625204-45-sashal@kernel.org> (raw)
In-Reply-To: <20250804003643.3625204-1-sashal@kernel.org>

From: Kees Cook <kees@kernel.org>

[ 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 <kees@kernel.org>
Link: https://lore.kernel.org/r/20250529181831.work.439-kees@kernel.org
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

LLM Generated explanations, may be completely bogus:

**YES**

This commit should be backported to stable kernel trees. Here's my
extensive analysis:

## Detailed Analysis

### Nature of the Change
The commit modifies two functions in
`drivers/platform/x86/lenovo/thinkpad_acpi.c`:
- `tpacpi_is_lenovo()`: Changed from `static inline` to `static
  __always_inline`
- `tpacpi_is_ibm()`: Changed from `static inline` to `static
  __always_inline`

Both functions are marked with `__init` and are simple one-line
functions that check the vendor ID.

### Root Cause
This is a build fix addressing a subtle interaction between:
1. KCOV kernel coverage instrumentation
2. GCC's inline optimization heuristics
3. Linux kernel's __init section handling

When KCOV is enabled, all functions get instrumented unless marked with
`__no_sanitize_coverage`. The commit message indicates this is
preparation for applying `__no_sanitize_coverage` to `__init` functions.
The problem occurs because:

1. With KCOV instrumentation, GCC may inline these functions into
   `__init` callers
2. Without KCOV instrumentation (when `__no_sanitize_coverage` is
   applied), GCC's heuristics change and it may decide NOT to inline
   them
3. This creates a section mismatch where `__init` code calls
   non-`__init` functions, causing build warnings/errors

### Why This Qualifies for Stable Backport

1. **Fixes a Real Bug**: This addresses legitimate build failures when
   `CONFIG_KCOV=y` is enabled, which affects:
   - Kernel developers doing coverage testing
   - CI/CD systems running kernel tests
   - Distribution builders enabling KCOV for testing

2. **Minimal Risk**: The change is extremely conservative:
   - Only changes inline hints from `inline` to `__always_inline`
   - No functional changes whatsoever
   - Affects only two simple getter functions
   - Cannot introduce runtime regressions

3. **Small and Contained**: The patch touches only 2 lines in a single
   file, making it easy to review and backport

4. **Part of Broader Fix**: This is part of a kernel-wide effort to fix
   KCOV-related build issues, with similar fixes across multiple
   architectures and subsystems

5. **Build Infrastructure**: Stable kernels need to maintain
   buildability with various configurations, including KCOV-enabled
   builds for testing

### Specific Code Impact
Looking at the changed functions:
```c
-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;
 }
```

These are trivial getter functions that absolutely should be inlined.
Using `__always_inline` ensures consistent behavior regardless of KCOV
configuration, preventing section mismatch warnings.

### Conclusion
This is a textbook example of a stable-appropriate fix: it solves a real
build problem, has zero functional impact, is minimal in scope, and has
essentially no risk of causing regressions. It should be backported to
stable kernels that support KCOV (4.6+) to maintain build compatibility
with coverage testing configurations.

 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


  parent reply	other threads:[~2025-08-04  0:38 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-04  0:35 [PATCH AUTOSEL 6.1 01/51] usb: xhci: print xhci->xhc_state when queue_command failed Sasha Levin
2025-08-04  0:35 ` [PATCH AUTOSEL 6.1 02/51] cpufreq: CPPC: Mark driver with NEED_UPDATE_LIMITS flag Sasha Levin
2025-08-04  0:35 ` [PATCH AUTOSEL 6.1 03/51] selftests/futex: Define SYS_futex on 32-bit architectures with 64-bit time_t Sasha Levin
2025-08-04  0:35 ` [PATCH AUTOSEL 6.1 04/51] usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default Sasha Levin
2025-08-04  0:35 ` [PATCH AUTOSEL 6.1 05/51] regulator: core: repeat voltage setting request for stepped regulators Sasha Levin
2025-08-04  0:35 ` [PATCH AUTOSEL 6.1 06/51] usb: xhci: Avoid showing warnings for dying controller Sasha Levin
2025-08-04  0:35 ` [PATCH AUTOSEL 6.1 07/51] usb: xhci: Set avg_trb_len = 8 for EP0 during Address Device Command Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 08/51] usb: xhci: Avoid showing errors during surprise removal Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 09/51] remoteproc: imx_rproc: skip clock enable when M-core is managed by the SCU Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 10/51] gpio: wcd934x: check the return value of regmap_update_bits() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 11/51] cpufreq: Exit governor when failed to start old governor Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 12/51] ARM: rockchip: fix kernel hang during smp initialization Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 13/51] PM / devfreq: governor: Replace sscanf() with kstrtoul() in set_freq_store() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 14/51] EDAC/synopsys: Clear the ECC counters on init Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 15/51] ASoC: soc-dapm: set bias_level if snd_soc_dapm_set_bias_level() was successed Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 16/51] thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when required Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 17/51] tools/nolibc: define time_t in terms of __kernel_old_time_t Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 18/51] iio: adc: ad_sigma_delta: don't overallocate scan buffer Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 19/51] gpio: tps65912: check the return value of regmap_update_bits() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 20/51] ARM: tegra: Use I/O memcpy to write to IRAM Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 21/51] tools/build: Fix s390(x) cross-compilation with clang Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 22/51] selftests: tracing: Use mutex_unlock for testing glob filter Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 23/51] ACPI: PRM: Reduce unnecessary printing to avoid user confusion Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 24/51] pwm: sifive: Fix PWM algorithm and clarify inverted compare behavior Sasha Levin
2025-08-04 10:38   ` Uwe Kleine-König
2025-08-16 13:08     ` Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 25/51] PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 26/51] thermal: sysfs: Return ENODATA instead of EAGAIN for reads Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 27/51] PM: sleep: console: Fix the black screen issue Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 28/51] ACPI: processor: fix acpi_object initialization Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 29/51] mmc: sdhci-msm: Ensure SD card power isn't ON when card removed Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 30/51] ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 31/51] pps: clients: gpio: fix interrupt handling order in remove path Sasha Levin
2025-08-04  6:56   ` Rodolfo Giometti
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 32/51] reset: brcmstb: Enable reset drivers for ARCH_BCM2835 Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 33/51] mei: bus: Check for still connected devices in mei_cl_bus_dev_release() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 34/51] mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 35/51] ALSA: hda: Handle the jack polling always via a work Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 36/51] ALSA: hda: Disable jack polling at shutdown Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 37/51] x86/bugs: Avoid warning when overriding return thunk Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 38/51] ASoC: hdac_hdmi: Rate limit logging on connection and disconnection Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 39/51] ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4 Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 40/51] ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime() Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 41/51] usb: typec: intel_pmc_mux: Defer probe if SCU IPC isn't present Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 42/51] usb: core: usb_submit_urb: downgrade type check Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 43/51] usb: typec: fusb302: fix scheduling while atomic when using virtio-gpio Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 44/51] pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop() Sasha Levin
2025-08-04  0:36 ` Sasha Levin [this message]
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 46/51] platform/chrome: cros_ec_typec: Defer probe on missing EC parent Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 47/51] ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 48/51] ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 49/51] ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 50/51] iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement Sasha Levin
2025-08-04  0:36 ` [PATCH AUTOSEL 6.1 51/51] ASoC: codecs: rt5640: Retry DEVICE_ID verification Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250804003643.3625204-45-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=hansg@kernel.org \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=kees@kernel.org \
    --cc=patches@lists.linux.dev \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox