1 files changed, 9 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 85cf0f715eb0..6f28b7e926d1 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3804,9 +3804,17 @@ retry_cpuset:
         /*
          * Restore the original nodemask if it was potentially replaced with
          * &cpuset_current_mems_allowed to optimize the fast-path attempt.
+         * Also recalculate the starting point for the zonelist iterator or
+         * we could end up iterating over non-eligible zones endlessly.
          */
-        if (cpusets_enabled())
+        if (unlikely(ac.nodemask != nodemask)) {
                 ac.nodemask = nodemask;
+                ac.preferred_zoneref = first_zones_zonelist(ac.zonelist,
+                                                ac.high_zoneidx, ac.nodemask);
+                if (!ac.preferred_zoneref->zone)
+                        goto no_zone;
+        }
+
         page = __alloc_pages_slowpath(alloc_mask, order, &ac);
 
 no_zone: