Commit 77afca29 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David S. Miller
Browse files

net: vxge: Remove in_interrupt() conditionals 



vxge_os_dma_malloc() and vxge_os_dma_malloc_async() are both called from
callchains which use GFP_KERNEL allocations unconditionally or have other
requirements to be called from fully preemptible task context..

vxge_os_dma_malloc():
  1)  __vxge_hw_blockpool_create() <- GFP_KERNEL

  2)  __vxge_hw_mempool_grow() <- vzalloc()
        __vxge_hw_blockpool_malloc()

vxge_os_dma_malloc_async():
  1  __vxge_hw_mempool_grow() <- vzalloc()
      __vxge_hw_blockpool_malloc()
	__vxge_hw_blockpool_blocks_add()

  2)  vxge_hw_vpath_open()	<- vzalloc()
	__vxge_hw_blockpool_block_allocate()

That means neither of these functions needs a conditional allocation mode.

Remove the in_interrupt() conditional and use GFP_KERNEL.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1f46746

drivers/net/ethernet/neterion/vxge/vxge-config.c

+1 −8
Original line number Diff line number Diff line
@@ -2306,16 +2306,9 @@ static void vxge_hw_blockpool_block_add(struct __vxge_hw_device *devh, 
static inline void

vxge_os_dma_malloc_async(struct pci_dev *pdev, void *devh, unsigned long size)

{

	gfp_t flags;

	void *vaddr;



	if (in_interrupt())

		flags = GFP_ATOMIC | GFP_DMA;

	else

		flags = GFP_KERNEL | GFP_DMA;



	vaddr = kmalloc((size), flags);



	vaddr = kmalloc(size, GFP_KERNEL | GFP_DMA);

	vxge_hw_blockpool_block_add(devh, vaddr, size, pdev, pdev);

}

drivers/net/ethernet/neterion/vxge/vxge-config.h

+1 −6
Original line number Diff line number Diff line
@@ -1899,18 +1899,13 @@ static inline void *vxge_os_dma_malloc(struct pci_dev *pdev, 
			struct pci_dev **p_dmah,

			struct pci_dev **p_dma_acch)

{

	gfp_t flags;

	void *vaddr;

	unsigned long misaligned = 0;

	int realloc_flag = 0;

	*p_dma_acch = *p_dmah = NULL;



	if (in_interrupt())

		flags = GFP_ATOMIC | GFP_DMA;

	else

		flags = GFP_KERNEL | GFP_DMA;

realloc:

	vaddr = kmalloc((size), flags);

	vaddr = kmalloc(size, GFP_KERNEL | GFP_DMA);

	if (vaddr == NULL)

		return vaddr;

	misaligned = (unsigned long)VXGE_ALIGN((unsigned long)vaddr,