Skip to content

Commit

Permalink
mm: kmem: enable kernel memcg accounting from interrupt contexts
Browse files Browse the repository at this point in the history
If a memcg to charge can be determined (using remote charging API), there
are no reasons to exclude allocations made from an interrupt context from
the accounting.

Such allocations will pass even if the resulting memcg size will exceed
the hard limit, but it will affect the application of the memory pressure
and an inability to put the workload under the limit will eventually
trigger the OOM.

To use active_memcg() helper, memcg_kmem_bypass() is moved back to
memcontrol.c.

Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Link: http://lkml.kernel.org/r/20200827225843.1270629-5-guro@fb.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Roman Gushchin authored and Linus Torvalds committed Oct 18, 2020
1 parent 37d5985 commit 4127c65
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
12 changes: 0 additions & 12 deletions include/linux/memcontrol.h
Original file line number Diff line number Diff line change
Expand Up @@ -1531,18 +1531,6 @@ static inline bool memcg_kmem_enabled(void)
return static_branch_likely(&memcg_kmem_enabled_key);
}

static inline bool memcg_kmem_bypass(void)
{
if (in_interrupt())
return true;

/* Allow remote memcg charging in kthread contexts. */
if ((!current->mm || (current->flags & PF_KTHREAD)) &&
!current->active_memcg)
return true;
return false;
}

static inline int memcg_kmem_charge_page(struct page *page, gfp_t gfp,
int order)
{
Expand Down
13 changes: 13 additions & 0 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,19 @@ static __always_inline struct mem_cgroup *get_active_memcg(void)
return memcg;
}

static __always_inline bool memcg_kmem_bypass(void)
{
/* Allow remote memcg charging from any context. */
if (unlikely(active_memcg()))
return false;

/* Memcg to charge can't be determined. */
if (in_interrupt() || !current->mm || (current->flags & PF_KTHREAD))
return true;

return false;
}

/**
* If active memcg is set, do not fallback to current->mm->memcg.
*/
Expand Down

0 comments on commit 4127c65

Please sign in to comment.