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

Commit 953a9ceb authored by Kamenee Arumugam's avatar Kamenee Arumugam Committed by Jason Gunthorpe
Browse files

IB/hfi1: Convert kzalloc_node and kcalloc to use kcalloc_node 



Kzalloc_node API doesn't check for overflows in size multiplication.
While kcalloc API check for overflows in size multiplication
but these implementations are not NUMA-aware.

This conversion allowed for correcting an allocation used in the hot
path to be on the local NUMA and ensure us overflow free multiplication
for the size of a memory allocation.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarKamenee Arumugam <kamenee.arumugam@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 2ff124d5

drivers/infiniband/hw/hfi1/init.c

+9 −8
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int hfi1_create_kctxts(struct hfi1_devdata *dd) 
	u16 i;

	int ret;



	dd->rcd = kzalloc_node(dd->num_rcv_contexts * sizeof(*dd->rcd),

	dd->rcd = kcalloc_node(dd->num_rcv_contexts, sizeof(*dd->rcd),

			       GFP_KERNEL, dd->node);

	if (!dd->rcd)

		return -ENOMEM;
@@ -439,13 +439,14 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa, 
		 * The resulting value will be rounded down to the closest

		 * multiple of dd->rcv_entries.group_size.

		 */

		rcd->egrbufs.buffers = kzalloc_node(

			rcd->egrbufs.count * sizeof(*rcd->egrbufs.buffers),

		rcd->egrbufs.buffers =

			kcalloc_node(rcd->egrbufs.count,

				     sizeof(*rcd->egrbufs.buffers),

				     GFP_KERNEL, numa);

		if (!rcd->egrbufs.buffers)

			goto bail;

		rcd->egrbufs.rcvtids = kzalloc_node(

				rcd->egrbufs.count *

		rcd->egrbufs.rcvtids =

			kcalloc_node(rcd->egrbufs.count,

				     sizeof(*rcd->egrbufs.rcvtids),

				     GFP_KERNEL, numa);

		if (!rcd->egrbufs.rcvtids)

drivers/infiniband/hw/hfi1/pio.c

+8 −7
Original line number Diff line number Diff line
@@ -856,8 +856,9 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type, 
		 * so head == tail can mean empty.

		 */

		sc->sr_size = sci->credits + 1;

		sc->sr = kzalloc_node(sizeof(union pio_shadow_ring) *

				sc->sr_size, GFP_KERNEL, numa);

		sc->sr = kcalloc_node(sc->sr_size,

				      sizeof(union pio_shadow_ring),

				      GFP_KERNEL, numa);

		if (!sc->sr) {

			sc_free(sc);

			return NULL;
@@ -1958,7 +1959,7 @@ int init_pervl_scs(struct hfi1_devdata *dd) 
	hfi1_init_ctxt(dd->vld[15].sc);

	dd->vld[15].mtu = enum_to_mtu(OPA_MTU_2048);



	dd->kernel_send_context = kzalloc_node(dd->num_send_contexts *

	dd->kernel_send_context = kcalloc_node(dd->num_send_contexts,

					       sizeof(struct send_context *),

					       GFP_KERNEL, dd->node);

	if (!dd->kernel_send_context)

drivers/infiniband/hw/hfi1/sdma.c

+2 −1
Original line number Diff line number Diff line
@@ -1389,7 +1389,8 @@ int sdma_init(struct hfi1_devdata *dd, u8 port) 
		    num_engines, descq_cnt);



	/* alloc memory for array of send engines */

	dd->per_sdma = kcalloc(num_engines, sizeof(*dd->per_sdma), GFP_KERNEL);

	dd->per_sdma = kcalloc_node(num_engines, sizeof(*dd->per_sdma),

				    GFP_KERNEL, dd->node);

	if (!dd->per_sdma)

		return ret;