From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, vannapurve@google.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.13.y] x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT
Date: Thu, 10 Apr 2025 11:53:35 -0400 [thread overview]
Message-ID: <20250409233229-83aa147302465a90@stable.kernel.org> (raw)
In-Reply-To: <20250408125645.3856166-1-vannapurve@google.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: 22cc5ca5de52bbfc36a7d4a55323f91fb4492264
WARNING: Author mismatch between patch and found commit:
Backport author: Vishal Annapurve<vannapurve@google.com>
Commit author: Kirill A. Shutemov<kirill.shutemov@linux.intel.com>
Status in newer kernel trees:
6.14.y | Present (different SHA1: 263850bf7db9)
Note: The patch differs from the upstream commit:
---
1: 22cc5ca5de52b ! 1: 5fca555be7cc5 x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT
@@ Commit message
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: stable@kernel.org
Link: https://lore.kernel.org/r/20250228014416.3925664-2-vannapurve@google.com
+ (cherry picked from commit 22cc5ca5de52bbfc36a7d4a55323f91fb4492264)
## arch/x86/include/asm/irqflags.h ##
@@ arch/x86/include/asm/irqflags.h: static __always_inline void native_local_irq_restore(unsigned long flags)
@@ arch/x86/include/asm/paravirt.h: static inline void __write_cr4(unsigned long x)
- PVOP_VCALL0(irq.halt);
-}
-
- static inline u64 paravirt_read_msr(unsigned msr)
- {
- return PVOP_CALL1(u64, cpu.read_msr, msr);
+ extern noinstr void pv_native_wbinvd(void);
+
+ static __always_inline void wbinvd(void)
## arch/x86/include/asm/paravirt_types.h ##
@@ arch/x86/include/asm/paravirt_types.h: struct pv_irq_ops {
@@ arch/x86/include/asm/paravirt_types.h: struct pv_irq_ops {
struct pv_mmu_ops {
## arch/x86/kernel/paravirt.c ##
-@@ arch/x86/kernel/paravirt.c: void paravirt_set_sched_clock(u64 (*func)(void))
- static_call_update(pv_sched_clock, func);
+@@ arch/x86/kernel/paravirt.c: int paravirt_disable_iospace(void)
+ return request_resource(&ioport_resource, &reserve_ioports);
}
+static noinstr void pv_native_safe_halt(void)
@@ arch/x86/kernel/paravirt.c: void paravirt_set_sched_clock(u64 (*func)(void))
#ifdef CONFIG_PARAVIRT_XXL
static noinstr void pv_native_write_cr2(unsigned long val)
{
-@@ arch/x86/kernel/paravirt.c: static noinstr void pv_native_set_debugreg(int regno, unsigned long val)
+@@ arch/x86/kernel/paravirt.c: noinstr void pv_native_wbinvd(void)
{
- native_set_debugreg(regno, val);
+ native_wbinvd();
}
-
-static noinstr void pv_native_safe_halt(void)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.13.y | Success | Success |
prev parent reply other threads:[~2025-04-10 15:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 7:00 FAILED: patch "[PATCH] x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT" failed to apply to 6.13-stable tree gregkh
2025-04-08 12:56 ` [PATCH 6.13.y] x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT Vishal Annapurve
2025-04-10 15:53 ` Sasha Levin [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=20250409233229-83aa147302465a90@stable.kernel.org \
--to=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vannapurve@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.