Stable Archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Miaohe Lin <linmiaohe@huawei.com>
Cc: stable@vger.kernel.org, Oscar Salvador <osalvador@suse.de>,
	Tony Luck <tony.luck@intel.com>, Peter Xu <peterx@redhat.com>,
	David Hildenbrand <david@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH 6.1.y] mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Date: Wed, 15 May 2024 09:28:31 +0200	[thread overview]
Message-ID: <2024051523-transfer-buffed-7829@gregkh> (raw)
In-Reply-To: <20240507092822.3460106-1-linmiaohe@huawei.com>

On Tue, May 07, 2024 at 05:28:22PM +0800, Miaohe Lin wrote:
> From: Oscar Salvador <osalvador@suse.de>
> 
> Tony reported that the Machine check recovery was broken in v6.9-rc1, as
> he was hitting a VM_BUG_ON when injecting uncorrectable memory errors to
> DRAM.
> 
> After some more digging and debugging on his side, he realized that this
> went back to v6.1, with the introduction of 'commit 0d206b5d2e0d
> ("mm/swap: add swp_offset_pfn() to fetch PFN from swap entry")'.  That
> commit, among other things, introduced swp_offset_pfn(), replacing
> hwpoison_entry_to_pfn() in its favour.
> 
> The patch also introduced a VM_BUG_ON() check for is_pfn_swap_entry(), but
> is_pfn_swap_entry() never got updated to cover hwpoison entries, which
> means that we would hit the VM_BUG_ON whenever we would call
> swp_offset_pfn() for such entries on environments with CONFIG_DEBUG_VM
> set.  Fix this by updating the check to cover hwpoison entries as well,
> and update the comment while we are it.
> 
> Link: https://lkml.kernel.org/r/20240407130537.16977-1-osalvador@suse.de
> Fixes: 0d206b5d2e0d ("mm/swap: add swp_offset_pfn() to fetch PFN from swap entry")
> Signed-off-by: Oscar Salvador <osalvador@suse.de>
> Reported-by: Tony Luck <tony.luck@intel.com>
> Closes: https://lore.kernel.org/all/Zg8kLSl2yAlA3o5D@agluck-desk3/
> Tested-by: Tony Luck <tony.luck@intel.com>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Reviewed-by: David Hildenbrand <david@redhat.com>
> Acked-by: Miaohe Lin <linmiaohe@huawei.com>
> Cc: <stable@vger.kernel.org>	[6.1.x]
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> (cherry picked from commit 07a57a338adb6ec9e766d6a6790f76527f45ceb5)
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
>  include/linux/swapops.h | 105 ++++++++++++++++++++--------------------
>  1 file changed, 53 insertions(+), 52 deletions(-)

Now queued up, thanks.

greg k-h

      reply	other threads:[~2024-05-15  7:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-23 12:51 FAILED: patch "[PATCH] mm,swapops: update check in is_pfn_swap_entry for hwpoison" failed to apply to 6.1-stable tree gregkh
2024-05-07  9:28 ` [PATCH 6.1.y] mm,swapops: update check in is_pfn_swap_entry for hwpoison entries Miaohe Lin
2024-05-15  7:28   ` Greg KH [this message]

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=2024051523-transfer-buffed-7829@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=linmiaohe@huawei.com \
    --cc=osalvador@suse.de \
    --cc=peterx@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=tony.luck@intel.com \
    /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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).