From patchwork Fri Dec 9 02:23:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13069202 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 B0448C001B2 for ; Fri, 9 Dec 2022 02:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229719AbiLICXR (ORCPT ); Thu, 8 Dec 2022 21:23:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbiLICXQ (ORCPT ); Thu, 8 Dec 2022 21:23:16 -0500 Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0488D23168 for ; Thu, 8 Dec 2022 18:23:16 -0800 (PST) Received: by mail-qv1-xf34.google.com with SMTP id u10so2294693qvp.4 for ; Thu, 08 Dec 2022 18:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u2b/sZ9jI9aIRINGgpdUltcdiC3pzQWLssaao35HJYo=; b=ZXZThAQGCrHzd8Mtyytkv7XseMPXLiVrRNG3vwiqOggKoh72F8Jp5F6Qugq29GRXQj D8k3dbLXnLvbGULthZ47qgUPk5wqI6krXyFD+Zq65wjPjdVwCctSwivTEVOpWx5gG38v FH/RwUMEVqVEHf5DGXUl7vxkT5I44G54sKifU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u2b/sZ9jI9aIRINGgpdUltcdiC3pzQWLssaao35HJYo=; b=HgS4r/EBJzIl8URnWdMA9cQQjKne75ZVuR31BEEhVxZc+oY3qu85EiUct/6rIyA4qC 1nukTGKIeJ+SuHOBdd+oIOSqYN0/DIrcfDsRwR2lxJhRuTwV5GUGinKjCP0enluUHNaT MRTSNq0PuMASjl2TTxvUjqQy0w/G2nW5WQOHHuYKuTT2WXExiu8lPYSvTgxbnejAxsvl OPeHu/lGaqnMDNus+nRc2Poq2ndGbdJ2gjK73u4Ivv5f12N4JxYHfBZ1E0t4aa6m9FKJ p9TBVGeUvZ4e2AW9CS3ZpcL8E+gdPOQP4B7b8fMvG/95w1ecSM0kAADFpx9FXLc/LWB7 rI7Q== X-Gm-Message-State: ANoB5pndV/bvq258Ru5V9BfNuVsyK6VDpEi9sNY9bp2jYy9Yn9KSwP0N V1OaqKogpTcOTWXKzFQrcD96vQ== X-Google-Smtp-Source: AA0mqf65RSrBccsvLXFeld9BE4bVnBSw2M+c3Tj1UNSvqQs6VSchfcrA/ZaoRvme1rDcJZsB6Rz8dw== X-Received: by 2002:a05:6214:5a85:b0:4bb:62f2:e726 with SMTP id ln5-20020a0562145a8500b004bb62f2e726mr6147039qvb.42.1670552595092; Thu, 08 Dec 2022 18:23:15 -0800 (PST) Received: from joelboxx.c.googlers.com.com (228.221.150.34.bc.googleusercontent.com. [34.150.221.228]) by smtp.gmail.com with ESMTPSA id dm15-20020a05620a1d4f00b006feb0007217sm129812qkb.65.2022.12.08.18.23.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 18:23:14 -0800 (PST) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Davidlohr Bueso , Josh Triplett , "Paul E. McKenney" , rcu@vger.kernel.org, connoro@google.com Subject: [PATCH v2 2/2] locktorture: Make the rt_boost factor a tunable Date: Fri, 9 Dec 2022 02:23:05 +0000 Message-Id: <20221209022305.321149-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.39.0.rc1.256.g54fd8350bd-goog In-Reply-To: <20221209022305.321149-1-joel@joelfernandes.org> References: <20221209022305.321149-1-joel@joelfernandes.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org The rt boosting in locktorture has a factor variable s currently large enough that boosting only happens once every minute or so. Add a tunable to reduce the factor so that boosting happens more often, to test paths and arrive at failure modes earlier. With this change, I can set the factor to like 50 and have the boosting happens every 10 seconds or so. Tested with boot parameters: locktorture.torture_type=mutex_lock locktorture.onoff_interval=1 locktorture.nwriters_stress=8 locktorture.stutter=0 locktorture.rt_boost=1 locktorture.rt_boost_factor=50 locktorture.nlocks=3 Signed-off-by: Joel Fernandes (Google) Reviewed-by: Davidlohr Bueso --- kernel/locking/locktorture.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 8968fd65a90d..b64a528e511c 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -48,6 +48,7 @@ torture_param(int, stat_interval, 60, torture_param(int, stutter, 5, "Number of jiffies to run/halt test, 0=disable"); torture_param(int, rt_boost, 2, "Do periodic rt-boost. 0=Disable, 1=Only for rt_mutex, 2=For all lock types."); +torture_param(int, rt_boost_factor, 50, "A factor determining how often rt-boost happens."); torture_param(int, verbose, 1, "Enable verbose debugging printk()s"); torture_param(int, nlocks, 1, @@ -133,12 +134,12 @@ static void torture_lock_busted_write_unlock(int tid __maybe_unused) static void __torture_rt_boost(struct torture_random_state *trsp) { - const unsigned int factor = 50000; /* yes, quite arbitrary */ + const unsigned int factor = rt_boost_factor; if (!rt_task(current)) { /* - * Boost priority once every ~50k operations. When the - * task tries to take the lock, the rtmutex it will account + * Boost priority once every rt_boost_factor operations. When + * the task tries to take the lock, the rtmutex it will account * for the new priority, and do any corresponding pi-dance. */ if (trsp && !(torture_random(trsp) % @@ -148,8 +149,9 @@ static void __torture_rt_boost(struct torture_random_state *trsp) return; } else { /* - * The task will remain boosted for another ~500k operations, - * then restored back to its original prio, and so forth. + * The task will remain boosted for another 10*rt_boost_factor + * operations, then restored back to its original prio, and so + * forth. * * When @trsp is nil, we want to force-reset the task for * stopping the kthread.