[PATCH] LMK: Optimize lowmem_shrink

[PATCH] LMK: Optimize lowmem_shrink

[Leon Ma]

From: Leon Ma <xindong.ma@intel.com>
Date: Mon, 19 Aug 2013 14:22:38 +0800
Subject: [PATCH] LMK: Optimize lowmem_shrink.

By comparing with selected_oom_score_adj instead of min_score_adj,
we may do less calculation.

Signed-off-by: Leon Ma <xindong.ma@intel.com>
---
 drivers/staging/android/lowmemorykiller.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/android/lowmemorykiller.c
b/drivers/staging/android/lowmemorykiller.c
index f6c05c9..cb944c5 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -126,7 +126,7 @@ static int lowmem_shrink(struct shrinker *s, struct
shrink_control *sc)
 			return 0;
 		}
 		oom_score_adj = p->signal->oom_score_adj;
-		if (oom_score_adj < min_score_adj) {
+		if (oom_score_adj < selected_oom_score_adj) {
 			task_unlock(p);
 			continue;
 		}
@@ -134,13 +134,9 @@ static int lowmem_shrink(struct shrinker *s, struct
shrink_control *sc)
 		task_unlock(p);
 		if (tasksize <= 0)
 			continue;
-		if (selected) {
-			if (oom_score_adj < selected_oom_score_adj)
-				continue;
-			if (oom_score_adj == selected_oom_score_adj &&
-			    tasksize <= selected_tasksize)
-				continue;
-		}
+		if (selected && oom_score_adj == selected_oom_score_adj &&
+			tasksize <= selected_tasksize)
+			continue;
 		selected = p;
 		selected_tasksize = tasksize;
 		selected_oom_score_adj = oom_score_adj;
-- 
1.7.4.1

Re: [PATCH] LMK: Optimize lowmem_shrink

[Colin Cross]

On Mon, Aug 19, 2013 at 6:16 PM, Leon Ma <xindong.ma@intel.com> wrote:
> From: Leon Ma <xindong.ma@intel.com>
> Date: Mon, 19 Aug 2013 14:22:38 +0800
> Subject: [PATCH] LMK: Optimize lowmem_shrink.
>
> By comparing with selected_oom_score_adj instead of min_score_adj,
> we may do less calculation.
>
> Signed-off-by: Leon Ma <xindong.ma@intel.com>
> ---
>  drivers/staging/android/lowmemorykiller.c |   12 ++++--------
>  1 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/android/lowmemorykiller.c
> b/drivers/staging/android/lowmemorykiller.c
> index f6c05c9..cb944c5 100644
> --- a/drivers/staging/android/lowmemorykiller.c
> +++ b/drivers/staging/android/lowmemorykiller.c
> @@ -126,7 +126,7 @@ static int lowmem_shrink(struct shrinker *s, struct
> shrink_control *sc)
>                         return 0;
>                 }
>                 oom_score_adj = p->signal->oom_score_adj;
> -               if (oom_score_adj < min_score_adj) {
> +               if (oom_score_adj < selected_oom_score_adj) {

This needs to be oom_score_adj <= selected_oom_score_adj.

>                         task_unlock(p);
>                         continue;
>                 }
> @@ -134,13 +134,9 @@ static int lowmem_shrink(struct shrinker *s, struct
> shrink_control *sc)
>                 task_unlock(p);
>                 if (tasksize <= 0)
>                         continue;
> -               if (selected) {
> -                       if (oom_score_adj < selected_oom_score_adj)
> -                               continue;
> -                       if (oom_score_adj == selected_oom_score_adj &&
> -                           tasksize <= selected_tasksize)
> -                               continue;
> -               }
> +               if (selected && oom_score_adj == selected_oom_score_adj &&
> +                       tasksize <= selected_tasksize)
> +                       continue;
>                 selected = p;
>                 selected_tasksize = tasksize;
>                 selected_oom_score_adj = oom_score_adj;
> --
> 1.7.4.1
>
>
>

Re: [PATCH] LMK: Optimize lowmem_shrink

[Colin Cross]

On Mon, Aug 19, 2013 at 7:23 PM, Colin Cross <ccross@android.com> wrote:
> On Mon, Aug 19, 2013 at 6:16 PM, Leon Ma <xindong.ma@intel.com> wrote:
>> From: Leon Ma <xindong.ma@intel.com>
>> Date: Mon, 19 Aug 2013 14:22:38 +0800
>> Subject: [PATCH] LMK: Optimize lowmem_shrink.
>>
>> By comparing with selected_oom_score_adj instead of min_score_adj,
>> we may do less calculation.
>>
>> Signed-off-by: Leon Ma <xindong.ma@intel.com>
>> ---
>>  drivers/staging/android/lowmemorykiller.c |   12 ++++--------
>>  1 files changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/staging/android/lowmemorykiller.c
>> b/drivers/staging/android/lowmemorykiller.c
>> index f6c05c9..cb944c5 100644
>> --- a/drivers/staging/android/lowmemorykiller.c
>> +++ b/drivers/staging/android/lowmemorykiller.c
>> @@ -126,7 +126,7 @@ static int lowmem_shrink(struct shrinker *s, struct
>> shrink_control *sc)
>>                         return 0;
>>                 }
>>                 oom_score_adj = p->signal->oom_score_adj;
>> -               if (oom_score_adj < min_score_adj) {
>> +               if (oom_score_adj < selected_oom_score_adj) {
>
> This needs to be oom_score_adj <= selected_oom_score_adj.

Sorry, got the logic inverted, yours is correct.

>>                         task_unlock(p);
>>                         continue;
>>                 }
>> @@ -134,13 +134,9 @@ static int lowmem_shrink(struct shrinker *s, struct
>> shrink_control *sc)
>>                 task_unlock(p);
>>                 if (tasksize <= 0)
>>                         continue;
>> -               if (selected) {
>> -                       if (oom_score_adj < selected_oom_score_adj)
>> -                               continue;
>> -                       if (oom_score_adj == selected_oom_score_adj &&
>> -                           tasksize <= selected_tasksize)
>> -                               continue;
>> -               }
>> +               if (selected && oom_score_adj == selected_oom_score_adj &&
>> +                       tasksize <= selected_tasksize)
>> +                       continue;
>>                 selected = p;
>>                 selected_tasksize = tasksize;
>>                 selected_oom_score_adj = oom_score_adj;
>> --
>> 1.7.4.1
>>
>>
>>

Re: [PATCH] LMK: Optimize lowmem_shrink

[Dan Carpenter]

On Tue, Aug 20, 2013 at 09:16:33AM +0800, Leon Ma wrote:
> From: Leon Ma <xindong.ma@intel.com>
> Date: Mon, 19 Aug 2013 14:22:38 +0800
> Subject: [PATCH] LMK: Optimize lowmem_shrink.
> 
> By comparing with selected_oom_score_adj instead of min_score_adj,
> we may do less calculation.
> 

The patch is line wrapped and doesn't apply.
Read Documentation/email-clients.txt.  Send it to yourself first.
Save the whole email as raw text (including headers and everything).
cat email.txt | git am.
When that works, then resend.

regards,
dan carpenter

RE: [PATCH] LMK: Optimize lowmem_shrink

[Ma, Xindong]

> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Tuesday, August 20, 2013 4:30 PM
> To: Ma, Xindong
> Cc: gregkh@linuxfoundation.org; ccross@android.com;
> devel@driverdev.osuosl.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] LMK: Optimize lowmem_shrink
> 
> On Tue, Aug 20, 2013 at 09:16:33AM +0800, Leon Ma wrote:
> > From: Leon Ma <xindong.ma@intel.com>
> > Date: Mon, 19 Aug 2013 14:22:38 +0800
> > Subject: [PATCH] LMK: Optimize lowmem_shrink.
> >
> > By comparing with selected_oom_score_adj instead of min_score_adj, we
> > may do less calculation.
> >
> 
> The patch is line wrapped and doesn't apply.
> Read Documentation/email-clients.txt.  Send it to yourself first.
> Save the whole email as raw text (including headers and everything).
> cat email.txt | git am.
> When that works, then resend.
Sorry for the trouble. I forgot to click "Prefomatted" in Evolution. I've resend the patch
https://lkml.org/lkml/2013/8/20/754
Please have a review.
> 
> regards,
> dan carpenter

