linux-stable.git/kernel, branch v6.4.4

watch_queue: prevent dangling pipe pointer

2023-07-19T14:36:53+00:00

commit 943211c87427f25bd22e0e63849fb486bb5f87fa upstream.

NULL the dangling pipe reference while clearing watch_queue.

If not done, a reference to a freed pipe remains in the watch_queue,
as this function is called before freeing a pipe in free_pipe_info()
(see line 834 of fs/pipe.c).

The sole use of wqueue->defunct is for checking if the watch queue has
been cleared, but wqueue->pipe is also NULLed while clearing.

Thus, wqueue->defunct is superfluous, as wqueue->pipe can be checked
for NULL. Hence, the former can be removed.

Tested with keyutils testsuite.

Cc: stable@vger.kernel.org # 6.1
Signed-off-by: Siddh Raman Pant 
Acked-by: David Howells 
Message-Id: <20230605143616.640517-1-code@siddh.me>
Signed-off-by: Christian Brauner 
Signed-off-by: Greg Kroah-Hartman

bpf, btf: Warn but return no error for NULL btf from __register_btf_kfunc_id_set()

2023-07-19T14:36:47+00:00

[ Upstream commit 3de4d22cc9ac7c9f38e10edcf54f9a8891a9c2aa ]

__register_btf_kfunc_id_set() assumes .BTF to be part of the module's .ko
file if CONFIG_DEBUG_INFO_BTF is enabled. If that's not the case, the
function prints an error message and return an error. As a result, such
modules cannot be loaded.

However, the section could be stripped out during a build process. It would
be better to let the modules loaded, because their basic functionalities
have no problem [0], though the BTF functionalities will not be supported.
Make the function to lower the level of the message from error to warn, and
return no error.

  [0] https://lore.kernel.org/bpf/20220219082037.ow2kbq5brktf4f2u@apollo.legion

Fixes: c446fdacb10d ("bpf: fix register_btf_kfunc_id_set for !CONFIG_DEBUG_INFO_BTF")
Reported-by: Alexander Egorenkov 
Suggested-by: Kumar Kartikeya Dwivedi 
Signed-off-by: SeongJae Park 
Signed-off-by: Daniel Borkmann 
Acked-by: Jiri Olsa 
Link: https://lore.kernel.org/bpf/87y228q66f.fsf@oc8242746057.ibm.com
Link: https://lore.kernel.org/bpf/20220219082037.ow2kbq5brktf4f2u@apollo.legion
Link: https://lore.kernel.org/bpf/20230701171447.56464-1-sj@kernel.org
Signed-off-by: Sasha Levin

kcsan: Don't expect 64 bits atomic builtins from 32 bits architectures

2023-07-19T14:36:13+00:00

[ Upstream commit 353e7300a1db928e427462f2745f9a2cd1625b3d ]

Activating KCSAN on a 32 bits architecture leads to the following
link-time failure:

    LD      .tmp_vmlinux.kallsyms1
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_load':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_load_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_store':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_store_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_exchange':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_exchange_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_add':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_add_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_sub':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_sub_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_and':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_and_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_or':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_or_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_xor':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_xor_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_nand':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_nand_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_strong':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_weak':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
  powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_val':
  kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'

32 bits architectures don't have 64 bits atomic builtins. Only
include DEFINE_TSAN_ATOMIC_OPS(64) on 64 bits architectures.

Fixes: 0f8ad5f2e934 ("kcsan: Add support for atomic builtins")
Suggested-by: Marco Elver 
Signed-off-by: Christophe Leroy 
Reviewed-by: Marco Elver 
Acked-by: Marco Elver 
Signed-off-by: Michael Ellerman 
Link: https://msgid.link/d9c6afc28d0855240171a4e0ad9ffcdb9d07fceb.1683892665.git.christophe.leroy@csgroup.eu
Signed-off-by: Sasha Levin

watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails

2023-07-19T14:35:33+00:00

[ Upstream commit 9ec272c586b07d1abf73438524bd12b1df9c5f9b ]

Patch series "watchdog: Cleanup / fixes after buddy series v5 reviews".

This patch series attempts to finish resolving the feedback received
from Petr Mladek on the v5 series I posted.

