[PATCH] mm/compaction: __compact_pgdat() code cleanuup

[PATCH] mm/compaction: __compact_pgdat() code cleanuup

[Joonsoo Kim]

This patch uses is_via_compact_memory() to distinguish direct compaction.
And it also reduces indentation on compaction_defer_reset
by filtering failure case. There is no functional change.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
---
 mm/compaction.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mm/compaction.c b/mm/compaction.c
index de3e1e7..2b1a15e 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1658,14 +1658,17 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
 				!compaction_deferred(zone, cc->order))
 			compact_zone(zone, cc);
 
-		if (cc->order > 0) {
-			if (zone_watermark_ok(zone, cc->order,
-						low_wmark_pages(zone), 0, 0))
-				compaction_defer_reset(zone, cc->order, false);
-		}
-
 		VM_BUG_ON(!list_empty(&cc->freepages));
 		VM_BUG_ON(!list_empty(&cc->migratepages));
+
+		if (is_via_compact_memory(cc->order))
+			continue;
+
+		if (!zone_watermark_ok(zone, cc->order,
+				low_wmark_pages(zone), 0, 0))
+			continue;
+
+		compaction_defer_reset(zone, cc->order, false);
 	}
 }
 
-- 
1.9.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] mm/compaction: __compact_pgdat() code cleanuup

[Yaowei Bai]

On Tue, Nov 24, 2015 at 03:24:42PM +0900, Joonsoo Kim wrote:
> This patch uses is_via_compact_memory() to distinguish direct compaction.
> And it also reduces indentation on compaction_defer_reset
> by filtering failure case. There is no functional change.
> 
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> ---
>  mm/compaction.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/mm/compaction.c b/mm/compaction.c
> index de3e1e7..2b1a15e 100644
> --- a/mm/compaction.c
> +++ b/mm/compaction.c
> @@ -1658,14 +1658,17 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
>  				!compaction_deferred(zone, cc->order))
>  			compact_zone(zone, cc);
>  
> -		if (cc->order > 0) {
> -			if (zone_watermark_ok(zone, cc->order,
> -						low_wmark_pages(zone), 0, 0))
> -				compaction_defer_reset(zone, cc->order, false);
> -		}
> -
>  		VM_BUG_ON(!list_empty(&cc->freepages));
>  		VM_BUG_ON(!list_empty(&cc->migratepages));
> +
> +		if (is_via_compact_memory(cc->order))
> +			continue;
> +
> +		if (!zone_watermark_ok(zone, cc->order,
> +				low_wmark_pages(zone), 0, 0))
> +			continue;
> +
> +		compaction_defer_reset(zone, cc->order, false);
>  	}
>  }

This makes more sense,

Acked-by: Yaowei Bai <baiyaowei@cmss.chinamobile.com>

>  
> -- 
> 1.9.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] mm/compaction: __compact_pgdat() code cleanuup

[Vlastimil Babka]

On 11/24/2015 07:24 AM, Joonsoo Kim wrote:
> This patch uses is_via_compact_memory() to distinguish direct compaction.
> And it also reduces indentation on compaction_defer_reset
> by filtering failure case. There is no functional change.
>
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> ---
>   mm/compaction.c | 15 +++++++++------
>   1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/mm/compaction.c b/mm/compaction.c
> index de3e1e7..2b1a15e 100644
> --- a/mm/compaction.c
> +++ b/mm/compaction.c
> @@ -1658,14 +1658,17 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
>   				!compaction_deferred(zone, cc->order))
>   			compact_zone(zone, cc);
>
> -		if (cc->order > 0) {
> -			if (zone_watermark_ok(zone, cc->order,
> -						low_wmark_pages(zone), 0, 0))
> -				compaction_defer_reset(zone, cc->order, false);
> -		}
> -
>   		VM_BUG_ON(!list_empty(&cc->freepages));
>   		VM_BUG_ON(!list_empty(&cc->migratepages));
> +
> +		if (is_via_compact_memory(cc->order))
> +			continue;

That's fine.

> +		if (!zone_watermark_ok(zone, cc->order,
> +				low_wmark_pages(zone), 0, 0))
> +			continue;
> +
> +		compaction_defer_reset(zone, cc->order, false);

Here I'd personally find the way of "if(watermark_ok) defer_reset()" 
logic easier to follow.

>   	}
>   }
>
>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] mm/compaction: __compact_pgdat() code cleanuup

[Joonsoo Kim]

On Tue, Nov 24, 2015 at 09:49:49AM +0100, Vlastimil Babka wrote:
> On 11/24/2015 07:24 AM, Joonsoo Kim wrote:
> >This patch uses is_via_compact_memory() to distinguish direct compaction.
> >And it also reduces indentation on compaction_defer_reset
> >by filtering failure case. There is no functional change.
> >
> >Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> >---
> >  mm/compaction.c | 15 +++++++++------
> >  1 file changed, 9 insertions(+), 6 deletions(-)
> >
> >diff --git a/mm/compaction.c b/mm/compaction.c
> >index de3e1e7..2b1a15e 100644
> >--- a/mm/compaction.c
> >+++ b/mm/compaction.c
> >@@ -1658,14 +1658,17 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
> >  				!compaction_deferred(zone, cc->order))
> >  			compact_zone(zone, cc);
> >
> >-		if (cc->order > 0) {
> >-			if (zone_watermark_ok(zone, cc->order,
> >-						low_wmark_pages(zone), 0, 0))
> >-				compaction_defer_reset(zone, cc->order, false);
> >-		}
> >-
> >  		VM_BUG_ON(!list_empty(&cc->freepages));
> >  		VM_BUG_ON(!list_empty(&cc->migratepages));
> >+
> >+		if (is_via_compact_memory(cc->order))
> >+			continue;
> 
> That's fine.
> 
> >+		if (!zone_watermark_ok(zone, cc->order,
> >+				low_wmark_pages(zone), 0, 0))
> >+			continue;
> >+
> >+		compaction_defer_reset(zone, cc->order, false);
> 
> Here I'd personally find the way of "if(watermark_ok) defer_reset()"
> logic easier to follow.

Okay. Will change it.

Thanks.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>