From patchwork Mon Feb 24 04:43:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boqun Feng X-Patchwork-Id: 13987418 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B3531B0413 for ; Mon, 24 Feb 2025 04:43:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740372199; cv=none; b=PeKPbdgfVeyqCGiV8tNrmsI6k91YxvYB53Ld+W1e3UIjF0koFvX8q2InpZmN8Mr1S1WhQV3MoS1mrzE97T0OYEGqmaKfzeyHHLDXguGCP0vjwCdq21RJhBe32+anU8trm7v1eOcZhVCgQOYXbw5mqqgXTEelmXXf4Y3IR3PYKmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740372199; c=relaxed/simple; bh=DCpT12y5iABPXJogLv/iS8tsEGReP23KAJetFgd3HaM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H84Tdj3aH3ivW4rqixZEazEGnJihSwbeiG7nxCOXlTfBOf7jaI1itc1Jk5qo2BX0xe41uyKmGHydpfjL0MxnZoPcTzy2pZ6CBn8Ui3loA+5xLSfRc9m7D/e7VdcXuQP72iTovdHgJNZopjGlttxnHTM5byy/dPvJcMbE13/eTjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k44KdZbH; arc=none smtp.client-ip=209.85.222.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k44KdZbH" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7c0970e2e79so784845185a.3 for ; Sun, 23 Feb 2025 20:43:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740372195; x=1740976995; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:feedback-id:from:to:cc:subject :date:message-id:reply-to; bh=YgJlvUcrCnk4Px28zeJAYzHwYl+dJt5tTj1CIQ5lvao=; b=k44KdZbHvE1EtHjd6SzEL3jI5qkvR2JRHfDVzLbq53y316oDzWoowDL5lajS8FWMZH 3aTTaaLO9owjSwUREf2d7AvUTzeVz7/xkZzi6qThvu0g5ysZPXuVq6QwcCNcIMVSh2e6 NEot2mMBB6ry2s4satMFaxMTH8ndkwko2mTkX4Tm6j4Pl8wP4vDtBWfDr4hbtU3P/ujR g8IPbWR6p5P3k48t0PkWZbuSDWRJNLvFOD3KkajFmwV2mIfKM4svKHGScKYgZ41SiA4X +sHA5Rf5b5QOgbn2UwpIAEEbUiGeVhp5ESvbt+qexo17VBSHkyY9dvzTUco6llder33s KByg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740372195; x=1740976995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:feedback-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=YgJlvUcrCnk4Px28zeJAYzHwYl+dJt5tTj1CIQ5lvao=; b=osc8usVxZ6ilSJkydGejvwMjDpfr09d7x7kJV1aXG3xnkzCBRdFDEa6cM/9BFA2nai D96LGdTgSMTAu6mcI8IhHeIj/1SSdq4GUTx1WwnXq9rsgro81gP65vV0JiZ6dJT33HQ6 Sjz2zeAh3SXuTPFurLflIRZ/Hny9Apti44mg7Xmltwa7UeoJsjQWcJ7b8khLsJqEkDxF fPNZVbB2M+0KVJDQxdPU6MgeB5R83wv2DMEUK+fKM+YTeD6xMogC7YUmzm2TGbdigFYM 7TMTGujF0jSzauKz3ZE9ogF0NlSbvUrGSH3IuHr11EzsAALz541qPxUuLeo/CTKbb05G ZecA== X-Forwarded-Encrypted: i=1; AJvYcCVcPunXjldUS2zbOsF/og8anZELC1gu0LA7XHRbO6/LayIt/RwKmafcC5gjqwLQqbqtFeQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4y2Vo3rE1e9w8YcPh5MhQQ+Zk0oNfRZ//+dV3KGV3gdWFxWFz VqKluT3SU69dTBCCky9snTJOWcMQ7hX8iRnDzHSeGET6+UPRXAba X-Gm-Gg: ASbGncvMaTvMso2KiegdrdKc+PhGsiD8hIykEPoJ3mHU/ZV3C0yMMazQbEZliCICjqp BPjZ97CAcAx5AjHSmgocOu06zfuLJAmc80xJpaiKrQYWsrsISyxKRQff7eOSrzxOnPlJuwFF5L6 r0Px/kX/3bczMiJoPVzf7aoCkh+W9qKpDVoJrrGq6oa/nJNM2bXrPlkR1gOAtU7taBdW68+HvNa 2kI1Wm6m5woVSQsSnUwpGs/2oKNENY2XV+/NnPr7JnIL8PEFjmKeC4PgrMohRsipqP93LhMnyan WB9ePijr1oEyJHmFVJO5RNfL1mdkpo/kSKq2MPD8RvlIDaF5Frn9W5mMygkQW8yKUgcuyzbC8Um LMxAWNNx+aOPZzULq X-Google-Smtp-Source: AGHT+IHS9+jNMo1GQfaJagEheVTBWOidCeWDjc8eISITAFSDWoITb4z2932ycfJh1KoNWHhNuPWriw== X-Received: by 2002:a05:620a:4486:b0:7c0:b1f3:b4b4 with SMTP id af79cd13be357-7c0ceef74cdmr1480032785a.15.1740372195286; Sun, 23 Feb 2025 20:43:15 -0800 (PST) Received: from fauth-a1-smtp.messagingengine.com (fauth-a1-smtp.messagingengine.com. [103.168.172.200]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c0a49c29bfsm886093785a.45.2025.02.23.20.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 20:43:14 -0800 (PST) Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfauth.phl.internal (Postfix) with ESMTP id 8FF85120006A; Sun, 23 Feb 2025 23:43:14 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sun, 23 Feb 2025 23:43:14 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdejjeekgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpeeuohhquhhnucfhvghnghcuoegsohhquhhnrdhfvghnghesghhmrghilh drtghomheqnecuggftrfgrthhtvghrnhepgeeljeeitdehvdehgefgjeevfeejjeekgfev ffeiueejhfeuiefggeeuheeggefgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepsghoqhhunhdomhgvshhmthhprghuthhhphgvrhhsohhnrghl ihhthidqieelvdeghedtieegqddujeejkeehheehvddqsghoqhhunhdrfhgvnhhgpeepgh hmrghilhdrtghomhesfhhigihmvgdrnhgrmhgvpdhnsggprhgtphhtthhopeelpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopeholhhivhgvrhdrshgrnhhgsehinhhtvghlrd gtohhmpdhrtghpthhtohepphgruhhlmhgtkheskhgvrhhnvghlrdhorhhgpdhrtghpthht oheprghnkhhurhdrrgdrrghrohhrrgesohhrrggtlhgvrdgtohhmpdhrtghpthhtohepoh gvqdhlkhhpsehlihhsthhsrdhlihhnuhigrdguvghvpdhrtghpthhtoheplhhkphesihhn thgvlhdrtghomhdprhgtphhtthhopehpvghtvghriiesihhnfhhrrgguvggrugdrohhrgh dprhgtphhtthhopehfrhgvuggvrhhitgeskhgvrhhnvghlrdhorhhgpdhrtghpthhtohep rhgtuhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopegsohhquhhnrdhfvg hnghesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 23 Feb 2025 23:43:14 -0500 (EST) From: Boqun Feng To: Oliver Sang Cc: "Paul E. McKenney" , Ankur Arora , oe-lkp@lists.linux.dev, lkp@intel.com, Peter Zijlstra , Frederic Weisbecker , rcu@vger.kernel.org, Boqun Feng Subject: [PATCH v2 2/2] rcutorture: Update ->extendables check for lazy preemption Date: Sun, 23 Feb 2025 20:43:10 -0800 Message-Id: <20250224044310.14373-2-boqun.feng@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250224044310.14373-1-boqun.feng@gmail.com> References: <20250224044310.14373-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: rcu@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The rcutorture_one_extend_check() function's second last check assumes that "preempt_count() & PREEMPT_MASK" is non-zero only if RCUTORTURE_RDR_PREEMPT or RCUTORTURE_RDR_SCHED bit is set. This works for preemptible RCU and for non-preemptible RCU running in a non-preemptible kernel. But it fails for non-preemptible RCU running in a preemptible kernel because then rcu_read_lock() is just preempt_disable(), which increases preempt count. This commit therefore adjusts this check to take into account the case fo non-preemptible RCU running in a preemptible kernel. Signed-off-by: Boqun Feng Reviewed-by: Paul E. McKenney --- kernel/rcu/rcutorture.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 280bff706017..4cae119dece8 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -1901,8 +1901,16 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old, WARN_ONCE(cur_ops->extendables && !(curstate & (RCUTORTURE_RDR_BH | RCUTORTURE_RDR_RBH)) && (preempt_count() & SOFTIRQ_MASK), ROEC_ARGS); - WARN_ONCE(cur_ops->extendables && - !(curstate & (RCUTORTURE_RDR_PREEMPT | RCUTORTURE_RDR_SCHED)) && + + /* + * non-preemptible RCU in a preemptible kernel uses preempt_disable() + * as rcu_read_lock(). + */ + mask = RCUTORTURE_RDR_PREEMPT | RCUTORTURE_RDR_SCHED; + if (!IS_ENABLED(CONFIG_PREEMPT_RCU)) + mask |= RCUTORTURE_RDR_RCU_1 | RCUTORTURE_RDR_RCU_2; + + WARN_ONCE(cur_ops->extendables && !(curstate & mask) && (preempt_count() & PREEMPT_MASK), ROEC_ARGS); /*