From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22B5AE95A67 for ; Sun, 8 Oct 2023 00:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234215AbjJHAuJ (ORCPT ); Sat, 7 Oct 2023 20:50:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234313AbjJHAtr (ORCPT ); Sat, 7 Oct 2023 20:49:47 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEA18D48; Sat, 7 Oct 2023 17:49:27 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57998C433CB; Sun, 8 Oct 2023 00:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696726167; bh=MaUCKvfjkEyRWJL8+AEXbnDxd2bXHVdvql91up3CKqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bMGI2PY5f++vOMGyKBMqRnfhWFziqhyBV8ZnUTm2M8cMGYmkMNuQZJ80Azof+JOHg iONpjvdjSjaVI3nMWqvj08yAkG++vG0F5EMIiKns99jRA9FSBc53zknNli2Gx4sl25 nOuSpmOkPRAwvH8IyRSSJLmXnOrAt7p2UKpLifdmlqJSXe3//V9e40OsQlACORJ/3y Z3SOIfwi8wV/NMpxaWZ3DUQFuD90babK0kL82hyVpMxv7+ObiKMnEHrSJkonPXKIrI NemyxqPippENvAVG39mR2lS2r/OWoulry5pjj19euAHlTUMIElNOTCZ/XmeYoO818w rb7MVG6/dBVtQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Masami Hiramatsu , Atish Patra , Steven Rostedt , Sasha Levin , linux-trace-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 18/18] tracing: relax trace_event_eval_update() execution with cond_resched() Date: Sat, 7 Oct 2023 20:48:52 -0400 Message-Id: <20231008004853.3767621-18-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231008004853.3767621-1-sashal@kernel.org> References: <20231008004853.3767621-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.6 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Clément Léger [ Upstream commit 23cce5f25491968b23fb9c399bbfb25f13870cd9 ] When kernel is compiled without preemption, the eval_map_work_func() (which calls trace_event_eval_update()) will not be preempted up to its complete execution. This can actually cause a problem since if another CPU call stop_machine(), the call will have to wait for the eval_map_work_func() function to finish executing in the workqueue before being able to be scheduled. This problem was observe on a SMP system at boot time, when the CPU calling the initcalls executed clocksource_done_booting() which in the end calls stop_machine(). We observed a 1 second delay because one CPU was executing eval_map_work_func() and was not preempted by the stop_machine() task. Adding a call to cond_resched() in trace_event_eval_update() allows other tasks to be executed and thus continue working asynchronously like before without blocking any pending task at boot time. Link: https://lore.kernel.org/linux-trace-kernel/20230929191637.416931-1-cleger@rivosinc.com Cc: Masami Hiramatsu Signed-off-by: Clément Léger Tested-by: Atish Patra Reviewed-by: Atish Patra Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace_events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 0cf84a7449f5b..9841589b4af7f 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2777,6 +2777,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) update_event_fields(call, map[i]); } } + cond_resched(); } up_write(&trace_event_sem); } -- 2.40.1