From: "Luck, Tony" <tony.luck@intel.com>
To: Yazen Ghannam <Yazen.Ghannam@amd.com>
Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org,
x86@kernel.org, Smita.KoralahalliChannabasappa@amd.com,
stable@vger.kernel.org
Subject: Re: [PATCH 2/2] x86/MCE: Don't call kill_me_now() directly
Date: Tue, 4 May 2021 11:07:34 -0700 [thread overview]
Message-ID: <20210504180734.GA721714@agluck-desk2.amr.corp.intel.com> (raw)
In-Reply-To: <20210504174712.27675-3-Yazen.Ghannam@amd.com>
On Tue, May 04, 2021 at 05:47:12PM +0000, Yazen Ghannam wrote:
> From: Yazen Ghannam <yazen.ghannam@amd.com>
>
> Always call kill_me_maybe() in order to attempt memory recovery. This
> ensures that any memory associated with the error is properly marked as
> poison.
>
> This is needed for errors that occur on memory, but that do not have
> MCG_STATUS[RIPV] set. One example is data poison consumption through the
> instruction fetch units on AMD Zen-based systems.
>
> The MF_MUST_KILL flag is passed to memory_failure() when
> MCG_STATUS[RIPV] is not set. So the associated process will still be
> killed.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> ---
> arch/x86/kernel/cpu/mce/core.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
> index 308fb644b94a..9040d45ed997 100644
> --- a/arch/x86/kernel/cpu/mce/core.c
> +++ b/arch/x86/kernel/cpu/mce/core.c
> @@ -1285,10 +1285,7 @@ static void queue_task_work(struct mce *m, int kill_current_task)
> current->mce_ripv = !!(m->mcgstatus & MCG_STATUS_RIPV);
> current->mce_whole_page = whole_page(m);
>
> - if (kill_current_task)
> - current->mce_kill_me.func = kill_me_now;
> - else
> - current->mce_kill_me.func = kill_me_maybe;
> + current->mce_kill_me.func = kill_me_maybe;
>
> task_work_add(current, ¤t->mce_kill_me, TWA_RESUME);
> }
Could we just get rid of kill_me_now() at the same time? It's only
one line, and with this change only called in one place (from
kill_me_maybe()) ... just put the force_sig(SIGBUS); inline?
-Tony
next prev parent reply other threads:[~2021-05-04 18:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 17:47 [PATCH 0/2] AMD Zen-based IF Unit Poison Quirk Yazen Ghannam
2021-05-04 17:47 ` [PATCH 1/2] x86/MCE: Always save CS register on AMD Zen IF errors Yazen Ghannam
2021-05-04 17:47 ` [PATCH 2/2] x86/MCE: Don't call kill_me_now() directly Yazen Ghannam
2021-05-04 18:07 ` Luck, Tony [this message]
2021-05-04 18:29 ` Yazen Ghannam
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=20210504180734.GA721714@agluck-desk2.amr.corp.intel.com \
--to=tony.luck@intel.com \
--cc=Smita.KoralahalliChannabasappa@amd.com \
--cc=Yazen.Ghannam@amd.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).