From patchwork Mon Jul 17 18:20:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121538 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1280687vqt; Mon, 17 Jul 2023 11:38:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlGueJmr/7WJqGxvqTWjBYwg5D22Edmd0eztP3yUSPA9bfUQn/G1V5J+Ugezl8h2Ec1e/fXr X-Received: by 2002:a17:902:ec85:b0:1b5:5a5f:368a with SMTP id x5-20020a170902ec8500b001b55a5f368amr15216582plg.27.1689619120089; Mon, 17 Jul 2023 11:38:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689619120; cv=none; d=google.com; s=arc-20160816; b=qIVDFIdBeSbc/KnDNe8tWBklf2JTQG+3BbBUgADkgPxYozMikk57L9Psy5CEnC5r/Y 494OjVTFefh/jTUTE2ULOWnOxbUJlMc6lJ32RRviKL4qnk1k4gaHAyMqLIRnYsd1fdUG j/ILHbNhaoX/EUNUbgbnOXR/lSHRH1QtGhDeXkltBnYOw8rrOeWO7ektBxfs53+HOJdm ezgc72UeD286rjiOfomHm0JpzfqbbkbiBFS3YcQEQBHUW+qhvEnPXJjvsy9nMF2Y0lzQ 9mdIriApbB2wzZVctw08Dbwb66OPO9GFIojqacv8TtgQhbx9iYhwh30tIu4jOapLxX5D iFvA== 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 :dkim-signature; bh=9X6/zBwH6bLrwoTbJpAd0orwvTd8lFRT0MOqwtGf/Z0=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=vdDB9/xfcBKqqchq0fIHAWo+/TGsIVAHdIe8DbnFtjUVz+Ki/IzmxHt/IPL2XxR4PF /HXLSlIHvaxUTfSKSSDSeFO2Ky7HOZ8+OV1uXPfuA5Ag5wX+gkhlAtgkchQz6y+2tKeB 1xQzG8NX1dZEHp+2t+JeQpjr7A4N9ufokHRVgqSnfNHIRYLBkvmY2X1pESTw8TaYXNin ipm2CVY2PpCFGrkhZ/dniFpDSYn+DkJhcFCEU568fmzttD5SQUYxNOLJKL0hhi1IsyeI kcuTvUwf1eUkikixWRezo50aV0GhgzoScqUBIIwJJC3CQmzKfEmDTNahMUHbIRZMdyLe 5tVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ntGTK4Mr; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z12-20020a170902d54c00b001b9ea391af9si252650plf.229.2023.07.17.11.38.26; Mon, 17 Jul 2023 11:38:40 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ntGTK4Mr; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231532AbjGQSUs (ORCPT + 99 others); Mon, 17 Jul 2023 14:20:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbjGQSUr (ORCPT ); Mon, 17 Jul 2023 14:20:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3D9C10D8; Mon, 17 Jul 2023 11:20:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 75742611D4; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D529AC433C7; Mon, 17 Jul 2023 18:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618043; bh=9N1zqkCJH9SNDZWV9ht6RHlfnWm8AY70Ut+G1/Medxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ntGTK4Mrf1jtLI7Q9eH7uIuHF9R9DVeH/IdbtxBupgd7RiHAmlQ1jYMpPva1d3IEV 57vbKFGHgjGrvxsAyK4Bw/oRn7eIIqgaVpxYEGaLXn12ejGNU8Tp3CP71HdhNt7ROK BQyOKUdZDEkmVHZateVDNVohqzi62Z06/KJVXr+9k2TuPFgFg5Q6WjlkcMrOEgVFBk shLGvrzTfS03ghw9qtZ2d/+JfFGmhiu1uKy2UzoAmAujAHDKUW+W++ixJsvBtF7Zfn lnqsO0Jz8Ik8kAxu4Xf3BTLdz8ZT4kMWgyYfmQievGiwiKTq8QkSBvaJVSdX26SeI1 duixVXVgLvpdg== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 8C099CE03F1; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 1/9] rcutorture: Dump grace-period state upon rtort_pipe_count incidents Date: Mon, 17 Jul 2023 11:20:34 -0700 Message-Id: <20230717182042.1098651-1-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771694058246127975 X-GMAIL-MSGID: 1771694058246127975 The rtort_pipe_count WARN() indicates that grace periods were unable to invoke all callbacks during a stutter_wait() interval. But it is sometimes helpful to have a bit more information as to why. This commit therefore invokes show_rcu_gp_kthreads() immediately before that WARN() in order to dump out some relevant information. Signed-off-by: Paul E. McKenney --- kernel/rcu/rcutorture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 147551c23baf..d291a1438c30 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -1581,6 +1581,7 @@ rcu_torture_writer(void *arg) rcu_access_pointer(rcu_torture_current) != &rcu_tortures[i]) { tracing_off(); + show_rcu_gp_kthreads(); WARN(1, "%s: rtort_pipe_count: %d\n", __func__, rcu_tortures[i].rtort_pipe_count); rcu_ftrace_dump(DUMP_ALL); } From patchwork Mon Jul 17 18:20:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1275700vqt; Mon, 17 Jul 2023 11:27:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlESeFUeeMlZcn0ZUINa8zxZexd7ATi5MX3pWGQMmltJL0AQxl4gSiqTnKwphcZRJCKuZTcC X-Received: by 2002:a17:906:248:b0:994:569b:61b6 with SMTP id 8-20020a170906024800b00994569b61b6mr8725911ejl.40.1689618458494; Mon, 17 Jul 2023 11:27:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618458; cv=none; d=google.com; s=arc-20160816; b=qOXa64Xi2QPhlONIEPszxr+IE1fcJ70ZxQ9GblBKJBlwcNjTv28cjWBGUdRWQrGrtC FMP09izH8TZXciUIS67MGywYLBxTFxm//wvtmdO3ytoTQRin7Mvg2QivAN6vypMzO4eu PZMYrif+Fml2EK1zOK/uXSESNSGg9MnQlt5cSggW9lxfUv5VJCZ5XckIsjvGT+4+pDbz wuGmVqoTcvcz2t26RW6PRdJes1mQN6zYZPqqyK8BwBsY09Y9lCp1BoIotNbBBGa4lMhX gTgZZBM5SZ2luM67dPtisgUbTTevATohgRaLsBdYw9eaoGveI0i5sY4ox5VWzULIcAop wkqA== 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 :dkim-signature; bh=+Xdr+8ArF8mYQtP9ZX9MphpnTxibVhsDJtXDrEZlRPQ=; fh=QB9BtlWCWihiEDvgm6oHKo0NH0a95BBYSyQmRFK3G6Y=; b=mqN+zXEjJyFoD8a3Nlpfn5hSl9Hxlvc6fEZH3swS+Ag9RolA6jBA0PgjeFsC7AatUx YkGpqvJ/1qX7RSimpIUHr3z+vaHaczhFU7u+cjeifh4S/ncM8XtHPDpq0++KLhu+rW+t FbzwI0EZZYJsISZyyGxOLcpa3+BERyj4b7j8THfHFmjFWbDd3d0SFcF9Ys6+ppRxm2D5 ut6iqpTjESRJI5BXow0VBCAtAAtI/fQ+s7M7MEj8Y9xdoUmKw7hXJ/0AFHNjmAnUbPQz LmoxbL8G6Bl/T6sQ3M/H+wzSD8GfAkg61nhYG9JtbzsVI01rhbvFmJaLIDyyXsGmRrJ2 ozZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r4JwDIU2; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w27-20020a170906481b00b00988dd4c5e2asi14983ejq.404.2023.07.17.11.27.13; Mon, 17 Jul 2023 11:27:38 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r4JwDIU2; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231781AbjGQSUy (ORCPT + 99 others); Mon, 17 Jul 2023 14:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231391AbjGQSUs (ORCPT ); Mon, 17 Jul 2023 14:20:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 282608E; Mon, 17 Jul 2023 11:20:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8AC19611E7; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2389C433C9; Mon, 17 Jul 2023 18:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618043; bh=2Slt+IrSEDPTRvcods8x8gQpC5P9QCC5UcNVjkmH36M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r4JwDIU2WkXnsck6qwzLK6vpNYgskw2MPjWEXN07ysKStgn6bit89R2rMW/er603p Hf885dbVtRykn2Hfodigm5Da9iRLzDgRdmKr1pm3N56kA9VCsXDc5CelNy5EfKMsQu ZRqnOCqVlmSJe41TeRVCWDS3xZlqbdHs/P5/XZOKMYlFSw2k+k1CuuvOUiwgDOe7tS S2ySKhZRZFhJx8UzHTf37vMO+8xSTvB0OCeKbwrZsP9A2Prdx22y4+rqGLxwBl69Li vgtqOkRLA5q6DWJw0Q+apyAG/OA/ck/G9iEnEl8oDT7NyUDP6xrGikkXR15LCHGrsS vc5GebhHI7x6g== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 8DF9ECE04CD; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, Connor O'Brien , "Paul E. McKenney" , Josh Triplett , Joel Fernandes , Juri Lelli , Valentin Schneider , Dietmar Eggemann , kernel-team@android.com, John Stultz , Davidlohr Bueso Subject: [PATCH rcu 2/9] torture: Support randomized shuffling for proxy exec testing Date: Mon, 17 Jul 2023 11:20:35 -0700 Message-Id: <20230717182042.1098651-2-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693364528500114 X-GMAIL-MSGID: 1771693364528500114 From: Connor O'Brien Currently shuffling sets the same cpu affinities for all tasks, which makes us less likely to hit paths involving migrating blocked tasks onto a cpu where they can't run. This patch adds an element of randomness to allow affinities of different writer tasks to diverge. This has helped uncover issues in testing with Proxy Execution Cc: "Paul E. McKenney" Cc: Josh Triplett Cc: Joel Fernandes Cc: Juri Lelli Cc: Valentin Schneider Cc: Dietmar Eggemann Cc: kernel-team@android.com Signed-off-by: Connor O'Brien Signed-off-by: John Stultz Acked-by: Davidlohr Bueso Signed-off-by: Paul E. McKenney --- kernel/torture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/torture.c b/kernel/torture.c index 1a0519b836ac..8be83fdc6be1 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -54,6 +54,9 @@ module_param(verbose_sleep_frequency, int, 0444); static int verbose_sleep_duration = 1; module_param(verbose_sleep_duration, int, 0444); +static int random_shuffle; +module_param(random_shuffle, int, 0444); + static char *torture_type; static int verbose; @@ -518,6 +521,7 @@ static void torture_shuffle_task_unregister_all(void) */ static void torture_shuffle_tasks(void) { + DEFINE_TORTURE_RANDOM(rand); struct shuffle_task *stp; cpumask_setall(shuffle_tmp_mask); @@ -537,8 +541,10 @@ static void torture_shuffle_tasks(void) cpumask_clear_cpu(shuffle_idle_cpu, shuffle_tmp_mask); mutex_lock(&shuffle_task_mutex); - list_for_each_entry(stp, &shuffle_task_list, st_l) - set_cpus_allowed_ptr(stp->st_t, shuffle_tmp_mask); + list_for_each_entry(stp, &shuffle_task_list, st_l) { + if (!random_shuffle || torture_random(&rand) & 0x1) + set_cpus_allowed_ptr(stp->st_t, shuffle_tmp_mask); + } mutex_unlock(&shuffle_task_mutex); cpus_read_unlock(); From patchwork Mon Jul 17 18:20:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1275564vqt; Mon, 17 Jul 2023 11:27:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlEfGXZYlo8wy/0LWBIrcZTF+3qU+tUTWWGqBPfqVJBA/4SZTIW6euVvQb3iTngGvUb3GqyO X-Received: by 2002:a05:6a20:3d08:b0:12f:c61e:7cc3 with SMTP id y8-20020a056a203d0800b0012fc61e7cc3mr17174650pzi.38.1689618437675; Mon, 17 Jul 2023 11:27:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618437; cv=none; d=google.com; s=arc-20160816; b=rKZC9A3A/sClYo49VhYiSQmpK/TaL5haP88Au3aNcNRieoM578uBurUOE7clS690qT wY9v3n3t7ad6CAuEWMpoOUWw0StxGVZNDjCoGY4eCHSu3zFLhaaePeZxSSb8Jw7xF1aT cjZys1aLzIi2RXwUtCeq3BOci27iWvrng/OSfeM4AYkVsd1xJ+dn3tVdvIdDm2JShihi ZItwezAlXtgi3/qwki+cETTaEjjGou3XNPVSfwV1quOKE5yltaX7/42LIMbD13gUICC9 I1vn9CgqfcbertZWZCOsVwTzYp0b91ZJ9Z7N+OmgQa/AA1HxgDrjAD0HktFKH5Ofm9DU /BSQ== 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 :dkim-signature; bh=+qX+LkYK4oItHYSM3qR+QTP8rv6ig8u1xwWnDrPjNf4=; fh=+6SS9+sPKx2/jCReCJL9vk5CEA0Em9eT7ErpbawzEjo=; b=0o8PrPX/3l9Beb7LYhZbKAbjjPOD4GygH+mKQr9cW5d2tR+kxw1IM6W50xMOzB/+Uk NoGNH0r7a/T0q8b561aVtkzuzfn6/m2Fsze0LFAfbuvNGFWwr97eYeh7EXtyTGuWADd0 YdDbAXV3AxyUl1VVf7a/b51Ffgk3PqfDw/vwC/XiLnJwtVcFoRXWw1ZXzdwlTX71nw8P +bxDqR/FDEgYpASuwcBNyMoILr8qbOKW6J+nPp3xm0N4nCliDQio+S3JFsnasDjAv037 Y5rgm2nxCNzHOf9QzBfA4ORc4BhgfC+3cfdxpsJs3TNFqxKrG0m95kib8XiEAjTGwtJB 7o+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XyUAvZde; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cj19-20020a056a00299300b00682689dbdd1si147966pfb.278.2023.07.17.11.27.04; Mon, 17 Jul 2023 11:27:17 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XyUAvZde; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbjGQSVB (ORCPT + 99 others); Mon, 17 Jul 2023 14:21:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229848AbjGQSUs (ORCPT ); Mon, 17 Jul 2023 14:20:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EEA5F7; Mon, 17 Jul 2023 11:20:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 97DFB611EB; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F31EFC433C8; Mon, 17 Jul 2023 18:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=pE4BWqzV7aB/0f8qofy45VqlKrCym7gg/FrxizK5ypg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XyUAvZde7u8wWUU35mWpc2I0qIsa6NqvdKSCIO6VHJBj47drCQ535vmhgE1cGT4v5 XdLe7pQArfVoJo7626fkN24yd/Lon2OKQ2POTAzTQOAKbXetcUVdmdZvAPFI2XjJhZ BQh27eG9BWYjsDYmatpQfB+fEGTBPpgSEQZtwxp4Q2O7/OcMtZ8Rb0wMNF8O1CV6PT 9oP6CN76aQ74aA1ZkVt0y373rp39HnU66v8m8K40ITVhphtiBBL/H/HJktLJSb53Et uFIk3eBhE7Urg2ScrJsH1Emkm4M276rpk7LeIfQXBfsKmuELZYjcfgXXjG9f+vr9gF gvBLyZTNzeckQ== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 908DFCE0806; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, Dietmar Eggemann , "Paul E. McKenney" , Josh Triplett , Joel Fernandes , Juri Lelli , Valentin Schneider , kernel-team@android.com, John Stultz , Davidlohr Bueso Subject: [PATCH rcu 3/9] torture: Add lock_torture_writer_fifo module param Date: Mon, 17 Jul 2023 11:20:36 -0700 Message-Id: <20230717182042.1098651-3-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693343309669555 X-GMAIL-MSGID: 1771693343309669555 From: Dietmar Eggemann Modifies locktorture writer to run as RT task. To use it: insmod /lib/modules/torture.ko random_shuffle=1 lock_torture_writer_fifo=1 ^^^^^^^^^^^^^^^^^^^^^^^^^^ insmod /lib/modules/locktorture.ko torture_type=mutex_lock rt_boost=1 rt_boost_factor=50 nested_locks=3 This patch has been helpful to uncover issues with the proxy-execution series. Cc: "Paul E. McKenney" Cc: Josh Triplett Cc: Joel Fernandes Cc: Juri Lelli Cc: Valentin Schneider Cc: Dietmar Eggemann Cc: kernel-team@android.com Signed-off-by: Dietmar Eggemann [jstultz: Include header change to build, reword commit message] Signed-off-by: John Stultz Acked-by: Davidlohr Bueso Signed-off-by: Paul E. McKenney --- kernel/locking/locktorture.c | 3 ++- kernel/torture.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 949d3deae506..aac48d323254 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -809,7 +809,8 @@ static int lock_torture_writer(void *arg) bool skip_main_lock; VERBOSE_TOROUT_STRING("lock_torture_writer task started"); - set_user_nice(current, MAX_NICE); + if (!rt_task(current)) + set_user_nice(current, MAX_NICE); do { if ((torture_random(&rand) & 0xfffff) == 0) diff --git a/kernel/torture.c b/kernel/torture.c index 8be83fdc6be1..db79197e257a 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "rcu/rcu.h" MODULE_LICENSE("GPL"); @@ -57,6 +58,9 @@ module_param(verbose_sleep_duration, int, 0444); static int random_shuffle; module_param(random_shuffle, int, 0444); +static int lock_torture_writer_fifo; +module_param(lock_torture_writer_fifo, int, 0444); + static char *torture_type; static int verbose; @@ -734,7 +738,7 @@ bool stutter_wait(const char *title) cond_resched_tasks_rcu_qs(); spt = READ_ONCE(stutter_pause_test); for (; spt; spt = READ_ONCE(stutter_pause_test)) { - if (!ret) { + if (!ret && !rt_task(current)) { sched_set_normal(current, MAX_NICE); ret = true; } @@ -944,6 +948,11 @@ int _torture_create_kthread(int (*fn)(void *arg), void *arg, char *s, char *m, *tp = NULL; return ret; } + + if (lock_torture_writer_fifo && + !strncmp(s, "lock_torture_writer", strlen(s))) + sched_set_fifo(*tp); + wake_up_process(*tp); // Process is sleeping, so ordering provided. torture_shuffle_task_register(*tp); return ret; From patchwork Mon Jul 17 18:20:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1275644vqt; Mon, 17 Jul 2023 11:27:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlFT7pWq9QIWeIDv8UGqI4y2Uq0uHOvJZ/V0MVHpNgsQzZBerMEpMHyG0ez990Rwjq/W+MHU X-Received: by 2002:aa7:cb4d:0:b0:51d:8f9b:b6ce with SMTP id w13-20020aa7cb4d000000b0051d8f9bb6cemr11828627edt.1.1689618449981; Mon, 17 Jul 2023 11:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618449; cv=none; d=google.com; s=arc-20160816; b=aMPo0mNprJok5ObqmgL7EuSKRUOk4n/yGRMEl11NpjANAo7Th3f1DgzO6fnBvNx6qn Hu95heuEUqkdaVfkoCa8D7Vreka8FS6+ZGybHYSGpS9q+LsUsnj7lfHbKhtXAri8xdEO TAzsyZvdKq9rrmrKqHPOp3LJYf6LKzRhR+KCnLPMbs+dYDRZVQUQm5AgV63sn7IYBaGq WBskjSrZ/fH1NfPa27WW6Xb6NKCEdkeLLW8jH9wAtqtD5oQatLWsGDmApQOJpmrpZeCM kjuZfVMUIArl0NT7Bx+mjMkno7QI/vLPqjANZu7UbReVYeCg1lqCpnznH10WdlOo82BR Eykw== 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 :dkim-signature; bh=WrsoxQTlKrEHtHiaEBODuKtF05TSTKa71xLJQOxXmS8=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=tqxIm3l6MoqxGQ9RXXmd5QVX5N4NruPeS6Hx1he2ssEIqC4axIEMJDdqEbBPHuBkc0 V6IPPMBGGTWkcAJ4vAcjqJXGTFZnxVOPSaEJQtW4hOlhMXuVtWGIK5+IdveLTBi4vzOU uItjBfPAkZhMJLgdvywBGYVDUwyV4N44Yz1YmKkwYYj9umz3Ijqj9/XBKZtwzJWIOxEx fYt7J4Ey9l2QsM7xv8Bru2+EzN4a/5uYFIyV007GQHdgUEkubLZ30aYHRGG7CNjWRQsR 4sdI4t56Z1l3AuAsD5L7KuDjl4ll3bpgfPWjWOobdVRHQBRMqx7Yqm4dVSsqHKugbT1E VbyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oT+mWmZo; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o21-20020aa7d3d5000000b0051de1341e01si13026610edr.228.2023.07.17.11.27.05; Mon, 17 Jul 2023 11:27:29 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oT+mWmZo; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231708AbjGQSUv (ORCPT + 99 others); Mon, 17 Jul 2023 14:20:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229786AbjGQSUs (ORCPT ); Mon, 17 Jul 2023 14:20:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E8D5A1; Mon, 17 Jul 2023 11:20:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9D2CF611EC; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0864BC433CC; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=iHNmBa5tMI1wuSUKoilqIbnxR2gN+BPPdLAg8CpbuqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oT+mWmZo0G+GJOjCsxtjOtAnu3MLgCvdPcgj96HKkkxDbsoJPuI4pDIjxhWItNQFV PtcA2oDvnJVDJWxbk6MTWGhqKSIGbtfzXz2dhkFyHIIVCvKFz0l2fnePBTn7OZcDRr 57810WoY+7n7zfMKTZg/a0Yzm9UBZIDSfRbW8I6oZBSgC5AAeQdVVvsIaXsKgdfuR2 /No8QlypXYybViq53nziKVyECTA3ugWtB4XXuiNlAfQuT+u2OI3YBl8IxMLQycQNnk G9h7/j7DI7CGWxbScOAFYY4vt1SlRh49KxByvOCB/u6a1tc5RxfychLZvOtOhuYXq4 b+ZnQIpI6u7cQ== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 93017CE0836; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 4/9] torture: Make torture_hrtimeout_*() use TASK_IDLE Date: Mon, 17 Jul 2023 11:20:37 -0700 Message-Id: <20230717182042.1098651-4-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693356134314642 X-GMAIL-MSGID: 1771693356134314642 Given that it is expected that more code will use torture_hrtimeout_*(), including for longer timeouts, make it use TASK_IDLE instead of TASK_UNINTERRUPTIBLE. Signed-off-by: Paul E. McKenney --- kernel/torture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/torture.c b/kernel/torture.c index db79197e257a..836fefa44373 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -96,7 +96,7 @@ int torture_hrtimeout_ns(ktime_t baset_ns, u32 fuzzt_ns, struct torture_random_s if (trsp) hto += (torture_random(trsp) >> 3) % fuzzt_ns; - set_current_state(TASK_UNINTERRUPTIBLE); + set_current_state(TASK_IDLE); return schedule_hrtimeout(&hto, HRTIMER_MODE_REL); } EXPORT_SYMBOL_GPL(torture_hrtimeout_ns); From patchwork Mon Jul 17 18:20:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121530 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1276620vqt; Mon, 17 Jul 2023 11:29:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlHdQhv4bZlGY1BHyiDJGKz54/Na6rcqcgiwCEfeTNVorFhUKb8XmC+srMCY2ObUeD3SlaLo X-Received: by 2002:a17:907:2383:b0:988:882b:9a3 with SMTP id vf3-20020a170907238300b00988882b09a3mr10360760ejb.36.1689618587791; Mon, 17 Jul 2023 11:29:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618587; cv=none; d=google.com; s=arc-20160816; b=VsSTK0r/HQSxvjxTbYq78p44pNdfPO5N1mt39Z7b4vWqREDV53m8hHD8XSyclamLnP kSg8k3/a94c3wW3EiJ8YhfEprrQFfgyoqR9LougBke5eue4V+/1ojhiDp8TkVsXk78pK dtYIT6xbbEMw/OyS01kIWcwRS34c96jArF4FmJ+yQS3bTO0UJXAeRm1uEd6OeqAI65CZ Dkr/Zhp1qytTHYM6WUI1W924ythMZONtIP+H6EQy5nqtw/AW9JgicFTIXoq4zynGb9JH Ui68fpHT8nXypuh1ofklgcxrGTn85O8BWMIGaWCAZ1PNMXfQWaDUiQVuOLkACuPAdKnm ug8A== 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 :dkim-signature; bh=js4po4pNVsJXu7tVV4FsO/CKeTRi12CucrJjY5YMgm8=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=A6MqgPUigpEQd1j8r/kpcEESKjo1LaOKQWeD1kTKwa2bOn9aRjddYwh8hCFjukOXm9 gyEtk6hxBAmCtJS6NnJsOWBJxbdBcg7MynSexUNDbmtpSytqr/PgtRv76ZH4CltgRaRk xPsFpbZpUEDFAWj0vwlLoC61pYw1mpmfIJLHhLEQmlQx2pVfNFcJtmlEO33HZMHjIgEY Ix4uRE9wB/VmYMkGUyOWzp2iiXQGwXfOXnhGsFCJ/9JLKDyC9lq5/SV0g91KkjomxnCP 55DjXM/piPfpC7v1+0Nml3UwKbie09j7lEbY5OZTET5xYrHrF4jc7FPGnwnjUdaeYcUH z3Zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Y7sDl/2T"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qc12-20020a170906d8ac00b0098e1263aadbsi23633ejb.100.2023.07.17.11.29.21; Mon, 17 Jul 2023 11:29:47 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Y7sDl/2T"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231806AbjGQSU5 (ORCPT + 99 others); Mon, 17 Jul 2023 14:20:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231479AbjGQSUs (ORCPT ); Mon, 17 Jul 2023 14:20:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5141A10D9; Mon, 17 Jul 2023 11:20:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B210E611ED; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16608C433D9; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=sBPRM0sRIpbE6zvq9jaA1AWHNVj70yVAkkvNX0VwPQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7sDl/2TGu3C45dkI0F4XlyVjTIewa8HrGGM02f8RgU52YHwQIvUdt258iRQNEm07 1FEHY4Sey3+dPfRnWR5l4rBPoEyH35xaoG4NtYBFi05CqQYLYejMMCZtf+WY/pYitY KmBso4AwVMnl3T1YpW4hK6NkH3ifnoMqdq6On8/uluQmg3Ux/jQnZU8r8yi2UbD4Uw Wsr5KU2WVaKk3NRUxAoZ3uYA5U5dkHXP2OiFFSUF+ARnPawDno261V91VCR3zd09Cz X7IiGC4Mw7WexuHXpj2NBMX2f0v0hksb2CJ5D7ZRnOyKcz7qL3qBpVK7hjTYd37MH2 7pt0mQiFgQWUw== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 9510DCE0902; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 5/9] torture: Move torture_onoff() timeouts to hrtimers Date: Mon, 17 Jul 2023 11:20:38 -0700 Message-Id: <20230717182042.1098651-5-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693500639582000 X-GMAIL-MSGID: 1771693500639582000 In order to gain better race coverage, move the CPU-hotplug-related timed waits in torture_onoff() to torture_hrtimeout_jiffies(). Signed-off-by: Paul E. McKenney --- kernel/torture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/torture.c b/kernel/torture.c index 836fefa44373..fc873116a399 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -357,12 +357,12 @@ torture_onoff(void *arg) if (onoff_holdoff > 0) { VERBOSE_TOROUT_STRING("torture_onoff begin holdoff"); - schedule_timeout_interruptible(onoff_holdoff); + torture_hrtimeout_jiffies(onoff_holdoff, &rand); VERBOSE_TOROUT_STRING("torture_onoff end holdoff"); } while (!torture_must_stop()) { if (disable_onoff_at_boot && !rcu_inkernel_boot_has_ended()) { - schedule_timeout_interruptible(HZ / 10); + torture_hrtimeout_jiffies(HZ / 10, &rand); continue; } cpu = (torture_random(&rand) >> 4) % (maxcpu + 1); @@ -372,7 +372,7 @@ torture_onoff(void *arg) torture_online(cpu, &n_online_attempts, &n_online_successes, &sum_online, &min_online, &max_online); - schedule_timeout_interruptible(onoff_interval); + torture_hrtimeout_jiffies(onoff_interval, &rand); } stop: From patchwork Mon Jul 17 18:20:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121525 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1275799vqt; Mon, 17 Jul 2023 11:27:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlEFYjs+ru32CKY6j8CXiYpH+3VJ08Dj1YXVGmY3JktsnZnkg1YPGB1nKv7GL9mXeCekGy36 X-Received: by 2002:aa7:d683:0:b0:521:29a:8ee3 with SMTP id d3-20020aa7d683000000b00521029a8ee3mr12238607edr.5.1689618471520; Mon, 17 Jul 2023 11:27:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618471; cv=none; d=google.com; s=arc-20160816; b=MNETBCVC9z7AZEgZ0adJ/H621Y6UZbVkyywquqvo1Fs6aIbcjhQvXTsGNy5/k5O2Mx pk2iy6YaDR4H67lu+0OY4//VCK9zE4Ev+WNJZ4PgIK7W1gokB/CoAAhKxL3Zioo5KxjA Dw1KUFjnxQWFWyvMXQVjsuPydIwqBRkauPWw3PdD9PLfPjQGfjnNpzs2/TIz+XPH/LaQ 0DiaDBhBjkRIUFdq9s+WrlowsG+3YVQ0ESssqUWNDaW+uLPuF7C+qAN2EnE+FB8UBpt+ 4GN3kg7WltEbLsDQykWywI8nrFJdcgvtsGloXkJVTmjpjANAWtwQXpjTwIYqA9NS41X3 vrNw== 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 :dkim-signature; bh=2T/kXzRIIVJ9H+4rt+BDWik0c5+Fi2RCfAVKdi5cZKc=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=CrrpCOf9pwpgBC0jNmvkUTxofNDeb0Vs69LQj59msuu5na+LQJ87lM16+HchND0QMr 0HlzBGLe1OKaTF+KfkffXfIDH6aCfSZ8Nytm24oXMpIenZ7LN5VR7kxfxTKgY8ji0HZQ GfP1C4X58nLk7PSJIwsjdyOpr68UZesgo6bLdTHrOsQ6MAQRtTmWORF2V9lTq0a2i02r FfTPOIijqvaBJhrJzRpeaMNlYLCSvQeBRwLNX53Sy8ToR+Q9KkCzuasnuE/bjebD4Tu+ AxYhlWUlxrLvldjAEiLnD78OGumoJ1p92fP787Tt2ZPYbu0oLWP97wGz8Cc2YpZ7p17R GZNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QNL1lw22; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w2-20020aa7cb42000000b0051e28cead02si14063218edt.337.2023.07.17.11.27.27; Mon, 17 Jul 2023 11:27:51 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QNL1lw22; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231852AbjGQSVD (ORCPT + 99 others); Mon, 17 Jul 2023 14:21:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231313AbjGQSUu (ORCPT ); Mon, 17 Jul 2023 14:20:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2923E6C; Mon, 17 Jul 2023 11:20:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1095B611AC; Mon, 17 Jul 2023 18:20:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D958C4339A; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=vYKb+aiy81aGannlId6zaPb2w6tBkokl0Gh0QHY/RfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QNL1lw22uq5lc7bBxJLhQ1H0YCsOe2FR/akZuVZJix1IRhu8N/6mpjZuyL3HmXNgS sbn+QBg6PoPJrRY52F88YJ0gLgtlP018emk9ACMke/CI9zY8bO3p5Gg4CqnjJ50cSj s0m6X+G5AjIEy7xzwXK8P0qefkIb3FE5wz4R5aV1ql2/L2dGqp9ppbzBEBY+hPt6+W 4bsg/56I1S0EZi8VCDWqKZwYgPrV9R84HyXMB3wZu/qbCYsPTFuWg/GzhmIZPwHF/X 34Z/KGxGh8Dcs8TBRRMq/RFimteNApVTISly5yfGoWyvz0/tt9bnsUL+udM3v9TdhS mG/YtZwjcP+jw== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 971A4CE092F; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 6/9] torture: Move torture_shuffle() timeouts to hrtimers Date: Mon, 17 Jul 2023 11:20:39 -0700 Message-Id: <20230717182042.1098651-6-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693378669895209 X-GMAIL-MSGID: 1771693378669895209 In order to gain better race coverage, move the CPU-migration timed waits in torture_shuffle() to torture_hrtimeout_jiffies(). Signed-off-by: Paul E. McKenney --- kernel/torture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/torture.c b/kernel/torture.c index fc873116a399..3ab4930b9fdb 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -560,9 +560,11 @@ static void torture_shuffle_tasks(void) */ static int torture_shuffle(void *arg) { + DEFINE_TORTURE_RANDOM(rand); + VERBOSE_TOROUT_STRING("torture_shuffle task started"); do { - schedule_timeout_interruptible(shuffle_interval); + torture_hrtimeout_jiffies(shuffle_interval, &rand); torture_shuffle_tasks(); torture_shutdown_absorb("torture_shuffle"); } while (!torture_must_stop()); From patchwork Mon Jul 17 18:20:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121526 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1275824vqt; Mon, 17 Jul 2023 11:27:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlG7WQ+eg1Q1s4QPiiF5Vakx3agCnANQXFM4iCaCbqUhdNKhJ3TSikIpiX57Zg5Fj5nAM5wB X-Received: by 2002:a17:906:224a:b0:991:caa8:fc3a with SMTP id 10-20020a170906224a00b00991caa8fc3amr11033830ejr.72.1689618475872; Mon, 17 Jul 2023 11:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618475; cv=none; d=google.com; s=arc-20160816; b=CIimcdOlpzxN++bRmqrIeH6h42PcqQNIKR1rutqY6MyM8SzKHReGYhcp4YA4sBynhg +z4+QPNh55z/x7kRBkjSvECiozb9A8t46g3um40cxHYDOZ5hOl8aoqmRHnSZWN8vympF m0X4gBgM8jWlZo1RvjbJ3atgDu5raYLqVGBG1vigSn4592vskgH5nFcq20eIDurGgO2k vxJPtCAKHjlkB64XAgxVWLzGTuXY7NVpqabYG8yy289FKfFZg3T1KiGw3yhKK3d0RryM Cc4U8lxTziub9FJ9sJeESlfWxQzPGKhJxgCE/TsdP8R1gl6Rxnpbu+chuMrqT5DPZUbt wPlA== 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 :dkim-signature; bh=Yz688/FcIVmyahtOgmW0YRNKQybo0nlsuJXpKQs+HL0=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=LNX0TztIyJAysNBRqPWBlKhhqgL44VOFdWklXt8CHPf3nnLD1TFXzI1GgL9V9YScSn NkgrX+sWwzKZ8kzhGp/rz0RxyD8fLtUi3FKEwzCUSOWYYIy3J9vTNexzsw0vqwtg5yYw HFOTKufknpiZ6HUZfEtlYTOGwKLNal5ND7QDFkcG9/d39Cm9lxjgbx4z5vK+RuKklC5o SYWXznecSmL0DCyPVzrpoyUf8YCFuMJkJlpBQtUNSkG7LhSkaOqBnKq20A9x0NFTJFVq V6yYoEVZEDcTcNn4ODBQnQ/j7wZ5+iNINRiotvD96lx13carPbKKhBp7opbAFc7E68yE hdPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D2yp0Rht; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e11-20020a170906044b00b0098887871d88si5284eja.586.2023.07.17.11.27.31; Mon, 17 Jul 2023 11:27:55 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D2yp0Rht; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231867AbjGQSVG (ORCPT + 99 others); Mon, 17 Jul 2023 14:21:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231707AbjGQSUv (ORCPT ); Mon, 17 Jul 2023 14:20:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2A51E6F; Mon, 17 Jul 2023 11:20:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 14CA1611F2; Mon, 17 Jul 2023 18:20:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 450DCC433A9; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=qqTlwktI6OSX03JOvztECG/JCGyoxYMeQrtOwOhF5Xw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2yp0RhtxFwUC1EikIEwsrD/o8kGHqjtpCuNiJdG30UGGxELH7ue+o6jEklAGsuWr 7fFTL9JdtyVzXQMRghNxDHag+0q13X4SP+Ii1L++gV3hAD2RiMqF8UOOSTQdlO29L4 oR0Doym/d4Y0v8ECkyJh8TuGuJVPD9+QEJZQG0PbDS6u1lIpiHnn2SkIoH+vhBBjJl 4KKzp9Ji6bDmw4WMX1BFj1eKj1OBY2aHoSxvqLGCFVSOCL08DMIcP3/hkbSVAvnLhE UIH/DwOYPCCDU+LRO4dDpVAKwUhrAwXSPJBkQyzVyguPhUuIh3wmCpcXSXLnepqq2t XXh5v4hO1nrAQ== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 99236CE0930; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 7/9] torture: Move stutter_wait() timeouts to hrtimers Date: Mon, 17 Jul 2023 11:20:40 -0700 Message-Id: <20230717182042.1098651-7-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693382763907104 X-GMAIL-MSGID: 1771693382763907104 In order to gain better race coverage, move the test start/stop waits in stutter_wait() to torture_hrtimeout_jiffies(). Signed-off-by: Paul E. McKenney --- kernel/torture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/torture.c b/kernel/torture.c index 3ab4930b9fdb..92704f04a141 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -745,7 +745,7 @@ bool stutter_wait(const char *title) ret = true; } if (spt == 1) { - schedule_timeout_interruptible(1); + torture_hrtimeout_jiffies(1, NULL); } else if (spt == 2) { while (READ_ONCE(stutter_pause_test)) { if (!(i++ & 0xffff)) @@ -753,7 +753,7 @@ bool stutter_wait(const char *title) cond_resched(); } } else { - schedule_timeout_interruptible(round_jiffies_relative(HZ)); + torture_hrtimeout_jiffies(round_jiffies_relative(HZ), NULL); } torture_shutdown_absorb(title); } From patchwork Mon Jul 17 18:20:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1281061vqt; Mon, 17 Jul 2023 11:39:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlFDvEiHmoXekWmKkMczkdFzBm4sU29fv8bOaaMEPNSnETqcumV7LorAcfq08XXbGi7WZSNq X-Received: by 2002:a6b:5c0f:0:b0:783:4f8d:4484 with SMTP id z15-20020a6b5c0f000000b007834f8d4484mr591086ioh.2.1689619176373; Mon, 17 Jul 2023 11:39:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689619176; cv=none; d=google.com; s=arc-20160816; b=QHD7rAZL1WJLkjTl4cIDW8eeqT304cYxw97uM/Uh5Wywr3vxxdjBBsnhQ2feoi+p5/ I1oicDJg5glnBcXe1ckkJO78Kh8sxdcecwjpjqheaBRRds/Y2xfG4XnCWL/scrfYz6Gg 978qqVrHVK9B3W3ou8sGw0rIT0mp/sTylXf1aIhVYJ1FIcb8cxu41JlKqv+i1RSDoQTz 7K9n1BZ10NojHv6R84okCbAB2eU1JcS5cfl0b1KXxRH3DL/UefDbbw1BkupBxgqbtzSJ 9/v8QUs2dsR5mp8vWD+CerAtX4wAm1lNSYVlu6q4mO9VkPL/hbWRWtegP9a4Rm09ylQe Ml5A== 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 :dkim-signature; bh=d9RjV0kfELcLr+qQ7NvYxvgDv+tVo98pt0A/SKXbB6E=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=qbzuw3C2DXLJD23DpjjoW2Xi64MeemDWR6x9mNbo9WB9kFW6Ias0pKMo/wwf6CMV0F rZ91Dt77iRC8BhLNoh7rLotNqxrM5Y/kuZT6dXwZum1MgQE58I9cVV1hNBTXw9gMofbl MXYqtra3zL25oMk1rygmMq0++eMiXUE4e3eKEW/+5OIJmr0Lq8DJxdwTwzO8+S7HqAXy 7KXulW5uQ7qgaNONmvwJKrmMpo3tAUPtOnxMeP+pV30eVNKzJLW6T68PYDsJSTX2/uld RWo97NftDPLyQjxKvZODq44KGDgBXrJsORdIYaawxLg629lQHVH4sObHQw3bMq6xLpb0 9+mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EEdtDlDd; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m16-20020a63fd50000000b005578e44dfb6si154124pgj.864.2023.07.17.11.39.23; Mon, 17 Jul 2023 11:39:36 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EEdtDlDd; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231877AbjGQSVN (ORCPT + 99 others); Mon, 17 Jul 2023 14:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231720AbjGQSUv (ORCPT ); Mon, 17 Jul 2023 14:20:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9383412A; Mon, 17 Jul 2023 11:20:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 297F6611F9; Mon, 17 Jul 2023 18:20:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E68BC433AB; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=rjWu88ZInJ4JHuHDuFwXlfJM5irHmICbqQMPaTiPJrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EEdtDlDdtsm4f4+b40C0oOQzkiSZJU0C/5DEMh5WPQ73XD56n52u3rs8cW9pvRDb7 iF9LnrMCv9gB4K3mqVpe6uvusmeOcCZ5m2QnatwWtv1Qhw0uBguiUI1Jg36qviyygR 05HTvrAk1jm6sjrJOmAiVQjL3+2Hb29TFhX4zT/pzsA4NpQj+mgiLfN8fQdsycfa9e 4O2VI/fJp+8UnPcTPGE/5Y4uXiREqdvwDCTV6GmQZaz+Vqg9ys3ZHcP3XO1fJlfvgT lQ4GHi8fFPuwNaEjGIoHUmIhSmOgXJNPfdnKqCwJLKTlhlOgt7h0M7PxflS/mP48k2 uMIu+Wkzlyz5A== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 9B20ECE093C; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 8/9] torture: Stop right-shifting torture_random() return values Date: Mon, 17 Jul 2023 11:20:41 -0700 Message-Id: <20230717182042.1098651-8-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771694117428284372 X-GMAIL-MSGID: 1771694117428284372 Now that torture_random() uses swahw32(), its callers no longer see not-so-random low-order bits, as these are now swapped up into the upper 16 bits of the torture_random() function's return value. This commit therefore removes the right-shifting of torture_random() return values. Signed-off-by: Paul E. McKenney --- kernel/torture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/torture.c b/kernel/torture.c index 92704f04a141..b59eb6048eab 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -95,7 +95,7 @@ int torture_hrtimeout_ns(ktime_t baset_ns, u32 fuzzt_ns, struct torture_random_s ktime_t hto = baset_ns; if (trsp) - hto += (torture_random(trsp) >> 3) % fuzzt_ns; + hto += torture_random(trsp) % fuzzt_ns; set_current_state(TASK_IDLE); return schedule_hrtimeout(&hto, HRTIMER_MODE_REL); } @@ -365,7 +365,7 @@ torture_onoff(void *arg) torture_hrtimeout_jiffies(HZ / 10, &rand); continue; } - cpu = (torture_random(&rand) >> 4) % (maxcpu + 1); + cpu = torture_random(&rand) % (maxcpu + 1); if (!torture_offline(cpu, &n_offline_attempts, &n_offline_successes, &sum_offline, &min_offline, &max_offline)) From patchwork Mon Jul 17 18:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 121528 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1275957vqt; Mon, 17 Jul 2023 11:28:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlENJzOaWRdbNKD55HqpV1Lo3hVpL9LbF3c2uFW71TSbX7fnJD+r8xBCKvOXDwmnMBhBkjwm X-Received: by 2002:a17:906:530b:b0:988:a578:4d65 with SMTP id h11-20020a170906530b00b00988a5784d65mr10975949ejo.32.1689618493591; Mon, 17 Jul 2023 11:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689618493; cv=none; d=google.com; s=arc-20160816; b=XWv8rvNVriaZ3CTyhRDlx8lINmzkQapBX2xc2FMWLWSHyDxcfmpK75T7Fmry/qTpEX 3u5vbZQpqf8UclfCOSHAHyRNw1KNg1Fmv1GbqtLG83FULeysFlpumq5ISo52eHOytdjP skHRjSvlWDoSplYNAcyFdZrnW0iClSgy4GwyU972f95kil1XDoOY8uqps2gL+1O7goGf gCvFDy5/HRENbHT0sWW1ZwWElk74vmddqur1WO+d3rn1LgeuNvSFjhA3Z9d+QIaXv8xX EQctn7tCjHl/fVdXHAx60PqeWkSJtfIbGWL/LLOTLcomRlFSplm3mGWADHzSr4cc42lm jlcQ== 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 :dkim-signature; bh=w9fipyXV7rYUmy1uFvN/O+dHPDEwSB+QbFFKBKVtO1A=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=oviBqeK7S9etHdkAVRKb5SaQaC5nz3/8hBvqlQx7OUzoYYXFcvbuUk0oL9/I78nEu4 COtlNKz2LdNdJGRG5N2R20n+ddnQyIQsH/Dt+Q6VVTqPywitrrgDCbPN+GGfx2mVoCvW 82JOX8r8pQGv1ysTHNPcY1pC3qun2yg3HLXkfF1VShcIVfH0+uPELqyN7+CRzHvu90gK NGylmdJ5H5pmhErTqfkLsC/cYhUHmMKuDFZrZpKkPEx+3Ta94UlYT0zIssAWCHTLXDhD 5NdUwt//STEKlIJT8cwu3d6gWTqyfPxkTyz+y13EZ2yJC5maPZZI3/hdcAdtNwLyCoyA 3oEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=h0wuZpGJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e25-20020a170906081900b00997672cb9d7si12863ejd.411.2023.07.17.11.27.48; Mon, 17 Jul 2023 11:28:13 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=h0wuZpGJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229803AbjGQSVK (ORCPT + 99 others); Mon, 17 Jul 2023 14:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231296AbjGQSUv (ORCPT ); Mon, 17 Jul 2023 14:20:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84939A1; Mon, 17 Jul 2023 11:20:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 21F94611F5; Mon, 17 Jul 2023 18:20:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C4B6C43395; Mon, 17 Jul 2023 18:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618044; bh=XDuRFq+mHkr5+XpHsV+2nDbFWbS9cEpeXF9JX6lizsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h0wuZpGJ7JN1bE4+fsoi2u1d+PL8FRvgU4yt0JU5sf6WcLvJHULSxnr3gCQmFdGZ6 xBGkY+hsNjQvzjEc3JYU7cDtdbKeHlhnRAYYZnWD/lX3YGwHNYHv6VXN0PcnWM2Xtf H1PJKsIRf3V97vgU3YHzjFZpYC8mPKOjk4LQ0sLZpd/4ArSr6curreirh3x6haq4lF cmV60F2/THlsq/nOkIpSFdgOOMD4ROjYUmrD3G6eyNof3xt7+x3+tIgK7j4ow0t8+i zjBPt65uOHrtzW1YVxnteQU/qA/z7cZIxzrVwSWOViRB173qvBxq82+v3K+ih6kRNJ LfkBxG3mWJ5tQ== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 9D205CE097F; Mon, 17 Jul 2023 11:20:43 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH rcu 9/9] rcutorture: Stop right-shifting torture_random() return values Date: Mon, 17 Jul 2023 11:20:42 -0700 Message-Id: <20230717182042.1098651-9-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 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: INBOX X-GMAIL-THRID: 1771693401436567069 X-GMAIL-MSGID: 1771693401436567069 Now that torture_random() uses swahw32(), its callers no longer see not-so-random low-order bits, as these are now swapped up into the upper 16 bits of the torture_random() function's return value. This commit therefore removes the right-shifting of torture_random() return values. Signed-off-by: Paul E. McKenney --- kernel/rcu/rcutorture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index d291a1438c30..ade42d6a9d9b 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -1877,7 +1877,7 @@ static int rcutorture_extend_mask(int oldmask, struct torture_random_state *trsp) { int mask = rcutorture_extend_mask_max(); - unsigned long randmask1 = torture_random(trsp) >> 8; + unsigned long randmask1 = torture_random(trsp); unsigned long randmask2 = randmask1 >> 3; unsigned long preempts = RCUTORTURE_RDR_PREEMPT | RCUTORTURE_RDR_SCHED; unsigned long preempts_irq = preempts | RCUTORTURE_RDR_IRQ; @@ -1936,7 +1936,7 @@ rcutorture_loop_extend(int *readstate, struct torture_random_state *trsp, if (!((mask - 1) & mask)) return rtrsp; /* Current RCU reader not extendable. */ /* Bias towards larger numbers of loops. */ - i = (torture_random(trsp) >> 3); + i = torture_random(trsp); i = ((i | (i >> 3)) & RCUTORTURE_RDR_MAX_LOOPS) + 1; for (j = 0; j < i; j++) { mask = rcutorture_extend_mask(*readstate, trsp); @@ -2137,7 +2137,7 @@ static int rcu_nocb_toggle(void *arg) toggle_fuzz = NSEC_PER_USEC; do { r = torture_random(&rand); - cpu = (r >> 4) % (maxcpu + 1); + cpu = (r >> 1) % (maxcpu + 1); if (r & 0x1) { rcu_nocb_cpu_offload(cpu); atomic_long_inc(&n_nocb_offload);