From patchwork Mon Jul 17 18:10:04 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: 13316176 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 72BB4C001DC for ; Mon, 17 Jul 2023 18:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229517AbjGQSKL (ORCPT ); Mon, 17 Jul 2023 14:10:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbjGQSKK (ORCPT ); Mon, 17 Jul 2023 14:10:10 -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 394F6A1; Mon, 17 Jul 2023 11:10:09 -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 C06D6611D3; Mon, 17 Jul 2023 18:10:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28CF3C433C8; Mon, 17 Jul 2023 18:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689617408; bh=Sdq5gQ+aL3LLkEeJ/3g5VCOtLbSSBFoRGd1+OGzUMlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dP1hdja+w1VHezoiNAIR5UXWSAX7RxMmhxU6eDztOX/7OWfZYgVRTA3fTj8ux0b8E fUCdtl6MVWjYKFQsxb37wbIe9h0lviBUxI43IJfDXooMy98VyrA056KzmXbCr+9THo uhikJIOQQYwcQ9Ie5YPRcAOJd/JxgmFsxmGCttwoZieX0effr8zKwFdcIsXnsarCAm n3KPLmHv09EkxiQ4V1OoBABdpX8cWC9C+gV31pbjM4tE9X51kugONHRr8rHev7H6ut JQzHKjYO/eHj4nWQd2P+CzBW8M92oCyWo0/w7wpXQaoFJc8pEBb73qmyTHBl5xnGEw H9kacEnHfQkBA== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id CE48ACE03F1; Mon, 17 Jul 2023 11:10:07 -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/3] refscale: Add CONFIG_PREEMPT_DYNAMIC=n to NOPREEMPT scenario Date: Mon, 17 Jul 2023 11:10:04 -0700 Message-Id: <20230717181006.1097957-1-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2c4aea8b-6f82-45ab-988e-a6bb19129808@paulmck-laptop> References: <2c4aea8b-6f82-45ab-988e-a6bb19129808@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org It is no longer possible to build a kernel with a preemption-disabled RCU without use of CONFIG_PREEMPT_DYNAMIC=n. This commit therefore adds CONFIG_PREEMPT_DYNAMIC=n to the refscale torture type's NOPREEMPT scenario file. Signed-off-by: Paul E. McKenney --- tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT b/tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT index ef2b501a6971..67f9d2998afd 100644 --- a/tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT +++ b/tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT @@ -2,6 +2,7 @@ CONFIG_SMP=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=n +CONFIG_PREEMPT_DYNAMIC=n #CHECK#CONFIG_PREEMPT_RCU=n CONFIG_HZ_PERIODIC=n CONFIG_NO_HZ_IDLE=y From patchwork Mon Jul 17 18:10:05 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: 13316177 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 4A9CCC0015E for ; Mon, 17 Jul 2023 18:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjGQSKM (ORCPT ); Mon, 17 Jul 2023 14:10:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230172AbjGQSKK (ORCPT ); Mon, 17 Jul 2023 14:10:10 -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 42E53E4C; Mon, 17 Jul 2023 11:10:09 -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 CCA20611D6; Mon, 17 Jul 2023 18:10:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35B81C433C7; Mon, 17 Jul 2023 18:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689617408; bh=Tn6tTasSlGqo3gwhYaxuUliXOXbDqye5oZ+0i/Onq8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5HjUxes+ELBhNY0CMUKHpmZtNKWy0IYcEVAdrokfmWslGHMxtdKgqIOcb/q2lRFg 2hx9yHERoORe95PQPCbtvkbQUEAOWxIPjv5tTlO2aW0hwiAxYRei9UCe/ke+jGVX7O nLQvqQyBxCxngOTfdOLkwDbhstXvuAB+kfpptmonqe2184Y7OuxDSv3FVDmCiPJGPN 56NPOIHyq/POMJtcuSmNP6ylywiHDqo+1GhWIYMrNFYuBLKc23OromzT2quoyHl9A3 lOKWBvNm2om4OUmfWcyjaH6yG/d/zZeZ2+QhQGYX2QL2Yt7TFPrhD0KpLQwGkgUw0O hZpt4Y9bVzubQ== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id D2181CE04CD; Mon, 17 Jul 2023 11:10:07 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, Waiman Long , Qiuxu Zhuo , Davidlohr Bueso , Joel Fernandes , "Paul E . McKenney" Subject: [PATCH rcu 2/3] refscale: Fix uninitalized use of wait_queue_head_t Date: Mon, 17 Jul 2023 11:10:05 -0700 Message-Id: <20230717181006.1097957-2-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2c4aea8b-6f82-45ab-988e-a6bb19129808@paulmck-laptop> References: <2c4aea8b-6f82-45ab-988e-a6bb19129808@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org From: Waiman Long Running the refscale test occasionally crashes the kernel with the following error: [ 8569.952896] BUG: unable to handle page fault for address: ffffffffffffffe8 [ 8569.952900] #PF: supervisor read access in kernel mode [ 8569.952902] #PF: error_code(0x0000) - not-present page [ 8569.952904] PGD c4b048067 P4D c4b049067 PUD c4b04b067 PMD 0 [ 8569.952910] Oops: 0000 [#1] PREEMPT_RT SMP NOPTI [ 8569.952916] Hardware name: Dell Inc. PowerEdge R750/0WMWCR, BIOS 1.2.4 05/28/2021 [ 8569.952917] RIP: 0010:prepare_to_wait_event+0x101/0x190 : [ 8569.952940] Call Trace: [ 8569.952941] [ 8569.952944] ref_scale_reader+0x380/0x4a0 [refscale] [ 8569.952959] kthread+0x10e/0x130 [ 8569.952966] ret_from_fork+0x1f/0x30 [ 8569.952973] The likely cause is that init_waitqueue_head() is called after the call to the torture_create_kthread() function that creates the ref_scale_reader kthread. Although this init_waitqueue_head() call will very likely complete before this kthread is created and starts running, it is possible that the calling kthread will be delayed between the calls to torture_create_kthread() and init_waitqueue_head(). In this case, the new kthread will use the waitqueue head before it is properly initialized, which is not good for the kernel's health and well-being. The above crash happened here: static inline void __add_wait_queue(...) { : if (!(wq->flags & WQ_FLAG_PRIORITY)) <=== Crash here The offset of flags from list_head entry in wait_queue_entry is -0x18. If reader_tasks[i].wq.head.next is NULL as allocated reader_task structure is zero initialized, the instruction will try to access address 0xffffffffffffffe8, which is exactly the fault address listed above. This commit therefore invokes init_waitqueue_head() before creating the kthread. Fixes: 653ed64b01dc ("refperf: Add a test to measure performance of read-side synchronization") Signed-off-by: Waiman Long Reviewed-by: Qiuxu Zhuo Reviewed-by: Davidlohr Bueso Acked-by: Joel Fernandes (Google) Signed-off-by: Paul E. McKenney --- kernel/rcu/refscale.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/rcu/refscale.c b/kernel/rcu/refscale.c index 1970ce5f22d4..71d138573856 100644 --- a/kernel/rcu/refscale.c +++ b/kernel/rcu/refscale.c @@ -1107,12 +1107,11 @@ ref_scale_init(void) VERBOSE_SCALEOUT("Starting %d reader threads", nreaders); for (i = 0; i < nreaders; i++) { + init_waitqueue_head(&reader_tasks[i].wq); firsterr = torture_create_kthread(ref_scale_reader, (void *)i, reader_tasks[i].task); if (torture_init_error(firsterr)) goto unwind; - - init_waitqueue_head(&(reader_tasks[i].wq)); } // Main Task From patchwork Mon Jul 17 18:10:06 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: 13316175 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 D8F15EB64DC for ; Mon, 17 Jul 2023 18:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbjGQSKL (ORCPT ); Mon, 17 Jul 2023 14:10:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230128AbjGQSKK (ORCPT ); Mon, 17 Jul 2023 14:10:10 -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 52EE6E55; Mon, 17 Jul 2023 11:10:09 -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 D56B4611D5; Mon, 17 Jul 2023 18:10:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 419A6C433CB; Mon, 17 Jul 2023 18:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689617408; bh=9DECvy9XfdgRY+x9LckD1Cegiv8FGc1KYWwYrCtIolA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uQ20wt8hXUnilQK44b7T3ETV6YhnGxFIP2ItWK0ReN+Zb2YZlIDPq60bkKEStAXae SehDce8e8mztDJ3zyMNhgIKie5LnJtmimW0pig1upIknxQq6JejG0ModyG3B/I7RMZ +Om3p/UisF3Y0+hg4LVyoelXGyghl171Kyss58KU1iIWY1nI6aCDY6jeyhAe6kbXoV /+KGKXgxJ84EP8pcGZ0V5rGafu9ubEEC7WfXMbiz/zQeH/CNshuGzRPA/BV6zcEx12 xBZgTXwj4TzdH1FcTtzHbYvjLLXqveMUXz3CjyaJNwDTUUCL+ZvrEFzMrWTz/ZbpCt ZRrrQtWnUxhXg== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id D45E7CE0806; Mon, 17 Jul 2023 11:10:07 -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 3/3] refscale: Add a "jiffies" test Date: Mon, 17 Jul 2023 11:10:06 -0700 Message-Id: <20230717181006.1097957-3-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2c4aea8b-6f82-45ab-988e-a6bb19129808@paulmck-laptop> References: <2c4aea8b-6f82-45ab-988e-a6bb19129808@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org This commit adds a "jiffies" test to refscale, allowing use of jiffies to be compared to ktime_get_real_fast_ns(). On my x86 laptop, jiffies is more than 20x faster. (Though for many uses, the tens-of-nanoseconds overhead of ktime_get_real_fast_ns() will be just fine.) Signed-off-by: Paul E. McKenney --- kernel/rcu/refscale.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/refscale.c b/kernel/rcu/refscale.c index 71d138573856..91a0fd0d4d9a 100644 --- a/kernel/rcu/refscale.c +++ b/kernel/rcu/refscale.c @@ -528,6 +528,38 @@ static struct ref_scale_ops clock_ops = { .name = "clock" }; +static void ref_jiffies_section(const int nloops) +{ + u64 x = 0; + int i; + + preempt_disable(); + for (i = nloops; i >= 0; i--) + x += jiffies; + preempt_enable(); + stopopts = x; +} + +static void ref_jiffies_delay_section(const int nloops, const int udl, const int ndl) +{ + u64 x = 0; + int i; + + preempt_disable(); + for (i = nloops; i >= 0; i--) { + x += jiffies; + un_delay(udl, ndl); + } + preempt_enable(); + stopopts = x; +} + +static struct ref_scale_ops jiffies_ops = { + .readsection = ref_jiffies_section, + .delaysection = ref_jiffies_delay_section, + .name = "jiffies" +}; + //////////////////////////////////////////////////////////////////////// // // Methods leveraging SLAB_TYPESAFE_BY_RCU. @@ -1047,7 +1079,7 @@ ref_scale_init(void) int firsterr = 0; static struct ref_scale_ops *scale_ops[] = { &rcu_ops, &srcu_ops, RCU_TRACE_OPS RCU_TASKS_OPS &refcnt_ops, &rwlock_ops, - &rwsem_ops, &lock_ops, &lock_irq_ops, &acqrel_ops, &clock_ops, + &rwsem_ops, &lock_ops, &lock_irq_ops, &acqrel_ops, &clock_ops, &jiffies_ops, &typesafe_ref_ops, &typesafe_lock_ops, &typesafe_seqlock_ops, };