On 2012-3-21 11:34, Yinghai Lu wrote:
On Tue, Mar 20, 2012 at 9:21 AM, Jiang Liu<liuj97@xxxxxxxxx> wrote:Split out function ioapic_setup_resource(), which will be used by IOAPIC hotplug logic. Signed-off-by: Jiang Liu<jiang.liu@xxxxxxxxxx> --- arch/x86/kernel/apic/io_apic.c | 69 ++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 31 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index e5b6ca4..dfb6f45 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -85,6 +85,7 @@ static struct ioapic { * Saved state during suspend/resume, or while enabling intr-remap. */ struct IO_APIC_route_entry *saved_registers; + struct resource *resource; /* I/O APIC config */ struct mpc_ioapic mp_config; /* IO APIC gsi routing info */ @@ -3987,7 +3988,7 @@ void __init setup_ioapic_dest(void) static struct resource *ioapic_resources; -static struct resource * __init ioapic_setup_resources(int nr_ioapics) +static struct resource * __init ioapic_alloc_resources(int nr_ioapics) { unsigned long n; struct resource *res; @@ -4010,6 +4011,7 @@ static struct resource * __init ioapic_setup_resources(int nr_ioapics) res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY; snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i); mem += IOAPIC_RESOURCE_NAME_SIZE; + ioapics[i].resource =&res[i]; } ioapic_resources = res; @@ -4017,43 +4019,48 @@ static struct resource * __init ioapic_setup_resources(int nr_ioapics) return res; } -void __init ioapic_and_gsi_init(void) +static void ioapic_setup_resource(int idx, struct resource *res, bool hotadd) { - unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0; - struct resource *ioapic_res; - int i; + unsigned long ioapic_phys, vaddr; - ioapic_res = ioapic_setup_resources(nr_ioapics); - for (i = 0; i< nr_ioapics; i++) { - if (smp_found_config) { - ioapic_phys = mpc_ioapic_addr(i); + if (hotadd) { + ioapic_phys = mpc_ioapic_addr(idx); + } else if (smp_found_config) { + ioapic_phys = mpc_ioapic_addr(idx); #ifdef CONFIG_X86_32 - if (!ioapic_phys) { - printk(KERN_ERR - "WARNING: bogus zero IO-APIC " - "address found in MPTABLE, " - "disabling IO/APIC support!\n"); - smp_found_config = 0; - skip_ioapic_setup = 1; - goto fake_ioapic_page; - } + if (!ioapic_phys) { + printk(KERN_ERR + "WARNING: bogus zero IO-APIC address found " + "in MPTABLE, disabling IO/APIC support!\n"); + smp_found_config = 0; + skip_ioapic_setup = 1; + goto fake_ioapic_page; + } #endif - } else { + } else { #ifdef CONFIG_X86_32 fake_ioapic_page: #endif - ioapic_phys = (unsigned long)alloc_bootmem_pages(PAGE_SIZE); - ioapic_phys = __pa(ioapic_phys); - } - set_fixmap_nocache(idx, ioapic_phys); - apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", - __fix_to_virt(idx) + (ioapic_phys& ~PAGE_MASK), - ioapic_phys); - idx++; - - ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1; - ioapic_res++; + ioapic_phys = (unsigned long)alloc_bootmem_pages(PAGE_SIZE); + ioapic_phys = __pa(ioapic_phys);where is calling set_fixmap_nocache for fake ioapic one?
My bad, doesn't notice the case for fake ioapic, will add back the set_fixmap_nocache. I just noticed that set_fixmap_nocache() will be called twice for real IOAPICs.
+ } + + vaddr = __fix_to_virt(FIX_IO_APIC_BASE_0 + idx); + vaddr += (ioapic_phys& ~PAGE_MASK); + apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", + vaddr, ioapic_phys); + + res->start = ioapic_phys; + res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1; +} + +void __init ioapic_and_gsi_init(void) +{ + int i; + + ioapic_alloc_resources(nr_ioapics); + for (i = 0; i< nr_ioapics; i++) { + ioapic_setup_resource(i, ioapics[i].resource, false); }how about booting system with ioapic device and later hot remove it? maybe we can just alloc one by one.
Here the issue is that, it uses bootmem allocator at boot time, which is paged aligned. So seems a little waste to allocate one page for each ioapic. The tradeoff here is to leak the memory if all IOAPICs are removed at runtime. If needed, we could add counter to track the allcoated bootmem and free it when counter reaches zero.
Yinghai .
-- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