[PATCH] LMK: Optimize lowmem_shrink

[Leon Ma]

From: Leon Ma <xindong.ma@intel.com>
Date: Mon, 19 Aug 2013 14:22:38 +0800
Subject: [PATCH] LMK: Optimize lowmem_shrink.

By comparing with selected_oom_score_adj instead of min_score_adj,
we may do less calculation.

Signed-off-by: Leon Ma <xindong.ma@intel.com>
---
 drivers/staging/android/lowmemorykiller.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index f6c05c9..cb944c5 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -126,7 +126,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
 			return 0;
 		}
 		oom_score_adj = p->signal->oom_score_adj;
-		if (oom_score_adj < min_score_adj) {
+		if (oom_score_adj < selected_oom_score_adj) {
 			task_unlock(p);
 			continue;
 		}
@@ -134,13 +134,9 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
 		task_unlock(p);
 		if (tasksize <= 0)
 			continue;
-		if (selected) {
-			if (oom_score_adj < selected_oom_score_adj)
-				continue;
-			if (oom_score_adj == selected_oom_score_adj &&
-			    tasksize <= selected_tasksize)
-				continue;
-		}
+		if (selected && oom_score_adj == selected_oom_score_adj &&
+			tasksize <= selected_tasksize)
+			continue;
 		selected = p;
 		selected_tasksize = tasksize;
 		selected_oom_score_adj = oom_score_adj;
-- 
1.7.4.1

Re: [PATCH] LMK: Optimize lowmem_shrink

[Greg KH]

On Wed, Aug 21, 2013 at 09:41:05AM +0800, Leon Ma wrote:
> From: Leon Ma <xindong.ma@intel.com>
> Date: Mon, 19 Aug 2013 14:22:38 +0800
> Subject: [PATCH] LMK: Optimize lowmem_shrink.

Why is all of this in the patch body?

And what does "LMK:" stand for?

> By comparing with selected_oom_score_adj instead of min_score_adj,
> we may do less calculation.

What does this change?  Does it fix a problem?

thanks,

greg k-h

Re: [PATCH] LMK: Optimize lowmem_shrink

[Sergey Senozhatsky]

On (08/23/13 09:48), Greg KH wrote:
> Subject: Re: [PATCH] LMK: Optimize lowmem_shrink
> User-Agent: Mutt/1.5.21 (2010-09-15)
> 
> On Wed, Aug 21, 2013 at 09:41:05AM +0800, Leon Ma wrote:
> > From: Leon Ma <xindong.ma@intel.com>
> > Date: Mon, 19 Aug 2013 14:22:38 +0800
> > Subject: [PATCH] LMK: Optimize lowmem_shrink.
> 
> Why is all of this in the patch body?
> 
> And what does "LMK:" stand for?
>
> > By comparing with selected_oom_score_adj instead of min_score_adj,
> > we may do less calculation.
> 
> What does this change?  Does it fix a problem?

Hello,

linux-next since

	c95dd63d4cc3647643ff502d70c4c1b52947c770
	Author: Dave Chinner <dchinner@redhat.com>
	Date:   Fri Aug 16 09:39:54 2013 +1000

	drivers: convert shrinkers to new count/scan API

does not contain lowmem_shrink(), but lowmem_scan() instead. plus at lest
one more patch on top of it (e2bfaf75e763396b7baa7c1effa4053d7f19e6d3):

[..]
-static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)

+static long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
[..]

wouldn't it be better to have the patch against -next in this case (in
case it fixes anything)?

thanks,
	-ss

> thanks,
> 
> greg k-h
> _______________________________________________
> devel mailing list
> devel@linuxdriverproject.org
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
>