Probably the only thing that wasn't fully as clean as Petr requested was
the Kconfig stuff.  I couldn't find a better way to express it without a
more major overhaul.  In the very least, I renamed "NON_ARCH" to
"PERF_OR_BUDDY" in the hopes that will make it marginally better.

Nothing in this series is terribly critical and even the bugfixes are
small.  However, it does cleanup a few things that were pointed out in
review.

This patch (of 10):

The permissions for the kernel.nmi_watchdog sysctl have always been set at
compile time despite the fact that a watchdog can fail to probe.  Let's
fix this and set the permissions based on whether the hardlockup detector
actually probed.

Link: https://lkml.kernel.org/r/20230527014153.2793931-1-dianders@chromium.org
Link: https://lkml.kernel.org/r/20230526184139.1.I0d75971cc52a7283f495aac0bd5c3041aadc734e@changeid
Fixes: a994a3147e4c ("watchdog/hardlockup/perf: Implement init time detection of perf")
Signed-off-by: Douglas Anderson 
Reported-by: Petr Mladek 
Closes: https://lore.kernel.org/r/ZHCn4hNxFpY5-9Ki@alley
Reviewed-by: Petr Mladek 
Cc: Christophe Leroy 
Cc: "David S. Miller" 
Cc: Michael Ellerman 
Cc: Nicholas Piggin 
Signed-off-by: Andrew Morton 
Signed-off-by: Sasha Levin

watchdog/perf: adapt the watchdog_perf interface for async model

2023-07-19T14:35:33+00:00

[ Upstream commit 930d8f8dbab97cb05dba30e67a2dfa0c6dbf4bc7 ]

When lockup_detector_init()->watchdog_hardlockup_probe(), PMU may be not
ready yet.  E.g.  on arm64, PMU is not ready until
device_initcall(armv8_pmu_driver_init).  And it is deeply integrated with
the driver model and cpuhp.  Hence it is hard to push this initialization
before smp_init().

But it is easy to take an opposite approach and try to initialize the
watchdog once again later.  The delayed probe is called using workqueues.
It need to allocate memory and must be proceed in a normal context.  The
delayed probe is able to use if watchdog_hardlockup_probe() returns
non-zero which means the return code returned when PMU is not ready yet.

Provide an API - lockup_detector_retry_init() for anyone who needs to
delayed init lockup detector if they had ever failed at
lockup_detector_init().

The original assumption is: nobody should use delayed probe after
lockup_detector_check() which has __init attribute.  That is, anyone uses
this API must call between lockup_detector_init() and
lockup_detector_check(), and the caller must have __init attribute

Link: https://lkml.kernel.org/r/20230519101840.v5.16.If4ad5dd5d09fb1309cebf8bcead4b6a5a7758ca7@changeid
Reviewed-by: Petr Mladek 
Co-developed-by: Pingfan Liu 
Signed-off-by: Pingfan Liu 
Signed-off-by: Lecopzer Chen 
Signed-off-by: Douglas Anderson 
Suggested-by: Petr Mladek 
Cc: Andi Kleen 
Cc: Catalin Marinas 
Cc: Chen-Yu Tsai 
Cc: Christophe Leroy 
Cc: Colin Cross 
Cc: Daniel Thompson 
Cc: "David S. Miller" 
Cc: Guenter Roeck 
Cc: Ian Rogers 
Cc: Marc Zyngier 
Cc: Mark Rutland 
Cc: Masayoshi Mizuma 
Cc: Matthias Kaehlcke 
Cc: Michael Ellerman 
Cc: Nicholas Piggin 
Cc: Randy Dunlap 
Cc: "Ravi V. Shankar" 
Cc: Ricardo Neri 
Cc: Stephane Eranian 
Cc: Stephen Boyd 
Cc: Sumit Garg 
Cc: Tzung-Bi Shih 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Stable-dep-of: 9ec272c586b0 ("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails")
Signed-off-by: Sasha Levin

watchdog/hardlockup: rename some "NMI watchdog" constants/function

2023-07-19T14:35:32+00:00

[ Upstream commit df95d3085caa5b99a60eb033d7ad6c2ff2b43dbf ]

