Skip to content

Commit

Permalink
mm/compaction.c: fix zoneindex in kcompactd()
Browse files Browse the repository at this point in the history
While testing the kcompactd in my platform 3G MEM only DMA ZONE.  I
found the kcompactd never wakeup.  It seems the zoneindex has already
minus 1 before.  So the traverse here should be <=.

It fixes a regression where kswapd could previously compact, but
kcompactd not.  Not a crash fix though.

[[email protected]: fix kcompactd_do_work() as well, per Hugh]
Link: http://lkml.kernel.org/r/[email protected]
Fixes: accf624 ("mm, kswapd: replace kswapd compaction with waking up kcompactd")
Signed-off-by: Chen Feng <[email protected]>
Acked-by: Vlastimil Babka <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Kirill A. Shutemov <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Zhuangluan Su <[email protected]>
Cc: Yiping Xu <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Chen Feng authored and torvalds committed May 21, 2016
1 parent 0bb2fd1 commit 6cd9dc3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mm/compaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,7 @@ static bool kcompactd_node_suitable(pg_data_t *pgdat)
struct zone *zone;
enum zone_type classzone_idx = pgdat->kcompactd_classzone_idx;

for (zoneid = 0; zoneid < classzone_idx; zoneid++) {
for (zoneid = 0; zoneid <= classzone_idx; zoneid++) {
zone = &pgdat->node_zones[zoneid];

if (!populated_zone(zone))
Expand Down Expand Up @@ -1897,7 +1897,7 @@ static void kcompactd_do_work(pg_data_t *pgdat)
cc.classzone_idx);
count_vm_event(KCOMPACTD_WAKE);

for (zoneid = 0; zoneid < cc.classzone_idx; zoneid++) {
for (zoneid = 0; zoneid <= cc.classzone_idx; zoneid++) {
int status;

zone = &pgdat->node_zones[zoneid];
Expand Down

0 comments on commit 6cd9dc3

Please sign in to comment.