Revert "net/rds: Allocate pages on HCA NUMA nodeid"

This reverts commit 7692fc72b66f97feb3d00d34f3fcd1a24605c18c.

Orabug: 33590962

Signed-off-by: Gerd Rausch <[email protected]>
Reviewed-by: John Donnelly <[email protected]>
Signed-off-by: Brian Maly <[email protected]>

Orabug: 33590097

UEK6 => UEK7

(cherry picked from commit 9674470)
cherry-pick-repo=UEK/production/linux-uek.git

Signed-off-by: Gerd Rausch <[email protected]>
Reviewed-by: William Kucharski <[email protected]>

Author: gerd-rausch

net/rds/ib_cm.c

@@ -967,8 +967,7 @@ static int rds_ib_alloc_map_hdrs(struct ib_device *dev,
 	}
 
 	for (i = 0; i < nmbr_hdr_pages; i++) {
-		ret = rds_page_remainder_alloc(sg + i, PAGE_SIZE, GFP_KERNEL,
-					       ibdev_to_node(dev));
+		ret = rds_page_remainder_alloc(sg + i, PAGE_SIZE, GFP_KERNEL);
 		if (ret) {
 			*reason = "rds_page_remainder_alloc failed";
 			for (j = 0; j < i; ++j)

net/rds/ib_recv.c

@@ -295,8 +295,8 @@ static struct rds_page_frag *rds_ib_refill_one_frag(struct rds_ib_connection *ic
 
 		sg_init_table(frag->f_sg, ic->i_frag_pages);
 		for_each_sg(frag->f_sg, sg, ic->i_frag_pages, i) {
-			ret = rds_page_remainder_alloc(sg, PAGE_SIZE, page_mask,
-						       rdsibdev_to_node(ic->rds_ibdev));
+			ret = rds_page_remainder_alloc(sg,
+						       PAGE_SIZE, page_mask);
 			if (ret) {
 				for_each_sg(frag->f_sg, s, ic->i_frag_pages, j) {
 					/* Its the ith fragment we couldn't allocate */
@@ -471,8 +471,8 @@ static int rds_ib_srq_prefill_one(struct rds_ib_device *rds_ibdev,
 		goto out;
 	sg_init_table(recv->r_frag->f_sg, num_sge);
 	for_each_sg(recv->r_frag->f_sg, sg, num_sge, i) {
-		ret = rds_page_remainder_alloc(sg, PAGE_SIZE, page_mask,
-					       rdsibdev_to_node(rds_ibdev));
+		ret = rds_page_remainder_alloc(sg,
+					       PAGE_SIZE, page_mask);
 		if (ret) {
 			for_each_sg(recv->r_frag->f_sg, s, num_sge, j)
 				/* Its the ith fragment we couldn't allocate */

net/rds/message.c

@@ -314,8 +314,7 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iov_iter *from,
 		if (!sg_page(sg)) {
 			ret = rds_page_remainder_alloc(sg, iov_iter_count(from),
 						       GFP_ATOMIC == gfp ?
-						       gfp : GFP_HIGHUSER,
-						       NUMA_NO_NODE);
+						       gfp : GFP_HIGHUSER);
 
 			if (ret)
 				return ret;

net/rds/page.c

@@ -62,7 +62,7 @@ DEFINE_PER_CPU(struct rds_page_remainder, rds_page_remainders) ____cacheline_ali
  * reference until they are done with the region.
  */
 int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes,
-			     gfp_t gfp, int nid)
+			     gfp_t gfp)
 {
 	struct rds_page_remainder *rem;
 	unsigned long flags;
@@ -73,7 +73,7 @@ int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes,
 
 	/* jump straight to allocation if we're trying for a huge page */
 	if (bytes >= PAGE_SIZE) {
-		page = alloc_pages_node(nid, gfp, 0);
+		page = alloc_page(gfp);
 		if (!page) {
 			ret = -ENOMEM;
 		} else {
@@ -118,7 +118,7 @@ int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes,
 		local_irq_restore(flags);
 		put_cpu();
 
-		page = alloc_pages_node(nid, gfp, 0);
+		page = alloc_page(gfp);
 
 		rem = &per_cpu(rds_page_remainders, get_cpu());
 		local_irq_save(flags);

net/rds/rds.h

@@ -1303,7 +1303,7 @@ void rds_rt_debug_tp_enable(void);
 
 /* page.c */
 int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes,
-			     gfp_t gfp, int nid);
+			     gfp_t gfp);
 void rds_page_exit(void);
 
 /* recv.c */