public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, kirill.shutemov@linux.intel.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] mm/page_alloc: fix memory accept before watermarks gets initialized
Date: Tue, 25 Mar 2025 12:56:44 -0400	[thread overview]
Message-ID: <20250325124736-cc99722df0f49555@stable.kernel.org> (raw)
In-Reply-To: <20250325121621.2011574-1-kirill.shutemov@linux.intel.com>

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it

Found matching upstream commit: 800f1059c99e2b39899bdc67a7593a7bea6375d8

Status in newer kernel trees:
6.13.y | Present (different SHA1: 18c31f7ee240)
6.12.y | Present (different SHA1: f4bc2f91e6f5)

Note: The patch differs from the upstream commit:
---
1:  800f1059c99e2 ! 1:  48ab092457a25 mm/page_alloc: fix memory accept before watermarks gets initialized
    @@ Commit message
         Cc: Thomas Lendacky <thomas.lendacky@amd.com>
         Cc: <stable@vger.kernel.org>    [6.5+]
         Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    +    (cherry picked from commit 800f1059c99e2b39899bdc67a7593a7bea6375d8)
    +    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
     
      ## mm/page_alloc.c ##
    -@@ mm/page_alloc.c: static inline bool has_unaccepted_memory(void)
    +@@ mm/page_alloc.c: static bool try_to_accept_memory_one(struct zone *zone)
      
      static bool cond_accept_memory(struct zone *zone, unsigned int order)
      {
    @@ mm/page_alloc.c: static bool cond_accept_memory(struct zone *zone, unsigned int
      	if (list_empty(&zone->unaccepted_pages))
      		return false;
      
    -+	wmark = promo_wmark_pages(zone);
    ++	wmark = high_wmark_pages(zone);
     +
     +	/*
     +	 * Watermarks have not been initialized yet.
    @@ mm/page_alloc.c: static bool cond_accept_memory(struct zone *zone, unsigned int
     +	if (!wmark)
     +		return try_to_accept_memory_one(zone);
     +
    - 	/* How much to accept to get to promo watermark? */
    --	to_accept = promo_wmark_pages(zone) -
    + 	/* How much to accept to get to high watermark? */
    +-	to_accept = high_wmark_pages(zone) -
     +	to_accept = wmark -
      		    (zone_page_state(zone, NR_FREE_PAGES) -
      		    __zone_watermark_unusable_free(zone, order, 0) -
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |

  reply	other threads:[~2025-03-25 16:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-24 15:32 FAILED: patch "[PATCH] mm/page_alloc: fix memory accept before watermarks gets" failed to apply to 6.6-stable tree gregkh
2025-03-25 12:16 ` [PATCH 6.6.y] mm/page_alloc: fix memory accept before watermarks gets initialized Kirill A. Shutemov
2025-03-25 16:56   ` Sasha Levin [this message]
2025-03-26  6:50     ` Kirill A. Shutemov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250325124736-cc99722df0f49555@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox