From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4ECDC35E1AC; Tue, 26 May 2026 15:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779808937; cv=none; b=Irxh0iWt0EgvYmIifrlegPXk3+yHEFth1KYpnWeUBsN9iBZVRnmqYHjUcYdzLrs0nbDoCZVDvkpcxqEz8gt5ui47XoTmGt0SsWOPADBEin3OcdWZjOyX1+VDdmjdHr3ql8JpKev4kGEMrlM/Wvk4LvGFcR2+KugIzv4VpfqQSe0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779808937; c=relaxed/simple; bh=ojydZY/xJWBLbjMhhVliboBMhbb87iswhHxUUdAbCJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lotobgE76KfUfg3cGKC7er/2hCK2STF2p4DMrprNG1JCEPNHQ3RsL4YyDq+YZMaqtURcom5Kr4aObI3KEtbD1QyHc2Bi6C6WTJ4Z9/oQLDuhVxnKHLNvwYgG1CB7CtHVlCjn4NXbDXtb+9uQNDpWA472DmRs8dQ5fePB1aiEUG8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k7F7Iodf; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k7F7Iodf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6BB91F00A3E; Tue, 26 May 2026 15:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779808936; bh=4UV14d2V2OqZJ8JzFOmve9/BnIh5+l2yEacWnRAtXuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k7F7IodfM5wRay2HUpTYLS1xg0NnLOYnZxxepaaJIwOXkD2Nqpj1/QoPfzmNbZ6SX uLdejkUYu78t6SIjjwfiFI+I9ThLcUSrbqdNaTKQzAymM22FaPz+Ff4P1EJ96WP5x6 IfxB3Kso/O6LxBGHun0mFISsazQcT4y4p3I4NbtZN5kHvF1NPvMIas+R3eeuPAysnU /W1+1JVlmstHb1WIuWs7qrY4v0rgI8ZRo77QNvjG5EhBEAJw50kM5zLznrjwmb2Wda ag246nC9wIt/zNX/K/ioZJBNPiGm87Ht5eXJhRrbAhlUOMaZ7tOuOsB5zn78696UYM ZWWmWPZCVjCZw== Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfauth.phl.internal (Postfix) with ESMTP id 37CA1F4006B; Tue, 26 May 2026 11:22:14 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Tue, 26 May 2026 11:22:14 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTFpmA1McbnqjIdDoCcC8/dKh9RDeYcaA/XB6dgQZoHsdisS7Rnte/RUY2pDCqsaCf lYH/GXfkGRmzTYnB4S+g0DoIzy4KUSXH1v1hqWsXA4v5WIAvvT6c8zNgUsod23Kpq2+47O yYMzbMVdimQJPpKCDvwUMQiSwLgkBGzQ1ckebHI5CwcU5PXtm0paPap1/zDmdG+vWcQc/M pmWI2idDed0xMRSQV9XOsN/PBFcH6SBYELvyO/AtrMtpHg8r71AQlMzDlEp1H1iVazK3oS DonyrliF9qRbQD87XBn6QOt2bC/09pqeijaNsBJFU0GwQ/sar+bEYdVoRVtkXuEiBwHIjv ed+IpSYcEjKMbJGHQ50rASuPpU7mT2upFRbankV1vEt8Udx8iERnnoTH5NFb3Y5VY/8WL2 pEegsK9HBig2eJRAJqIg0jjeKPcLs1uNP0ZReNxmdY5zQzd3f1TJbk8K7y+TeGpfjFtQxI 2BpjE/mTLo0A1N9hfh5OwjZfGG+DZ+d5HOqVfzAW03mI/Rz0aQXx2WypcwCXKj/MEB+IgU y0dRiJEMF0lPGI/vRxna//ZHzL40srGY8P0xEtX8Eo7r5hREOIXoDEo3xWpy2SUQJGT5C4 tz/NlTWZ+Dtk+UCW3324dEw1xixif2/TKAWXO1aLDHbE/reOEOCQKTIu9zvQ X-ME-Proxy: Feedback-ID: i8dbe485b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 May 2026 11:22:12 -0400 (EDT) From: Boqun Feng To: Peter Zijlstra Cc: Catalin Marinas , Will Deacon , Jonas Bonn , Stefan Kristiansson , Stafford Horne , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Arnd Bergmann , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak , Boqun Feng , Waiman Long , Andrew Morton , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Shuah Khan , Miguel Ojeda , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Jinjie Ruan , Lyude Paul , Thomas Huth , Sohil Mehta , "Xin Li (Intel)" , Pawan Gupta , Nikunj A Dadhania , Joel Fernandes , Andy Shevchenko , Randy Dunlap , Yury Norov , Sebastian Andrzej Siewior , linux-kernel@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-s390@vger.kernel.org, linux-arch@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, rust-for-linux@vger.kernel.org, =?UTF-8?q?Onur=20=C3=96zkan?= , Daniel Almeida Subject: [PATCH v2 08/12] sched: Remove the unused preempt_offset parameter of __cant_sleep() Date: Tue, 26 May 2026 08:21:44 -0700 Message-ID: <20260526152148.30514-9-boqun@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260526152148.30514-1-boqun@kernel.org> References: <20260526152148.30514-1-boqun@kernel.org> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The preempt_offset is always 0 in all the callsites of __cant_sleep(), hence remove it. It also allows us to clear the code a bit by stopping using a "preempt_count() > .." comparison. Signed-off-by: Boqun Feng --- include/linux/kernel.h | 4 ++-- kernel/sched/core.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e5570a16cbb1..24414c79e59a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -72,7 +72,7 @@ extern int dynamic_might_resched(void); #ifdef CONFIG_DEBUG_ATOMIC_SLEEP extern void __might_resched(const char *file, int line, unsigned int offsets); extern void __might_sleep(const char *file, int line); -extern void __cant_sleep(const char *file, int line, int preempt_offset); +extern void __cant_sleep(const char *file, int line); extern void __cant_migrate(const char *file, int line); /** @@ -95,7 +95,7 @@ extern void __cant_migrate(const char *file, int line); * this macro will print a stack trace if it is executed with preemption enabled */ # define cant_sleep() \ - do { __cant_sleep(__FILE__, __LINE__, 0); } while (0) + do { __cant_sleep(__FILE__, __LINE__); } while (0) # define sched_annotate_sleep() (current->task_state_change = 0) /** diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b8871449d3c6..75dba7cc09bd 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9165,7 +9165,7 @@ void __might_resched(const char *file, int line, unsigned int offsets) } EXPORT_SYMBOL(__might_resched); -void __cant_sleep(const char *file, int line, int preempt_offset) +void __cant_sleep(const char *file, int line) { static unsigned long prev_jiffy; @@ -9175,7 +9175,7 @@ void __cant_sleep(const char *file, int line, int preempt_offset) if (!IS_ENABLED(CONFIG_PREEMPT_COUNT)) return; - if (preempt_count() > preempt_offset) + if (preempt_count()) return; if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) -- 2.50.1 (Apple Git-155)