History

[PATCH] zone_reclaim: minor fixes

- If we only reclaim nr_pages then its okay to stay on node. Switch from > to >= for the comparison. - vm_table[] entry for zone_reclaim_mode is a bit screwed up. - Add empty lines around shrink_zone to show that this is the central function to be called.

Christoph Lameter committed 20 years ago

Commit c84db231 parent 52a83632 files · +5 −2Browse files

Unified · Split

2 files
  1. kernel/sysctl.c +2 −1
  2. mm/vmscan.c +3 −1
kernel/sysctl.c+2−1
@@ -878,7 +878,8 @@ static ctl_table vm_table[] = { · 877 unmodified lines
878 .maxlen = sizeof(zone_reclaim_mode),878 .maxlen = sizeof(zone_reclaim_mode),
879 .mode = 0644,879 .mode = 0644,
880 .proc_handler = &proc_dointvec,880 .proc_handler = &proc_dointvec,
881 .strategy = &zero,881 .strategy = &sysctl_intvec,
882 .extra1 = &zero,
882 },883 },
883#endif884#endif
884 { .ctl_name = 0 }885 { .ctl_name = 0 }
mm/vmscan.c+3−1
@@ -1636,14 +1636,16 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) · 1635 unmodified lines
1636 p->flags |= PF_MEMALLOC;1636 p->flags |= PF_MEMALLOC;
1637 reclaim_state.reclaimed_slab = 0;1637 reclaim_state.reclaimed_slab = 0;
1638 p->reclaim_state = &reclaim_state;1638 p->reclaim_state = &reclaim_state;
1639
1639 shrink_zone(zone, &sc);1640 shrink_zone(zone, &sc);
1641
1640 p->reclaim_state = NULL;1642 p->reclaim_state = NULL;
1641 current->flags &= ~PF_MEMALLOC;1643 current->flags &= ~PF_MEMALLOC;
1642 1644
1643 if (sc.nr_reclaimed == 0)1645 if (sc.nr_reclaimed == 0)
1644 zone->last_unsuccessful_zone_reclaim = jiffies;1646 zone->last_unsuccessful_zone_reclaim = jiffies;
1645 1647
1646 return sc.nr_reclaimed > nr_pages;1648 return sc.nr_reclaimed >= nr_pages;
1647}1649}
1648#endif1650#endif
1649 1651