Commit ab8ad279 authored May 04, 2020 by Daniel Thompson Committed by Will Deacon May 05, 2020

arm64: cacheflush: Fix KGDB trap detection

flush_icache_range() contains a bodge to avoid issuing IPIs when the kgdb
trap handler is running because issuing IPIs is unsafe (and not needed)
in this execution context. However the current test, based on
kgdb_connected is flawed: it both over-matches and under-matches.

The over match occurs because kgdb_connected is set when gdb attaches
to the stub and remains set during normal running. This is relatively
harmelss because in almost all cases irq_disabled() will be false.

The under match is more serious. When kdb is used instead of kgdb to access
the debugger then kgdb_connected is not set in all the places that the
debug core updates sw breakpoints (and hence flushes the icache). This
can lead to deadlock.

Fix by replacing the ad-hoc check with the proper kgdb macro. This also
allows us to drop the #ifdef wrapper.

Fixes: 3b8c9f1c ("arm64: IPI each CPU after invalidating the I-cache for kernel mappings")
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20200504170518.2959478-1-daniel.thompson@linaro.org

Signed-off-by: Will Deacon <will@kernel.org>

parent da7bad98

arch/arm64/include/asm/cacheflush.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ static inline void flush_icache_range(unsigned long start, unsigned long end)
		* IPI all online CPUs so that they undergo a context synchronization
		* event and are forced to refetch the new instructions.
		*/
		#ifdef CONFIG_KGDB

		/*
		* KGDB performs cache maintenance with interrupts disabled, so we
		* will deadlock trying to IPI the secondary CPUs. In theory, we can
		@@ -89,9 +89,9 @@ static inline void flush_icache_range(unsigned long start, unsigned long end)
		* the patching operation, so we don't need extra IPIs here anyway.
		* In which case, add a KGDB-specific bodge and return early.
		*/
		if (kgdb_connected && irqs_disabled())
		if (in_dbg_master())
		return;
		#endif

		kick_all_cpus_sync();
		}

Admin message