From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 571101DF754; Mon, 12 May 2025 18:02:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072951; cv=none; b=L08+bz1i6xqRrfUVk5oXV8dARdSkEHHqYJ6a1ECS+mlqtVSt3CqdZhMVc4toVpl2PJbjrq5ise/HFbjo5ij++p1ptzlRIw7cY+kSPtv5fyDmWwyvKJMPjkt+5ND5DneIEvA9hzlRUWgGK7V+qqSmcC1iin2MpTVT33JVkv/XSi8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072951; c=relaxed/simple; bh=6Y44eWiHRvdnFbhrnDxI8SSUX6ApTSXCOdVjRqu54FY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UQp+psQE4GFhQypxRGBPK/ADP/gtfykGw0tM0+d/Hdz1u4R0lBsEQcOChpcZuotJ1kF9BbGobvlOYlX9pednI4A3T0rtHxHxBPieY/YmbvcNZKJ52nTpFokNcQKQQwPFtKy+6NDfGiWzFL30W1dbE6dwakrzkmuge5AZS2IxA0c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I/OzKRqY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="I/OzKRqY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC5EBC4CEE7; Mon, 12 May 2025 18:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747072951; bh=6Y44eWiHRvdnFbhrnDxI8SSUX6ApTSXCOdVjRqu54FY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I/OzKRqY+gSYcwrqOln+FAlccU2/iHabhWi9AB6cZUS2wliesRa/DhWjpR6zPuKRU ZMZsIcQWJAX8dnx9otNg4SYL0FmLd8mbZ/KPjyFyIqvmjOIZslwSZCax5DFFfga/1f 312u7kdaEdi4maIaehvnG0IMB/lTU0UT4MwgKgv0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sebastian Andrzej Siewior , Thomas Gleixner Subject: [PATCH 6.12 108/184] clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable() Date: Mon, 12 May 2025 19:45:09 +0200 Message-ID: <20250512172046.225687366@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172041.624042835@linuxfoundation.org> References: <20250512172041.624042835@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Andrzej Siewior commit 94cff94634e506a4a44684bee1875d2dbf782722 upstream. On x86 during boot, clockevent_i8253_disable() can be invoked via x86_late_time_init -> hpet_time_init() -> pit_timer_init() which happens with enabled interrupts. If some of the old i8253 hardware is actually used then lockdep will notice that i8253_lock is used in hard interrupt context. This causes lockdep to complain because it observed the lock being acquired with interrupts enabled and in hard interrupt context. Make clockevent_i8253_disable() acquire the lock with raw_spinlock_irqsave() to cure this. [ tglx: Massage change log and use guard() ] Fixes: c8c4076723dac ("x86/timer: Skip PIT initialization on modern chipsets") Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20250404133116.p-XRWJXf@linutronix.de Signed-off-by: Greg Kroah-Hartman --- drivers/clocksource/i8253.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/clocksource/i8253.c +++ b/drivers/clocksource/i8253.c @@ -103,7 +103,7 @@ int __init clocksource_i8253_init(void) #ifdef CONFIG_CLKEVT_I8253 void clockevent_i8253_disable(void) { - raw_spin_lock(&i8253_lock); + guard(raw_spinlock_irqsave)(&i8253_lock); /* * Writing the MODE register should stop the counter, according to @@ -132,8 +132,6 @@ void clockevent_i8253_disable(void) outb_p(0, PIT_CH0); outb_p(0x30, PIT_MODE); - - raw_spin_unlock(&i8253_lock); } static int pit_shutdown(struct clock_event_device *evt)