Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3398412pxf; Mon, 22 Mar 2021 05:39:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBYfm3S2VDxOWFUL30j8nI0oxw9ZONEZ5BEwgYIjNN39jhB0enheA+Y8AHDb9Q58MMwQW0 X-Received: by 2002:a05:6402:1a4f:: with SMTP id bf15mr25659193edb.304.1616416754847; Mon, 22 Mar 2021 05:39:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616416754; cv=none; d=google.com; s=arc-20160816; b=lgnNGjvVPnlF34nUAFeBVJ1rG8/fbquUg8zwMsbMO8aS1iny4r1OnhQiBLn95J2wuO o6tM9aSYixoh/2DzVX8j4pLpMk4dgiloNpnU66IL60KGusaQfbkpqlKhkXdlTnmyyFJF TDsPleXKjlyfcQd8u4ifYGIf/jKNdUNYwVZoa0dH/xrEZMU5GdrwSU4jFtMXgA8ZcKzH ShesxR+7HBEJxUbkSEohtCJOsgNEaKZhqmWDCFe/hkiqg/pZKhUT3MLqHOeY8H4ETdZv ofzM/vQ0lTOoIQIl5Iljr6kS1ilRQFjbHn1Uujzal4RD3VaELNT4C/q845mo6iC0SCQR K2KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Bfw6dqwUlDZsC15I6+6tb8BO1uirdfaA27hbLrZnsqM=; b=EV2JU20l6lGZUVjZFJvS5mBYPPKgbHBkL+Y2IUqwlRU35O62v5+RiLHdcQJnWX4kND AVgAYU/F5wSpxf8fAf62MwBIsYz4jUf46Tvk2HtYomn3tV5rVKQqz5MrRkjfcM02rdav LKF8bQ0TnOhtv63NThOWba7nwykOhb/z4Ocix4zNqqConzxI08mKtycAgPsENg52hO+z 3dM750oQL7J+X2jvoW+rA1e+xhWzNLZV14+G0PloyiWtcZfK2RcYcydvQ3GePcnLXRTI 7bs5FoLf4rJPEC1HlwuItnKQxXIEdPcn8gOLfPb0SdlWmFRo309heJFhva4I4lwzt6kE ouGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Cm0Y4/96"; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t13si11338110ejr.172.2021.03.22.05.38.52; Mon, 22 Mar 2021 05:39:14 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b="Cm0Y4/96"; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229467AbhCVMh6 (ORCPT + 99 others); Mon, 22 Mar 2021 08:37:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:56134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231603AbhCVMdu (ORCPT ); Mon, 22 Mar 2021 08:33:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C996C619A3; Mon, 22 Mar 2021 12:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416429; bh=Kxq0WtRl8Kxl4HVdY4NnMHnxBiCyp9MqgUQ1qklBtuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cm0Y4/96OwHZ7eEhbG4ghTuO743C8EikNeFCf4IS5vgQMZEFRiQDgm43/uuF6LdOZ Zr/RYo6PnEXnttd3H8/VEjeUnCiFTk0I0oa+9DO81jXNZzU7Fvr5/M44OpBXU92t1I YqtFs0jxxUGwWa4Qd6OjvEkNQT2ZtaeJcLCo8/d8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vitaly Kuznetsov , Thomas Gleixner Subject: [PATCH 5.11 102/120] x86/ioapic: Ignore IRQ2 again Date: Mon, 22 Mar 2021 13:28:05 +0100 Message-Id: <20210322121933.083955305@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121929.669628946@linuxfoundation.org> References: <20210322121929.669628946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner commit a501b048a95b79e1e34f03cac3c87ff1e9f229ad upstream. Vitaly ran into an issue with hotplugging CPU0 on an Amazon instance where the matrix allocator claimed to be out of vectors. He analyzed it down to the point that IRQ2, the PIC cascade interrupt, which is supposed to be not ever routed to the IO/APIC ended up having an interrupt vector assigned which got moved during unplug of CPU0. The underlying issue is that IRQ2 for various reasons (see commit af174783b925 ("x86: I/O APIC: Never configure IRQ2" for details) is treated as a reserved system vector by the vector core code and is not accounted as a regular vector. The Amazon BIOS has an routing entry of pin2 to IRQ2 which causes the IO/APIC setup to claim that interrupt which is granted by the vector domain because there is no sanity check. As a consequence the allocation counter of CPU0 underflows which causes a subsequent unplug to fail with: [ ... ] CPU 0 has 4294967295 vectors, 589 available. Cannot disable CPU There is another sanity check missing in the matrix allocator, but the underlying root cause is that the IO/APIC code lost the IRQ2 ignore logic during the conversion to irqdomains. For almost 6 years nobody complained about this wreckage, which might indicate that this requirement could be lifted, but for any system which actually has a PIC IRQ2 is unusable by design so any routing entry has no effect and the interrupt cannot be connected to a device anyway. Due to that and due to history biased paranoia reasons restore the IRQ2 ignore logic and treat it as non existent despite a routing entry claiming otherwise. Fixes: d32932d02e18 ("x86/irq: Convert IOAPIC to use hierarchical irqdomain interfaces") Reported-by: Vitaly Kuznetsov Signed-off-by: Thomas Gleixner Tested-by: Vitaly Kuznetsov Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210318192819.636943062@linutronix.de Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/apic/io_apic.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1032,6 +1032,16 @@ static int mp_map_pin_to_irq(u32 gsi, in if (idx >= 0 && test_bit(mp_irqs[idx].srcbus, mp_bus_not_pci)) { irq = mp_irqs[idx].srcbusirq; legacy = mp_is_legacy_irq(irq); + /* + * IRQ2 is unusable for historical reasons on systems which + * have a legacy PIC. See the comment vs. IRQ2 further down. + * + * If this gets removed at some point then the related code + * in lapic_assign_system_vectors() needs to be adjusted as + * well. + */ + if (legacy && irq == PIC_CASCADE_IR) + return -EINVAL; } mutex_lock(&ioapic_mutex);