Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp878017pxb; Thu, 5 Nov 2020 15:51:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsAeY76ky4GynS5eln/wS5fSvISCJ2TEk1yRjo9K/W23QKIOcOK2HIaq95mhy0XrhtdPng X-Received: by 2002:a50:99d6:: with SMTP id n22mr5374353edb.261.1604620276295; Thu, 05 Nov 2020 15:51:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604620276; cv=none; d=google.com; s=arc-20160816; b=LkhssBNqVoQBSt8AmxInF1OgrNdq5IjIfhUQg/HaRAhosdOUWr3Vqkx8YYdHa8EqnO BAA5rSy8ebUXhxcinodwz7OJF0YSxinlHPGSNRwKf1A3gbOg7TiBiFPyw1jEEJu7uhfX /TGQUQPg+nAHFbo/dmxOvR5TJ0gXsgOu8rLDdOc1RHbnBUmtIPhTE9rs7pI4g8FtgQ4w V2ePcVXfO1+TtrcKrtt1G0WIWNcQJFrlyInN9hKKnjL3MJ7wEKoVoJ0ZU1LwgTl7dNDM /lUCmjf4fuFBXlF+2rSDV9Ig6yX/QyHm1ZlXyqwVn/aEW4dqXKA3n/gwdwnlSnreHULu 0PTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=N4hSLuFg7WbP73ktI5+cFHkL1EXoggIxe9ebm+kkPVY=; b=r5HkBL8KrFINK836M10Wo9nTjGU2d1X5qf+ZOy9oq9GMwvOz4PQRDVwPUQa8QqcuRN WyG0nPHy0ZDRfjcXCYVzDHHdLsIRMkVyXarO0yetwNOGjrnH21ZNxIHDUlYuY1DPb6Fp 8otS1u6jxCOe9nc6xD7X1iv8oKIFXRU+ljOrxcSbPbUJ1CpvULm8RzVKE74xTRP4lW7F pBXrfbStmrXl7IDcH83zHiWuBPdftTkPYmQ55KaRyC6LxDotatq5ON4z7pj2C9iCYw36 dGw54l5TdVWwGBDmzkoHZ0dno5trOR9Yu1PKaUi1lKhoJ5Fy3AQPiBYE3GO7s90cXq3S JiWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hTYp0Ssw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l9si2312604ejc.594.2020.11.05.15.50.53; Thu, 05 Nov 2020 15:51:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hTYp0Ssw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1733135AbgKEXsz (ORCPT + 99 others); Thu, 5 Nov 2020 18:48:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:46062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732619AbgKEXr0 (ORCPT ); Thu, 5 Nov 2020 18:47:26 -0500 Received: from paulmck-ThinkPad-P72.home (50-39-104-11.bvtn.or.frontiernet.net [50.39.104.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 668E820782; Thu, 5 Nov 2020 23:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604620046; bh=+wtCTO8ugs2wQ5HRkr5jLmWMwhgf+IR2IfaGFnsAG6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hTYp0SswFTvS8NmT12XcS77Utl7wn7ALlvXByf8UaspbIv9ekz2oSJzKf9WsEkyyc g/gaGeQ/dWPgWdoU8LHsdVhPRfrQFqdop/0e36aKMDohc7DO2FLKXd/O/HQfTNa5ct Kug7toUi2lUty7mR3ucAfyzZ3uBwMIaNXPqGvOF4= From: paulmck@kernel.org To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, mingo@kernel.org, jiangshanlai@gmail.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, "Paul E. McKenney" Subject: [PATCH tip/core/rcu 12/28] rcutorture: Adjust scenarios SRCU-t and SRCU-u to make kconfig happy Date: Thu, 5 Nov 2020 15:47:03 -0800 Message-Id: <20201105234719.23307-12-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20201105234658.GA23142@paulmck-ThinkPad-P72> References: <20201105234658.GA23142@paulmck-ThinkPad-P72> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Paul E. McKenney" The SRCU-u scenario expects to enable lockdep but to also disable the CONFIG_PREEMPT_COUNT kconfig option. This no longer works. This commit therefore instead enables lockdep in SRCU-t, which then allows SRCU-u to disable CONFIG_PREEMPT_COUNT. Signed-off-by: Paul E. McKenney --- tools/testing/selftests/rcutorture/configs/rcu/SRCU-t | 3 ++- tools/testing/selftests/rcutorture/configs/rcu/SRCU-u | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/rcutorture/configs/rcu/SRCU-t b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-t index 6c78022..d6557c3 100644 --- a/tools/testing/selftests/rcutorture/configs/rcu/SRCU-t +++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-t @@ -4,7 +4,8 @@ CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=n #CHECK#CONFIG_TINY_SRCU=y CONFIG_RCU_TRACE=n -CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_DEBUG_LOCK_ALLOC=y +CONFIG_PROVE_LOCKING=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_DEBUG_ATOMIC_SLEEP=y #CHECK#CONFIG_PREEMPT_COUNT=y diff --git a/tools/testing/selftests/rcutorture/configs/rcu/SRCU-u b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-u index c15ada8..6bc24e9 100644 --- a/tools/testing/selftests/rcutorture/configs/rcu/SRCU-u +++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-u @@ -4,7 +4,6 @@ CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=n #CHECK#CONFIG_TINY_SRCU=y CONFIG_RCU_TRACE=n -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_PROVE_LOCKING=y +CONFIG_DEBUG_LOCK_ALLOC=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_PREEMPT_COUNT=n -- 2.9.5