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

Commit 948579cd authored by Joe Perches's avatar Joe Perches Committed by Roland Dreier
Browse files

RDMA: Use vzalloc() to replace vmalloc()+memset(0) 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 4162cf64

drivers/infiniband/hw/amso1100/c2_rnic.c

+2 −3
Original line number Diff line number Diff line
@@ -459,13 +459,12 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev) 
	     IB_DEVICE_MEM_WINDOW);



	/* Allocate the qptr_array */

	c2dev->qptr_array = vmalloc(C2_MAX_CQS * sizeof(void *));

	c2dev->qptr_array = vzalloc(C2_MAX_CQS * sizeof(void *));

	if (!c2dev->qptr_array) {

		return -ENOMEM;

	}



	/* Inialize the qptr_array */

	memset(c2dev->qptr_array, 0, C2_MAX_CQS * sizeof(void *));

	/* Initialize the qptr_array */

	c2dev->qptr_array[0] = (void *) &c2dev->req_vq;

	c2dev->qptr_array[1] = (void *) &c2dev->rep_vq;

	c2dev->qptr_array[2] = (void *) &c2dev->aeq;

drivers/infiniband/hw/ehca/ipz_pt_fn.c

+2 −3
Original line number Diff line number Diff line
@@ -222,15 +222,14 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue, 
	queue->small_page = NULL;



	/* allocate queue page pointers */

	queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);

	queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);

	if (!queue->queue_pages) {

		queue->queue_pages = vmalloc(nr_of_pages * sizeof(void *));

		queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *));

		if (!queue->queue_pages) {

			ehca_gen_err("Couldn't allocate queue page list");

			return 0;

		}

	}

	memset(queue->queue_pages, 0, nr_of_pages * sizeof(void *));



	/* allocate actual queue pages */

	if (is_small) {

drivers/infiniband/hw/ipath/ipath_driver.c

+1 −2
Original line number Diff line number Diff line
@@ -199,12 +199,11 @@ static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev) 
		goto bail;

	}



	dd = vmalloc(sizeof(*dd));

	dd = vzalloc(sizeof(*dd));

	if (!dd) {

		dd = ERR_PTR(-ENOMEM);

		goto bail;

	}

	memset(dd, 0, sizeof(*dd));

	dd->ipath_unit = -1;



	spin_lock_irqsave(&ipath_devs_lock, flags);

drivers/infiniband/hw/ipath/ipath_file_ops.c

+3 −8
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ static int init_subports(struct ipath_devdata *dd, 
	}



	num_subports = uinfo->spu_subport_cnt;

	pd->subport_uregbase = vmalloc(PAGE_SIZE * num_subports);

	pd->subport_uregbase = vzalloc(PAGE_SIZE * num_subports);

	if (!pd->subport_uregbase) {

		ret = -ENOMEM;

		goto bail;
@@ -1538,13 +1538,13 @@ static int init_subports(struct ipath_devdata *dd, 
	/* Note: pd->port_rcvhdrq_size isn't initialized yet. */

	size = ALIGN(dd->ipath_rcvhdrcnt * dd->ipath_rcvhdrentsize *

		     sizeof(u32), PAGE_SIZE) * num_subports;

	pd->subport_rcvhdr_base = vmalloc(size);

	pd->subport_rcvhdr_base = vzalloc(size);

	if (!pd->subport_rcvhdr_base) {

		ret = -ENOMEM;

		goto bail_ureg;

	}



	pd->subport_rcvegrbuf = vmalloc(pd->port_rcvegrbuf_chunks *

	pd->subport_rcvegrbuf = vzalloc(pd->port_rcvegrbuf_chunks *

					pd->port_rcvegrbuf_size *

					num_subports);

	if (!pd->subport_rcvegrbuf) {
@@ -1556,11 +1556,6 @@ static int init_subports(struct ipath_devdata *dd, 
	pd->port_subport_id = uinfo->spu_subport_id;

	pd->active_slaves = 1;

	set_bit(IPATH_PORT_MASTER_UNINIT, &pd->port_flag);

	memset(pd->subport_uregbase, 0, PAGE_SIZE * num_subports);

	memset(pd->subport_rcvhdr_base, 0, size);

	memset(pd->subport_rcvegrbuf, 0, pd->port_rcvegrbuf_chunks *

				         pd->port_rcvegrbuf_size *

				         num_subports);

	goto bail;



bail_rhdr:

drivers/infiniband/hw/ipath/ipath_init_chip.c

+1 −4
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static void init_shadow_tids(struct ipath_devdata *dd) 
	struct page **pages;

	dma_addr_t *addrs;



	pages = vmalloc(dd->ipath_cfgports * dd->ipath_rcvtidcnt *

	pages = vzalloc(dd->ipath_cfgports * dd->ipath_rcvtidcnt *

			sizeof(struct page *));

	if (!pages) {

		ipath_dev_err(dd, "failed to allocate shadow page * "
@@ -461,9 +461,6 @@ static void init_shadow_tids(struct ipath_devdata *dd) 
		return;

	}



	memset(pages, 0, dd->ipath_cfgports * dd->ipath_rcvtidcnt *

	       sizeof(struct page *));



	dd->ipath_pageshadow = pages;

	dd->ipath_physshadow = addrs;

}