Do a search and replace of:
- NMI_WATCHDOG_ENABLED => WATCHDOG_HARDLOCKUP_ENABLED
- SOFT_WATCHDOG_ENABLED => WATCHDOG_SOFTOCKUP_ENABLED
- watchdog_nmi_ => watchdog_hardlockup_
- nmi_watchdog_available => watchdog_hardlockup_available
- nmi_watchdog_user_enabled => watchdog_hardlockup_user_enabled
- soft_watchdog_user_enabled => watchdog_softlockup_user_enabled
- NMI_WATCHDOG_DEFAULT => WATCHDOG_HARDLOCKUP_DEFAULT

Then update a few comments near where names were changed.

This is specifically to make it less confusing when we want to introduce
the buddy hardlockup detector, which isn't using NMIs.  As part of this,
we sanitized a few names for consistency.

[trix@redhat.com: make variables static]
  Link: https://lkml.kernel.org/r/20230525162822.1.I0fb41d138d158c9230573eaa37dc56afa2fb14ee@changeid
Link: https://lkml.kernel.org/r/20230519101840.v5.12.I91f7277bab4bf8c0cb238732ed92e7ce7bbd71a6@changeid
Signed-off-by: Douglas Anderson 
Signed-off-by: Tom Rix 
Reviewed-by: Tom Rix 
Cc: Andi Kleen 
Cc: Catalin Marinas 
Cc: Chen-Yu Tsai 
Cc: Christophe Leroy 
Cc: Colin Cross 
Cc: Daniel Thompson 
Cc: "David S. Miller" 
Cc: Guenter Roeck 
Cc: Ian Rogers 
Cc: Lecopzer Chen 
Cc: Marc Zyngier 
Cc: Mark Rutland 
Cc: Masayoshi Mizuma 
Cc: Matthias Kaehlcke 
Cc: Michael Ellerman 
Cc: Nicholas Piggin 
Cc: Petr Mladek 
Cc: Pingfan Liu 
Cc: Randy Dunlap 
Cc: "Ravi V. Shankar" 
Cc: Ricardo Neri 
Cc: Stephane Eranian 
Cc: Stephen Boyd 
Cc: Sumit Garg 
Cc: Tzung-Bi Shih 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Stable-dep-of: 9ec272c586b0 ("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails")
Signed-off-by: Sasha Levin

watchdog/hardlockup: move perf hardlockup checking/panic to common watchdog.c

2023-07-19T14:35:32+00:00

[ Upstream commit 81972551df9d168a8183b786ff4de06008469c2e ]

The perf hardlockup detector works by looking at interrupt counts and
seeing if they change from run to run.  The interrupt counts are managed
by the common watchdog code via its watchdog_timer_fn().

Currently the API between the perf detector and the common code is a
function: is_hardlockup().  When the hard lockup detector sees that
function return true then it handles printing out debug info and inducing
a panic if necessary.

Let's change the API a little bit in preparation for the buddy hardlockup
detector.  The buddy hardlockup detector wants to print nearly the same
debug info and have nearly the same panic behavior.  That means we want to
move all that code to the common file.  For now, the code in the common
file will only be there if the perf hardlockup detector is enabled, but
eventually it will be selected by a common config.

Right now, this _just_ moves the code from the perf detector file to the
common file and changes the names.  It doesn't make the changes that the
buddy hardlockup detector will need and doesn't do any style cleanups.  A
future patch will do cleanup to make it more obvious what changed.

With the above, we no longer have any callers of is_hardlockup() outside
of the "watchdog.c" file, so we can remove it from the header, make it
static, and move it to the same "#ifdef" block as our new
watchdog_hardlockup_check().  While doing this, it can be noted that even
if no hardlockup detectors were configured the existing code used to still
have the code for counting/checking "hrtimer_interrupts" even if the perf
hardlockup detector wasn't configured.  We didn't need to do that, so move
all the "hrtimer_interrupts" counting to only be there if the perf
hardlockup detector is configured as well.

This change is expected to be a no-op.

