[RFC] ashmem: Fix ashmem shrinker nr_to_scan

Dan Carpenter dan.carpenter at oracle.com
Tue Mar 10 10:46:01 UTC 2020


On Thu, Mar 05, 2020 at 08:19:30PM -0500, Joel Fernandes (Google) wrote:
> nr_to_scan is the number of pages to be freed however ashmem doesn't
> discount nr_to_scan correctly as it frees ranges. It should be
> discounting them by pages than by ranges. Correct the issue.
> 
> Cc: surenb at google.com
> Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>
> ---
>  drivers/staging/android/ashmem.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
> index 5891d0744a760..cb525ea6db98a 100644
> --- a/drivers/staging/android/ashmem.c
> +++ b/drivers/staging/android/ashmem.c
> @@ -458,6 +458,8 @@ ashmem_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
>  		lru_del(range);
>  
>  		freed += range_size(range);
> +		sc->nr_to_scan -=  range_size(range);
                                 ^^
Two space characters.

In the old code we didn't *really* have to worry about sc->nr_to_scan
dropping to negative, but now we do.  ->nr_to_scan is unsigned so it
would be a high positive value now so it's maybe a forever loop?  I'm
too lazy to verify...

regards,
dan carpenter


More information about the devel mailing list