Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 24 Apr 2023 22:15:58 -0400
From:   Johannes Weiner <hannes@cmpxchg.org>
To:     Mel Gorman <mgorman@techsingularity.net>
Cc:     linux-mm@kvack.org, Kaiyang Zhao <kaiyang2@cs.cmu.edu>,
        Vlastimil Babka <vbabka@suse.cz>,
        David Rientjes <rientjes@google.com>,
        linux-kernel@vger.kernel.org, kernel-team@fb.com
Subject: Re: [RFC PATCH 14/26] mm: compaction: simplify should_compact_retry()
Message-ID: <20230425021558.GB5666@cmpxchg.org>
References: <20230418191313.268131-1-hannes@cmpxchg.org>
 <20230418191313.268131-15-hannes@cmpxchg.org>
 <20230421143654.g6ta3kd6ea7fsmp6@techsingularity.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230421143654.g6ta3kd6ea7fsmp6@techsingularity.net>
Precedence: bulk

On Fri, Apr 21, 2023 at 03:36:54PM +0100, Mel Gorman wrote:
> On Tue, Apr 18, 2023 at 03:13:01PM -0400, Johannes Weiner wrote:
> > The different branches for retry are unnecessarily complicated. There
> > is really only three outcomes: progress, skipped, failed. Also, the
> > retry counter only applies to loops that made progress, move it there.
> > 
> > Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
> > ---
> >  mm/page_alloc.c | 60 +++++++++++++++++--------------------------------
> >  1 file changed, 20 insertions(+), 40 deletions(-)
> > 
> > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > index c3b7dc479936..18fa2bbba44b 100644
> > --- a/mm/page_alloc.c
> > +++ b/mm/page_alloc.c
> > @@ -4608,7 +4608,6 @@ should_compact_retry(struct alloc_context *ac, int order, int alloc_flags,
> >  		     enum compact_priority *compact_priority,
> >  		     int *compaction_retries)
> >  {
> > -	int max_retries = MAX_COMPACT_RETRIES;
> >  	int min_priority;
> >  	bool ret = false;
> >  	int retries = *compaction_retries;
> 
> Think this breaks build because of trace_compact_retry and max_retries is
> declared in a different scope on the next hunk.

Right you are. Will fix. Thanks!