Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 374f78f7 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Jeff Kirsher
Browse files

ixgbe: Replace GFP_ATOMIC with GFP_KERNEL 



ixgbe_fcoe_ddp_setup(), ixgbe_setup_fcoe_ddp_resources() and
ixgbe_sw_init() are never called in atomic context.
They call kmalloc(), dma_pool_alloc() and kzalloc() with GFP_ATOMIC,
which is not necessary.
GFP_ATOMIC can be replaced with GFP_KERNEL.

This is found by a static analysis tool named DCNS written by myself.

Signed-off-by: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Acked-by: default avatarSebastian Basierski <sebastianx.basierski@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 69a64658

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	}



	/* alloc the udl from per cpu ddp pool */

	ddp->udl = dma_pool_alloc(ddp_pool->pool, GFP_ATOMIC, &ddp->udp);

	ddp->udl = dma_pool_alloc(ddp_pool->pool, GFP_KERNEL, &ddp->udp);

	if (!ddp->udl) {

		e_err(drv, "failed allocated ddp context\n");

		goto out_noddp_unmap;
@@ -760,7 +760,7 @@ int ixgbe_setup_fcoe_ddp_resources(struct ixgbe_adapter *adapter) 
		return 0;



	/* Extra buffer to be shared by all DDPs for HW work around */

	buffer = kmalloc(IXGBE_FCBUFF_MIN, GFP_ATOMIC);

	buffer = kmalloc(IXGBE_FCBUFF_MIN, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -6201,7 +6201,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter, 


	adapter->mac_table = kcalloc(hw->mac.num_rar_entries,

				     sizeof(struct ixgbe_mac_addr),

				     GFP_ATOMIC);

				     GFP_KERNEL);

	if (!adapter->mac_table)

		return -ENOMEM;