Link: https://lkml.kernel.org/r/20230519101840.v5.8.Id4133d3183e798122dc3b6205e7852601f289071@changeid
Signed-off-by: Douglas Anderson 
Reviewed-by: Petr Mladek 
Cc: Andi Kleen 
Cc: Catalin Marinas 
Cc: Chen-Yu Tsai 
Cc: Christophe Leroy 
Cc: Colin Cross 
Cc: Daniel Thompson 
Cc: "David S. Miller" 
Cc: Guenter Roeck 
Cc: Ian Rogers 
Cc: Lecopzer Chen 
Cc: Marc Zyngier 
Cc: Mark Rutland 
Cc: Masayoshi Mizuma 
Cc: Matthias Kaehlcke 
Cc: Michael Ellerman 
Cc: Nicholas Piggin 
Cc: Pingfan Liu 
Cc: Randy Dunlap 
Cc: "Ravi V. Shankar" 
Cc: Ricardo Neri 
Cc: Stephane Eranian 
Cc: Stephen Boyd 
Cc: Sumit Garg 
Cc: Tzung-Bi Shih 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Stable-dep-of: 9ec272c586b0 ("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails")
Signed-off-by: Sasha Levin

watchdog/hardlockup: change watchdog_nmi_enable() to void

2023-07-19T14:35:32+00:00

[ Upstream commit 730211182ed083898fa5feb4b28459ffac4c9615 ]

Nobody cares about the return value of watchdog_nmi_enable(), changing its
prototype to void.

Link: https://lkml.kernel.org/r/20230519101840.v5.4.Ic3a19b592eb1ac4c6f6eade44ffd943e8637b6e5@changeid
Signed-off-by: Pingfan Liu 
Signed-off-by: Lecopzer Chen 
Signed-off-by: Douglas Anderson 
Reviewed-by: Petr Mladek 
Acked-by: Nicholas Piggin 
Cc: Andi Kleen 
Cc: Catalin Marinas 
Cc: Chen-Yu Tsai 
Cc: Christophe Leroy 
Cc: Colin Cross 
Cc: Daniel Thompson 
Cc: "David S. Miller" 
Cc: Guenter Roeck 
Cc: Ian Rogers 
Cc: Marc Zyngier 
Cc: Mark Rutland 
Cc: Masayoshi Mizuma 
Cc: Matthias Kaehlcke 
Cc: Michael Ellerman 
Cc: Randy Dunlap 
Cc: "Ravi V. Shankar" 
Cc: Ricardo Neri 
Cc: Stephane Eranian 
Cc: Stephen Boyd 
Cc: Sumit Garg 
Cc: Tzung-Bi Shih 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Stable-dep-of: 9ec272c586b0 ("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails")
Signed-off-by: Sasha Levin

watchdog: remove WATCHDOG_DEFAULT

2023-07-19T14:35:32+00:00

[ Upstream commit 810b560e8985725dbd57bbb3f188c231365eb5ae ]

No reference to WATCHDOG_DEFAULT, remove it.

Link: https://lkml.kernel.org/r/20230519101840.v5.3.I6a729209a1320e0ad212176e250ff945b8f91b2a@changeid
Signed-off-by: Pingfan Liu 
Signed-off-by: Lecopzer Chen 
Signed-off-by: Douglas Anderson 
Reviewed-by: Petr Mladek 
Cc: Andi Kleen 
Cc: Catalin Marinas 
Cc: Chen-Yu Tsai 
Cc: Christophe Leroy 
Cc: Colin Cross 
Cc: Daniel Thompson 
Cc: "David S. Miller" 
Cc: Guenter Roeck 
Cc: Ian Rogers 
Cc: Marc Zyngier 
Cc: Mark Rutland 
Cc: Masayoshi Mizuma 
Cc: Matthias Kaehlcke 
Cc: Michael Ellerman 
Cc: Nicholas Piggin 
Cc: Randy Dunlap 
Cc: "Ravi V. Shankar" 
Cc: Ricardo Neri 
Cc: Stephane Eranian 
Cc: Stephen Boyd 
Cc: Sumit Garg 
Cc: Tzung-Bi Shih 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Stable-dep-of: 9ec272c586b0 ("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails")
Signed-off-by: Sasha Levin

bpf: Verify scalar ids mapping in regsafe() using check_ids()

2023-07-19T14:35:29+00:00

[ Upstream commit 1ffc85d9298e0ca0137ba65c93a786143fe167b8 ]

Make sure that the following unsafe example is rejected by verifier:

1: r9 = ... some pointer with range X ...
2: r6 = ... unbound scalar ID=a ...
3: r7 = ... unbound scalar ID=b ...
4: if (r6 > r7) goto +1
5: r6 = r7
6: if (r6 > X) goto ...