Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/msi: Improve IRQ bitmap allocator

Browse Source 
Currently msi_bitmap_alloc_hwirqs() will round up any IRQ allocation requests
to the nearest power of 2. eg. ask for 5 IRQs and you'll get 8. This wastes a
lot of IRQs which can be a scarce resource.

For cxl we may require multiple IRQs for every context that is attached to the
accelerator. There may be 1000s of contexts attached, hence we can easily run
out of IRQs, especially if we are needlessly wasting them.

This changes the msi_bitmap_alloc_hwirqs() to allocate only the required number
of IRQs, hence avoiding this wastage. It keeps the natural alignment
requirement though.

Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Ian Munsie 2014-10-08 19:54:53 +11:00 committed by Michael Ellerman
parent be3ebfe821
commit b0345bbc6d
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/powerpc/sysdev/msi_bitmap.c
View File

@ -20,32 +20,37 @@ int msi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num)
int offset, order = get_count_order(num); int offset, order = get_count_order(num);
spin_lock_irqsave(&bmp->lock, flags); spin_lock_irqsave(&bmp->lock, flags);
/*
* This is fast, but stricter than we need. We might want to add offset = bitmap_find_next_zero_area(bmp->bitmap, bmp->irq_count, 0,
* a fallback routine which does a linear search with no alignment. num, (1 << order) - 1);
*/ if (offset > bmp->irq_count)
offset = bitmap_find_free_region(bmp->bitmap, bmp->irq_count, order); goto err;
bitmap_set(bmp->bitmap, offset, num);
spin_unlock_irqrestore(&bmp->lock, flags); spin_unlock_irqrestore(&bmp->lock, flags);
pr_debug("msi_bitmap: allocated 0x%x (2^%d) at offset 0x%x\n", pr_debug("msi_bitmap: allocated 0x%x at offset 0x%x\n", num, offset);
num, order, offset);
return offset; return offset;
err:
spin_unlock_irqrestore(&bmp->lock, flags);
return -ENOMEM;
} }
EXPORT_SYMBOL(msi_bitmap_alloc_hwirqs);
void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset, void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset,
unsigned int num) unsigned int num)
{ {
unsigned long flags; unsigned long flags;
int order = get_count_order(num);
pr_debug("msi_bitmap: freeing 0x%x (2^%d) at offset 0x%x\n", pr_debug("msi_bitmap: freeing 0x%x at offset 0x%x\n",
num, order, offset); num, offset);
spin_lock_irqsave(&bmp->lock, flags); spin_lock_irqsave(&bmp->lock, flags);
bitmap_release_region(bmp->bitmap, offset, order); bitmap_clear(bmp->bitmap, offset, num);
spin_unlock_irqrestore(&bmp->lock, flags); spin_unlock_irqrestore(&bmp->lock, flags);
} }
EXPORT_SYMBOL(msi_bitmap_free_hwirqs);
void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq) void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq)
{ {
@ -180,6 +185,15 @@ static void __init test_basics(void)
msi_bitmap_free_hwirqs(&bmp, size / 2, 1); msi_bitmap_free_hwirqs(&bmp, size / 2, 1);
check(msi_bitmap_alloc_hwirqs(&bmp, 1) == size / 2); check(msi_bitmap_alloc_hwirqs(&bmp, 1) == size / 2);
/* Check we get a naturally aligned offset */
check(msi_bitmap_alloc_hwirqs(&bmp, 2) % 2 == 0);
check(msi_bitmap_alloc_hwirqs(&bmp, 4) % 4 == 0);
check(msi_bitmap_alloc_hwirqs(&bmp, 8) % 8 == 0);
check(msi_bitmap_alloc_hwirqs(&bmp, 9) % 16 == 0);
check(msi_bitmap_alloc_hwirqs(&bmp, 3) % 4 == 0);
check(msi_bitmap_alloc_hwirqs(&bmp, 7) % 8 == 0);
check(msi_bitmap_alloc_hwirqs(&bmp, 121) % 128 == 0);
msi_bitmap_free(&bmp); msi_bitmap_free(&bmp);
/* Clients may check bitmap == NULL for "not-allocated" */ /* Clients may check bitmap == NULL for "not-allocated" */