>>
>> @@ -384,6 +387,11 @@ static inline void mem_cgroup_replace_page_cache(struct page *oldpage,
>> struct page *newpage)
>> {
>> }
>> +
>> +static inline unsigned long
>> +memcg_zone_reclaimable_pages(struct mem_cgroup *memcg, struct zone *zone)
>> +{
>
> return 0;
>
ok
>> +bool memcg_kmem_is_active(struct mem_cgroup *memcg)
>> {
>> return test_bit(KMEM_ACCOUNTED_ACTIVE, &memcg->kmem_account_flags);
>> }
>> @@ -991,6 +991,15 @@ mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
>> return ret;
>> }
>>
>> +unsigned long
>> +memcg_zone_reclaimable_pages(struct mem_cgroup *memcg, struct zone *zone)
>> +{
>> + int nid = zone_to_nid(zone);
>> + int zid = zone_idx(zone);
>> +
>> + return mem_cgroup_zone_nr_lru_pages(memcg, nid, zid, LRU_ALL);
>
> Without swap enabled it seems like LRU_ALL_FILE is more appropriate.
> Maybe something like test_mem_cgroup_node_reclaimable().
>
You are right, I will look into it.
>> +}
>> +
>> static unsigned long
>> mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,
>> int nid, unsigned int lru_mask)
>> diff --git a/mm/vmscan.c b/mm/vmscan.c
>> index 6d96280..8af0e2b 100644
>> --- a/mm/vmscan.c
>> +++ b/mm/vmscan.c
>> @@ -138,11 +138,42 @@ static bool global_reclaim(struct scan_control *sc)
>> {
>> return !sc->target_mem_cgroup;
>> }
>> +
>> +/*
>> + * kmem reclaim should usually not be triggered when we are doing targetted
>> + * reclaim. It is only valid when global reclaim is triggered, or when the
>> + * underlying memcg has kmem objects.
>> + */
>> +static bool has_kmem_reclaim(struct scan_control *sc)
>> +{
>> + return !sc->target_mem_cgroup ||
>> + (sc->target_mem_cgroup && memcg_kmem_is_active(sc->target_mem_cgroup));
>
> Isn't this the same as:
> return !sc->target_mem_cgroup ||
> memcg_kmem_is_active(sc->target_mem_cgroup);
>
Yes, it is.
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
