Commit b89df13a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Wen Zhiwei
Browse files

kcov: mark in_softirq_really() as __always_inline 

stable inclusion
from stable-v6.6.70
commit edc8ece96c11c89de82e400488b44772b0efb157
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=edc8ece96c11c89de82e400488b44772b0efb157

--------------------------------

commit cb0ca08b326aa03f87fe94bb91872ce8d2ef1ed8 upstream.

If gcc decides not to inline in_softirq_really(), objtool warns about a
function call with UACCESS enabled:

kernel/kcov.o: warning: objtool: __sanitizer_cov_trace_pc+0x1e: call to in_softirq_really() with UACCESS enabled
kernel/kcov.o: warning: objtool: check_kcov_mode+0x11: call to in_softirq_really() with UACCESS enabled

Mark this as __always_inline to avoid the problem.

Link: https://lkml.kernel.org/r/20241217071814.2261620-1-arnd@kernel.org


Fixes: 7d4df2dad312 ("kcov: properly check for softirq context")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Cc: Aleksandr Nogikh <nogikh@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent c2d56e65

kernel/kcov.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void kcov_remote_area_put(struct kcov_remote_area *area, 
 * Unlike in_serving_softirq(), this function returns false when called during

 * a hardirq or an NMI that happened in the softirq context.

 */

static inline bool in_softirq_really(void)

static __always_inline bool in_softirq_really(void)

{

	return in_serving_softirq() && !in_hardirq() && !in_nmi();

}