lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v18 10/32] mm/compaction: rename compact_deferred as compact_should_defer
    Date
    The compact_deferred is a defer suggestion check, deferring action does in
    defer_compaction not here. so, better rename it to avoid confusing.

    Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Vlastimil Babka <vbabka@suse.cz>
    Cc: Mike Kravetz <mike.kravetz@oracle.com>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mm@kvack.org
    ---
    include/linux/compaction.h | 4 ++--
    include/trace/events/compaction.h | 2 +-
    mm/compaction.c | 8 ++++----
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/include/linux/compaction.h b/include/linux/compaction.h
    index 25a521d299c1..096fd0eec4db 100644
    --- a/include/linux/compaction.h
    +++ b/include/linux/compaction.h
    @@ -102,7 +102,7 @@ extern enum compact_result compaction_suitable(struct zone *zone, int order,
    unsigned int alloc_flags, int highest_zoneidx);

    extern void defer_compaction(struct zone *zone, int order);
    -extern bool compaction_deferred(struct zone *zone, int order);
    +extern bool compaction_should_defer(struct zone *zone, int order);
    extern void compaction_defer_reset(struct zone *zone, int order,
    bool alloc_success);
    extern bool compaction_restarting(struct zone *zone, int order);
    @@ -201,7 +201,7 @@ static inline void defer_compaction(struct zone *zone, int order)
    {
    }

    -static inline bool compaction_deferred(struct zone *zone, int order)
    +static inline bool compaction_should_defer(struct zone *zone, int order)
    {
    return true;
    }
    diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h
    index 54e5bf081171..33633c71df04 100644
    --- a/include/trace/events/compaction.h
    +++ b/include/trace/events/compaction.h
    @@ -274,7 +274,7 @@
    1UL << __entry->defer_shift)
    );

    -DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_deferred,
    +DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_should_defer,

    TP_PROTO(struct zone *zone, int order),

    diff --git a/mm/compaction.c b/mm/compaction.c
    index 176dcded298e..4e2c66869041 100644
    --- a/mm/compaction.c
    +++ b/mm/compaction.c
    @@ -172,7 +172,7 @@ void defer_compaction(struct zone *zone, int order)
    }

    /* Returns true if compaction should be skipped this time */
    -bool compaction_deferred(struct zone *zone, int order)
    +bool compaction_should_defer(struct zone *zone, int order)
    {
    unsigned long defer_limit = 1UL << zone->compact_defer_shift;

    @@ -186,7 +186,7 @@ bool compaction_deferred(struct zone *zone, int order)
    if (zone->compact_considered >= defer_limit)
    return false;

    - trace_mm_compaction_deferred(zone, order);
    + trace_mm_compaction_should_defer(zone, order);

    return true;
    }
    @@ -2485,7 +2485,7 @@ enum compact_result try_to_compact_pages(gfp_t gfp_mask, unsigned int order,
    enum compact_result status;

    if (prio > MIN_COMPACT_PRIORITY
    - && compaction_deferred(zone, order)) {
    + && compaction_should_defer(zone, order)) {
    rc = max_t(enum compact_result, COMPACT_DEFERRED, rc);
    continue;
    }
    @@ -2711,7 +2711,7 @@ static void kcompactd_do_work(pg_data_t *pgdat)
    if (!populated_zone(zone))
    continue;

    - if (compaction_deferred(zone, cc.order))
    + if (compaction_should_defer(zone, cc.order))
    continue;

    if (compaction_suitable(zone, cc.order, 0, zoneid) !=
    --
    1.8.3.1
    \
     
     \ /
      Last update: 2020-08-24 14:58    [W:2.361 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site