From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 3FD8C26ED37 for ; Thu, 20 Aug 2026 13:47:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787233649; cv=none; b=WewQKh1VWJePNqajQL0ZnhPM1FFLpPzK4XBXfbmUxe4nOTIhWUZiknILdoQNcjBUNmUUBwmktydQ2Ib3KJ6wcutWl/Kk4oihPpeCcV/JzAw+l1fVOfuqjD3Z0/Siv1dzGgIJeehAAJRyZ/tKUiKw9KL3ujZeYeFFDa+7EJGINxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787233649; c=relaxed/simple; bh=7ne3tKisZ/6PXVTm2ohqETj1AKHyxX3NRtDWFtaN5DI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=kzJ6j+fiXv3Z8YaBFE2MJ+XBiWs/AFmlDh3+R1c5cD4KDDD4+eLl175GcPqNRj04Bs1Zyjo3Bw7TPcJlhwaXOQuOSihwTAhLlP1lBALPiCvapoHUuNiGxJ5kUXLDE0KRMaNNFf+fv5XAAJaDfBj/thlDB6adUo+wZlL4gP0tvOI= 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=AIjntDb+; arc=none smtp.client-ip=209.85.216.51 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="AIjntDb+" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-38e07ebd263so1434667a91.1 for ; Thu, 20 Aug 2026 06:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787233647; x=1787838447; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=/+Pb2p46WtdccY744klNVGN4hQZyY0c6jTVm2kf8RI8=; b=AIjntDb+MxlnfVVxZi1IGwoVnDbM1MpNZCTQwiBD0k50Ic6VGxWjG7eTOIQUUZdeDI bvbm3bKYybj/wA4iaZPL+eCkMoRtRRX7R6OOEXbbCOBainUXnaleqK1oCCE24DYVtQNv Jb84uLyxiyGywQkw6uyu6RjCEQYqVSjoJNBtZbCFDmi9w5As5fMHfjEmmJYp8Fv9+M15 fyrQVFDhHQRDw0As6L8dnP93A38HCqVF57mb5oADcnTVDZZniCGd9fPpGAXz3FO5LM2o dtKm+fnL27K7cKigVbwzC8ayDEGYsb0vXSE+bUiMd2jam1itW+wv8df4VFf+HyO/p2Tm VR7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787233647; x=1787838447; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=/+Pb2p46WtdccY744klNVGN4hQZyY0c6jTVm2kf8RI8=; b=p5kcJZtBh383MO1cAmfYUwGIk7L8PajNFjpgKIj2F242K4e0dLZbPGEWBvYEfNzVyh sTmxxjsgSzKK/xVxE41PW6wVyS4WoFBhe/aYHhx4eXx2wdmmaxs2xlLqicik9dSyzXnJ UC3sWrXkYKd7A8bAoMcKfgndcXGBoP77kQDCplsTm3ZX1sfqyxmYFHDGOHCCE5ElEvpn qHIZa6YdzuUZmRG/Q8YSPcofrNyYPQYitVFCU7/CAWrf6TgZ8kgDZWgGbfL5frAkExvj 0qpSdgjNlExeIyHoIporSbftjJOgkwNn6AxOLgaXClSXFZeWGeQWBU6DdqSYr/upnG2C 7BNg== X-Forwarded-Encrypted: i=1; AHgh+RrcBiYTvwLhBHg0q2MweriBq0e72jLj61/2wD/3OK1hQH+YcvEgyvpXhd+KmzO3Wriq8e1G1G3NNfosZqQ=@vger.kernel.org X-Gm-Message-State: AFuF++nX5exKB3mDs0XTCJFH1wOLafPfda+Pwk2ocB9VehTldhm7cFIZ 4BDG186kdBHyvtcxp8CHGtz72j/vZ5MO4tnxnw2BxiAVFSMRvPWDLKMq X-Gm-Gg: AR+sD10mXvIozFfhT8cxcZ/b/Fx39FJOjUSz/2oj3LJ+tzAkzgmW3S+3jFiDV7fM95i mK5gdT4Shy8PecLcD2rrdtZJGP/PbqmTVJeJXDTSYkEhhQcQq5gRMH4U+uh0GJRqyiyvNEHqmoE yq/NWsjMZZYUJB1V1GR+9pjVxHpTp/FK5jXDeZ9MWbOqY0ya3Dfak9cJ8Dydar191TVTZ3EtXw2 6kAPdG484jIml24vCLIwes/svOpzRwLb6i1K/CCi0Qu1qE5HejCGgYyTe/U9riVUEOuXGw80fGc xjyWPCOu1349XCVRkadfqBI1eTlMTYCtC/luAYk9Y5zdLIqhFCSpsixIpqxeEv7tvDLWCne65kC k8r0X41KHtfO8rZqiAjkIguIGeCzzWKSzpaO77sOyuj7lO3gdcQC3eOo2Z1wv/tZR0EEG3F4AmC 0fS3dCkQ/BUGmDE7BfmjRyZCZUa/x6DrTh3YipzsTbgAPtm7HkLXaULjUicpVqDCSS9rQ4Kk9FI jdQC65k5IQVrsGGPRGkktq9CsUFFsjYgrTkTkxBcg== X-Received: by 2002:a17:90b:4fd0:b0:38e:5b59:c2ff with SMTP id 98e67ed59e1d1-39580a4d031mr24899716a91.3.1787233647352; Thu, 20 Aug 2026 06:47:27 -0700 (PDT) Received: from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.bl1-in.ibm.com ([129.41.58.4]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-327bf10ca5csm17410270eec.17.2026.08.20.06.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2026 06:47:26 -0700 (PDT) From: "Mukesh Kumar Chaurasiya (IBM)" To: maddy@linux.ibm.com, mpe@ellerman.id.au, npiggin@gmail.com, chleroy@kernel.org, sshegde@linux.ibm.com, mchauras@linux.ibm.com, mkchauras@gmail.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: Venkat Rao Bagalkote Subject: [PATCH V2] powerpc/entry: Fix irq_soft_mask corruption on replayed interrupt exit Date: Thu, 20 Aug 2026 19:17:18 +0530 Message-ID: <20260820134718.2176411-1-mkchauras@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When __replay_soft_interrupts() replays a pending interrupt (e.g. PACA_IRQ_DEC → timer_interrupt), it calls the handler directly with a synthetic pt_regs. The DEFINE_INTERRUPT_HANDLER_ASYNC wrapper around each handler calls arch_interrupt_async_exit_prepare() on the way out, which calls arch_interrupt_exit_prepare() → local_irq_disable() → arch_local_irq_disable(), which does: irq_soft_mask_set(IRQS_DISABLED) /* 0x1 */ This unconditionally overwrites irq_soft_mask with IRQS_DISABLED (0x1), stripping the IRQS_PMI_DISABLED (0x2) bit. The result is that irq_soft_mask is 0x1 instead of IRQS_ALL_DISABLED (0x3) when the handler returns to __replay_soft_interrupts(). For a normally-taken interrupt this is harmless: the next interrupt always enters through arch_interrupt_enter_prepare() which unconditionally sets irq_soft_mask to IRQS_ALL_DISABLED. But during replay, next_interrupt() is called directly between replayed handlers without going back through arch_interrupt_enter_prepare(), so the stripped bit is never restored. next_interrupt() then fires a WARNING: WARNING: arch/powerpc/kernel/irq_64.c:75 WARN_ON(irq_soft_mask_return() != IRQS_ALL_DISABLED) This was introduced by commit bee25f97ad24 ("powerpc: Enable GENERIC_ENTRY feature"). Before that commit, the old interrupt_async_exit_prepare() called irq_exit() followed by an empty interrupt_exit_prepare() stub and never touched irq_soft_mask at all, so the soft mask was left at IRQS_ALL_DISABLED throughout replay. The root cause: arch_interrupt_exit_prepare() uses local_irq_disable() whose only job is to set the IRQS_DISABLED bit; it has no knowledge of IRQS_PMI_DISABLED. It is there to satisfy irqentry_exit()'s requirement that interrupts be disabled, but using the plain irq_soft_mask_set(IRQS_ALL_DISABLED) is the right primitive: - irq_soft_mask_set(IRQS_ALL_DISABLED): sets soft mask to 0x3 (both IRQS_DISABLED and IRQS_PMI_DISABLED). Touches only the soft mask. MSR[EE] and PACA_IRQ_HARD_DIS are already correct because hard interrupts were never re-enabled during replay (PACA_IRQ_REPLAYING is in PACA_IRQ_MUST_HARD_MASK, which blocks should_hard_irq_enable()). - local_irq_disable() / arch_local_irq_disable(): sets soft mask to IRQS_DISABLED (0x1) only, silently dropping IRQS_PMI_DISABLED. - hard_irq_disable(): also issues __mtmsrd to clear MSR[EE] in hardware and sets PACA_IRQ_HARD_DIS — redundant and wrong here since both are already set. Fix by replacing local_irq_disable() with irq_soft_mask_set(IRQS_ALL_DISABLED) in arch_interrupt_exit_prepare(), making the exit symmetric with the entry path in arch_interrupt_enter_prepare() which always sets IRQS_ALL_DISABLED. The warning was observed early in boot on a POWER10 pseries guest during kmem_cache_init_late(), where a spinlock release triggers interrupt replay that processes a pending timer interrupt. Debugger state confirming the bug: Before timer_interrupt(®s): irq_soft_mask = 0x3 (IRQS_ALL_DISABLED) correct irq_happened = 0x41 (HARD_DIS|REPLAYING) correct After timer_interrupt(®s) returns: irq_soft_mask = 0x1 (IRQS_DISABLED) WRONG — PMI bit stripped irq_happened = 0x41 unchanged Fixes: 334f3f6d7a16 ("powerpc/entry: Disable interrupts before irqentry_exit") Reported-by: Venkat Rao Bagalkote Closes: https://lore.kernel.org/all/6f9bfb0f-b14c-468e-bb9f-c157d120d0dc@linux.ibm.com/ Signed-off-by: Mukesh Kumar Chaurasiya (IBM) --- Change log: V1 -> V2: - Instead of using hard_irq_disable use irq_soft_mask_set V1: https://lore.kernel.org/all/20260812152035.1661781-1-mkchauras@gmail.com arch/powerpc/include/asm/entry-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/entry-common.h b/arch/powerpc/include/asm/entry-common.h index c5adb5006361..2a153dca962c 100644 --- a/arch/powerpc/include/asm/entry-common.h +++ b/arch/powerpc/include/asm/entry-common.h @@ -270,7 +270,7 @@ static inline void arch_interrupt_exit_prepare(struct pt_regs *regs) } /* irqentry_exit expects to be called with interrupts disabled */ - local_irq_disable(); + irq_soft_mask_set(IRQS_ALL_DISABLED); } static inline void arch_interrupt_async_enter_prepare(struct pt_regs *regs) -- 2.55.0