Re: [PATCH v4 20/28] x86, irq: More strict checking about registeringioapic
From: Yijing Wang
Date: Mon Oct 21 2013 - 07:00:54 EST
> int mp_find_ioapic_pin(int ioapic, u32 gsi)
> {
> struct mp_ioapic_gsi *gsi_cfg;
> @@ -3888,6 +3894,11 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
> if (bad_ioapic(address))
> return;
>
> + /* already registered ? */
> + idx = __mp_find_ioapic(gsi_base);
> + if (idx >= 0)
> + return;
Hi Yinghai,
If you add whether ioapic was already registered check here, so we will fail to add ioapic into global ioapic_list.
Then we also can not hot remove this ioapic.
1. We will call mp_register_ioapic during analyze MADT first.
2. We will try to add hotplug ioapic(which contain _GSB) to ioapic_list in acpi_pci_ioapic_add(), but will found this
ioapic has been registered.
Thanks!
Yijing.
> +
> idx = find_first_zero_bit(ioapics_mask, MAX_IO_APICS);
> if (idx >= MAX_IO_APICS) {
> pr_warn("WARNING: Max # of I/O APICs (%d) exceeded, skipping\n",
> @@ -3914,6 +3925,13 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
> * and to prevent reprogramming of IOAPIC pins (PCI GSIs).
> */
> entries = io_apic_get_redir_entries(idx);
> +
> + if (!entries || entries > MP_MAX_IOAPIC_PIN) {
> + clear_fixmap(FIX_IO_APIC_BASE_0 + idx);
> + memset(&ioapics[idx], 0, sizeof(struct ioapic));
> + return;
> + }
> +
> gsi_cfg = mp_ioapic_gsi_routing(idx);
> gsi_cfg->gsi_base = gsi_base;
> gsi_cfg->gsi_end = gsi_base + entries - 1;
>
--
Thanks!
Yijing
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/