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

Commit e0fcd1e4 authored by Sebastian Sanchez's avatar Sebastian Sanchez Committed by Greg Kroah-Hartman
Browse files

IB/hfi1: Allocate context data on memory node 




[ Upstream commit b448bf9a0df6093dbadac36979a55ce4e012a677 ]

There are some memory allocation calls in hfi1_create_ctxtdata()
that do not use the numa function parameter. This
can cause cache lines to be filled over QPI.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarSebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06f2d879

drivers/infiniband/hw/hfi1/init.c

+9 −8
Original line number Diff line number Diff line
@@ -297,14 +297,15 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt, 
		 * The resulting value will be rounded down to the closest

		 * multiple of dd->rcv_entries.group_size.

		 */

		rcd->egrbufs.buffers = kcalloc(rcd->egrbufs.count,

					       sizeof(*rcd->egrbufs.buffers),

					       GFP_KERNEL);

		rcd->egrbufs.buffers = kzalloc_node(

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

			GFP_KERNEL, numa);

		if (!rcd->egrbufs.buffers)

			goto bail;

		rcd->egrbufs.rcvtids = kcalloc(rcd->egrbufs.count,

		rcd->egrbufs.rcvtids = kzalloc_node(

				rcd->egrbufs.count *

				sizeof(*rcd->egrbufs.rcvtids),

					       GFP_KERNEL);

				GFP_KERNEL, numa);

		if (!rcd->egrbufs.rcvtids)

			goto bail;

		rcd->egrbufs.size = eager_buffer_size;
@@ -322,8 +323,8 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt, 
		rcd->egrbufs.rcvtid_size = HFI1_MAX_EAGER_BUFFER_SIZE;



		if (ctxt < dd->first_user_ctxt) { /* N/A for PSM contexts */

			rcd->opstats = kzalloc(sizeof(*rcd->opstats),

				GFP_KERNEL);

			rcd->opstats = kzalloc_node(sizeof(*rcd->opstats),

						    GFP_KERNEL, numa);

			if (!rcd->opstats)

				goto bail;

		}