From patchwork Sun May 28 05:17:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 99879 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp798878vqr; Sun, 28 May 2023 00:30:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70kT9LT01UDIUKf99vsEHLhoSXwhr6H3CTW/Kx3cmAemJWPU/DiYMQUQ77GQAg0MmQ41Dw X-Received: by 2002:a05:6a20:8f21:b0:103:7b36:f21 with SMTP id b33-20020a056a208f2100b001037b360f21mr4906611pzk.21.1685259009858; Sun, 28 May 2023 00:30:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685259009; cv=none; d=google.com; s=arc-20160816; b=a9IDOEqRPhuH+PwqrwUWgol/wJNWQ/2YmMV0fR4fKfEiJsQtj8w6XV/kU+1J3omN9d COP8esl8/BHWPh1qtiCV/r26H0NRr8etKvM7dp3OUzM0l46avplG4M+DfEvCR2lfR++p TG0GabNlogImhocVtA3lA6uNe7u1GE8YO7ghTI90FQHGhOnuCgPZEXox1lSE3pPa5yRg 5lp5kW7vb9+o6EzO5+SAAENmV6tXbhhQY9eF39lLhUCFxNnanEhR/619UwBlGIYLnpj9 0tudGRqhxja/mOU2zO/Das1AzzFLrZ18rTdkhSkmznowESGKxQZMMsIRIFIDMztH3/GZ 3GbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=KlygrmbP+qlojYjIIJj5nQYRhgEpwTCRA0ozDPtuf2Q=; b=YP67CFCeLSILSpGuO5NQcbHLBxfQb4YEJQDDYuas7ewkSCGXvqP6G4yG3ZneyIegWl 9xL+VgSYqlAJsbRC97ssH22KTSvRSa6JGAPYqrtKUZPjpHjXJ9H2m/Nl6pf8YTc0q0o+ b2Cnw/zDChGQSkT+sKoO4dLBrLGvBDLL9tVMW9eW1mji7zYi6kFSjdaxNfsajmP+jRoN w0ZZKxZwECTtbUSF0bz94TL6XhqsK1eadaZzLgpSZ/dDNSO7NpJvg7F2QWVgT/vwO1Ge WqCarnwrh83SPEmAYclAxZlWufet7M1jn9dEHRkQc5gFFuKSR6MLEdnBTZSR1dGCBz2e 2HMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m22-20020a637116000000b0053f2fc4379csi753735pgc.391.2023.05.28.00.29.57; Sun, 28 May 2023 00:30:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229496AbjE1F07 (ORCPT + 99 others); Sun, 28 May 2023 01:26:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjE1F0r (ORCPT ); Sun, 28 May 2023 01:26:47 -0400 Received: from mammoth.local.home (cpe-172-100-189-27.stny.res.rr.com [172.100.189.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AEE8CDC; Sat, 27 May 2023 22:26:40 -0700 (PDT) Received: by mammoth.local.home (Postfix, from userid 5657) id C1A87300A64; Sun, 28 May 2023 01:17:53 -0400 (EDT) From: Steven Rostedt To: LKML , Linux trace kernel Cc: Masami Hiramatsu , Mark Rutland , "Steven Rostedt (Google)" Subject: [PATCH 2/5] tracing: Have tracer selftests call cond_resched() before running Date: Sun, 28 May 2023 01:17:39 -0400 Message-Id: <20230528051742.1325503-3-rostedt@goodmis.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230528051742.1325503-1-rostedt@goodmis.org> References: <20230528051742.1325503-1-rostedt@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, PDS_RDNS_DYNAMIC_FP,RCVD_IN_PBL,RDNS_DYNAMIC,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767122151583426370?= X-GMAIL-MSGID: =?utf-8?q?1767122151583426370?= From: "Steven Rostedt (Google)" As there are more and more internal selftests being added to the Linux kernel (KSAN, lockdep, etc) the selftests are taking longer to run when these are enabled. Add a cond_resched() to the calling of do_run_tracer_selftest() to force a schedule if NEED_RESCHED is set, otherwise the soft lockup watchdog may trigger on boot up. Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 87e5920b141f..70f2b511b9cd 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2045,6 +2045,13 @@ static int do_run_tracer_selftest(struct tracer *type) { int ret; + /* + * Tests can take a long time, especially if they are run one after the + * other, as does happen during bootup when all the tracers are + * registered. This could cause the soft lockup watchdog to trigger. + */ + cond_resched(); + tracing_selftest_running = true; ret = run_tracer_selftest(type); tracing_selftest_running = false;