diff mbox series

[-next] mm/damon: fix error return code in damon_reclaim_turn()

Message ID 20211025124500.2758060-1-yangyingliang@huawei.com (mailing list archive)
State New
Headers show
Series [-next] mm/damon: fix error return code in damon_reclaim_turn() | expand

Commit Message

Yang Yingliang Oct. 25, 2021, 12:45 p.m. UTC
If damon_reclaim_new_scheme() fails, it should return
error code in damon_reclaim_turn()

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/damon/reclaim.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

SeongJae Park Oct. 25, 2021, 1:30 p.m. UTC | #1
On Mon, 25 Oct 2021 20:45:00 +0800 Yang Yingliang <yangyingliang@huawei.com> wrote:

> If damon_reclaim_new_scheme() fails, it should return
> error code in damon_reclaim_turn()
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Thank you for this fix!

Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

> ---
>  mm/damon/reclaim.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c
> index f5ae4c422555..dc1485044eaf 100644
> --- a/mm/damon/reclaim.c
> +++ b/mm/damon/reclaim.c
> @@ -292,8 +292,10 @@ static int damon_reclaim_turn(bool on)
>  
>  	/* Will be freed by 'damon_set_schemes()' below */
>  	scheme = damon_reclaim_new_scheme();
> -	if (!scheme)
> +	if (!scheme) {
> +		err = -ENOMEM;
>  		goto free_region_out;
> +	}
>  	err = damon_set_schemes(ctx, &scheme, 1);
>  	if (err)
>  		goto free_scheme_out;
> -- 
> 2.25.1
>
SeongJae Park Oct. 26, 2021, 7:06 a.m. UTC | #2
On Mon, 25 Oct 2021 13:30:02 +0000 SeongJae Park <sj@kernel.org> wrote:

> On Mon, 25 Oct 2021 20:45:00 +0800 Yang Yingliang <yangyingliang@huawei.com> wrote:
> 
> > If damon_reclaim_new_scheme() fails, it should return
> > error code in damon_reclaim_turn()
> > 
> > Reported-by: Hulk Robot <hulkci@huawei.com>
> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> 
> Thank you for this fix!
> 
> Reviewed-by: SeongJae Park <sj@kernel.org>

FWIW, this patch fixes commit 53ab0082dc41 ("mm/damon: introduce DAMON-based
Reclamation (DAMON_RECLAIM)") in -mm[1].

[1] https://github.com/hnaz/linux-mm/commit/53ab0082dc41


Thanks,
SJ

> 
> 
> Thanks,
> SJ
> 
> > ---
> >  mm/damon/reclaim.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c
> > index f5ae4c422555..dc1485044eaf 100644
> > --- a/mm/damon/reclaim.c
> > +++ b/mm/damon/reclaim.c
> > @@ -292,8 +292,10 @@ static int damon_reclaim_turn(bool on)
> >  
> >  	/* Will be freed by 'damon_set_schemes()' below */
> >  	scheme = damon_reclaim_new_scheme();
> > -	if (!scheme)
> > +	if (!scheme) {
> > +		err = -ENOMEM;
> >  		goto free_region_out;
> > +	}
> >  	err = damon_set_schemes(ctx, &scheme, 1);
> >  	if (err)
> >  		goto free_scheme_out;
> > -- 
> > 2.25.1
> >
diff mbox series

Patch

diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c
index f5ae4c422555..dc1485044eaf 100644
--- a/mm/damon/reclaim.c
+++ b/mm/damon/reclaim.c
@@ -292,8 +292,10 @@  static int damon_reclaim_turn(bool on)
 
 	/* Will be freed by 'damon_set_schemes()' below */
 	scheme = damon_reclaim_new_scheme();
-	if (!scheme)
+	if (!scheme) {
+		err = -ENOMEM;
 		goto free_region_out;
+	}
 	err = damon_set_schemes(ctx, &scheme, 1);
 	if (err)
 		goto free_scheme_out;