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

Commit 0c79c742 authored by Abhijeet Joglekar's avatar Abhijeet Joglekar Committed by James Bottomley
Browse files

[SCSI] fnic: fix incorrect use of SLAB_CACHE_DMA flag 



Driver was incorrectly using the SLAB_CACHE_DMA flag when creating a cache
for SGLs. fnic device does not have 24-bit DMA restrictions. Remove the flag
and allocations from ZONE_DMA.

Thanks to Roland Dreier and David Rientjes for pointing out the bug.

Signed-off-by: default avatarAbhijeet Joglekar <abjoglek@cisco.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 7bb66fc0

drivers/scsi/fnic/fnic.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


#define DRV_NAME		"fnic"

#define DRV_DESCRIPTION		"Cisco FCoE HBA Driver"

#define DRV_VERSION		"1.5.0.1"

#define DRV_VERSION		"1.5.0.2"

#define PFX			DRV_NAME ": "

#define DFX                     DRV_NAME "%d: "

drivers/scsi/fnic/fnic_main.c

+4 −17
Original line number Diff line number Diff line
@@ -388,17 +388,6 @@ static void fnic_iounmap(struct fnic *fnic) 
		iounmap(fnic->bar0.vaddr);

}



/*

 * Allocate element for mempools requiring GFP_DMA flag.

 * Otherwise, checks in kmem_flagcheck() hit BUG_ON().

 */

static void *fnic_alloc_slab_dma(gfp_t gfp_mask, void *pool_data)

{

	struct kmem_cache *mem = pool_data;



	return kmem_cache_alloc(mem, gfp_mask | GFP_ATOMIC | GFP_DMA);

}



/**

 * fnic_get_mac() - get assigned data MAC address for FIP code.

 * @lport: 	local port.
@@ -603,14 +592,12 @@ static int __devinit fnic_probe(struct pci_dev *pdev, 
	if (!fnic->io_req_pool)

		goto err_out_free_resources;



	pool = mempool_create(2, fnic_alloc_slab_dma, mempool_free_slab,

			      fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);

	pool = mempool_create_slab_pool(2, fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);

	if (!pool)

		goto err_out_free_ioreq_pool;

	fnic->io_sgl_pool[FNIC_SGL_CACHE_DFLT] = pool;



	pool = mempool_create(2, fnic_alloc_slab_dma, mempool_free_slab,

			      fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);

	pool = mempool_create_slab_pool(2, fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);

	if (!pool)

		goto err_out_free_dflt_pool;

	fnic->io_sgl_pool[FNIC_SGL_CACHE_MAX] = pool;
@@ -876,7 +863,7 @@ static int __init fnic_init_module(void) 
	len = sizeof(struct fnic_dflt_sgl_list);

	fnic_sgl_cache[FNIC_SGL_CACHE_DFLT] = kmem_cache_create

		("fnic_sgl_dflt", len + FNIC_SG_DESC_ALIGN, FNIC_SG_DESC_ALIGN,

		 SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA,

		 SLAB_HWCACHE_ALIGN,

		 NULL);

	if (!fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]) {

		printk(KERN_ERR PFX "failed to create fnic dflt sgl slab\n");
@@ -888,7 +875,7 @@ static int __init fnic_init_module(void) 
	len = sizeof(struct fnic_sgl_list);

	fnic_sgl_cache[FNIC_SGL_CACHE_MAX] = kmem_cache_create

		("fnic_sgl_max", len + FNIC_SG_DESC_ALIGN, FNIC_SG_DESC_ALIGN,

		 SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA,

		 SLAB_HWCACHE_ALIGN,

		 NULL);

	if (!fnic_sgl_cache[FNIC_SGL_CACHE_MAX]) {

		printk(KERN_ERR PFX "failed to create fnic max sgl slab\n");

drivers/scsi/fnic/fnic_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_ 
	if (sg_count) {

		io_req->sgl_list =

			mempool_alloc(fnic->io_sgl_pool[io_req->sgl_type],

				      GFP_ATOMIC | GFP_DMA);

				      GFP_ATOMIC);

		if (!io_req->sgl_list) {

			ret = SCSI_MLQUEUE_HOST_BUSY;

			scsi_dma_unmap(sc);