mm/page_alloc: Repalce with deferred_pages_enabled() wherever applicable

Message ID 20230105082506.241529-1-anshuman.khandual@arm.com
State New
Headers
Series mm/page_alloc: Repalce with deferred_pages_enabled() wherever applicable |

Commit Message

Anshuman Khandual Jan. 5, 2023, 8:25 a.m. UTC
  Instead of directly accessing static deferred_pages, replace such instances
with the helper deferred_pages_enabled(). No functional change is intended.

Cc; Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
This applies on v6.2-rc2.

 mm/page_alloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Mike Rapoport Jan. 5, 2023, 9:43 a.m. UTC | #1
On Thu, Jan 05, 2023 at 01:55:06PM +0530, Anshuman Khandual wrote:
> Instead of directly accessing static deferred_pages, replace such instances
> with the helper deferred_pages_enabled(). No functional change is intended.
> 
> Cc; Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-mm@kvack.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>

Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>

> ---
> This applies on v6.2-rc2.
> 
>  mm/page_alloc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 0745aedebb37..232d0323047b 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -4244,7 +4244,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
>  			 * Watermark failed for this zone, but see if we can
>  			 * grow this zone if it contains deferred pages.
>  			 */
> -			if (static_branch_unlikely(&deferred_pages)) {
> +			if (deferred_pages_enabled()) {
>  				if (_deferred_grow_zone(zone, order))
>  					goto try_this_zone;
>  			}
> @@ -4293,7 +4293,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
>  		} else {
>  #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
>  			/* Try again if zone has deferred pages */
> -			if (static_branch_unlikely(&deferred_pages)) {
> +			if (deferred_pages_enabled()) {
>  				if (_deferred_grow_zone(zone, order))
>  					goto try_this_zone;
>  			}
> -- 
> 2.25.1
>
  
David Hildenbrand Jan. 5, 2023, 1 p.m. UTC | #2
s/Repalce/Replace/

n 05.01.23 09:25, Anshuman Khandual wrote:
> Instead of directly accessing static deferred_pages, replace such instances
> with the helper deferred_pages_enabled(). No functional change is intended.
> 
> Cc; Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-mm@kvack.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
> ---


Reviewed-by: David Hildenbrand <david@redhat.com>
  
Mel Gorman Jan. 9, 2023, 1:32 p.m. UTC | #3
On Thu, Jan 05, 2023 at 01:55:06PM +0530, Anshuman Khandual wrote:
> Instead of directly accessing static deferred_pages, replace such instances
> with the helper deferred_pages_enabled(). No functional change is intended.
> 
> Cc; Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-mm@kvack.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>

Acked-by: Mel Gorman <mgorman@suse.de>
  

Patch

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0745aedebb37..232d0323047b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4244,7 +4244,7 @@  get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
 			 * Watermark failed for this zone, but see if we can
 			 * grow this zone if it contains deferred pages.
 			 */
-			if (static_branch_unlikely(&deferred_pages)) {
+			if (deferred_pages_enabled()) {
 				if (_deferred_grow_zone(zone, order))
 					goto try_this_zone;
 			}
@@ -4293,7 +4293,7 @@  get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
 		} else {
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
 			/* Try again if zone has deferred pages */
-			if (static_branch_unlikely(&deferred_pages)) {
+			if (deferred_pages_enabled()) {
 				if (_deferred_grow_zone(zone, order))
 					goto try_this_zone;
 			}