Skip to contentSkip to conversation

Fix for applied series [PATCH v5 0/5] Hyper-V VTL support

PATCH In review Saurabh Sengar 3 participants 6 messages Apr 18, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Fix for applied series [PATCH v5 0/5] Hyper-V VTL support

[PATCH v5 0/5] Hyper-V VTL support is already applied, however there are couple of kernel test bot warning reported. This patch series on top of [PATCH v5 0/5] Hyper-V VTL support fixes these. I expect them to be squash commit on respective patches.

The first patch is to fix 1/5 of the series:
https://lore.kernel.org/all/[email protected]/
The second patch is to fix 3/5 of the series:
https://lore.kernel.org/all/[email protected]/

Saurabh Sengar (2):
x86/init: Remove static for get/set_rtc_noop()
x86/hyperv: Allow hv_get_nmi_reason compilation irrespective of HYPERV
config

 arch/x86/include/asm/mshyperv.h | 10 +++++-----
 arch/x86/kernel/x86_init.c      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/2 x86/init: Remove static for get/set_rtc_noop()

Remove static from get/set_rtc_noop() so that it can be accessed outside of the file.

---
 arch/x86/kernel/x86_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/x86_init.c +2 -2
index ecdeb0974a87..d82f4fa2f1bf 100644
@@ -33,8 +33,8 @@ static int __init iommu_init_noop(void) { return 0; }
 static void iommu_shutdown_noop(void) { }
 bool __init bool_x86_init_noop(void) { return false; }
 void x86_op_int_noop(int cpu) { }
-static int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
-static void get_rtc_noop(struct timespec64 *now) { }
+int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
+void get_rtc_noop(struct timespec64 *now) { }
 
 static __initconst const struct of_device_id of_cmos_match[] = {
 	{ .compatible = "motorola,mc146818" },
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/2 x86/hyperv: Allow hv_get_nmi_reason compilation irrespective of HYPERV config

In reply to Saurabh Sengar

Move hv_get_nmi_reason out of CONFIG_HYPERV guard, so that it can be compiled irrespective of CONFIG_HYPERV enabled or not.

---
 arch/x86/include/asm/mshyperv.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/mshyperv.h +5 -5
index 71ed240ef66d..67f8386c1775 100644
@@ -29,6 +29,11 @@ typedef int (*hyperv_fill_flush_list_func)(
 
 void hyperv_vector_handler(struct pt_regs *regs);
 
+static inline unsigned char hv_get_nmi_reason(void)
+{
+	return 0;
+}
+
 #if IS_ENABLED(CONFIG_HYPERV)
 extern int hyperv_init_cpuhp;
 
@@ -189,11 +194,6 @@ static inline struct hv_vp_assist_page *hv_get_vp_assist_page(unsigned int cpu)
 	return hv_vp_assist_page[cpu];
 }
 
-static inline unsigned char hv_get_nmi_reason(void)
-{
-	return 0;
-}
-
 void __init hyperv_init(void);
 void hyperv_setup_mmu_ops(void);
 void set_hv_tscchange_cb(void (*cb)(void));
Signature · 1 line
2.34.1
maintainer
#3 lore raw
In reply to Saurabh Sengar
Quoted 4 lines · Saurabh Sengar

[PATCH v5 0/5] Hyper-V VTL support is already applied, however there are couple of kernel test bot warning reported. This patch series on top of [PATCH v5 0/5] Hyper-V VTL support fixes these. I expect them to be squash commit on respective patches.

That was supposed to happen when applying those using -rc7 as a base.

Wei, what's up?

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
maintainer
#4 lore raw
Quoted 9 lines · Borislav Petkov
Quoted 4 lines · Saurabh Sengar

[PATCH v5 0/5] Hyper-V VTL support is already applied, however there are couple of kernel test bot warning reported. This patch series on top of [PATCH v5 0/5] Hyper-V VTL support fixes these. I expect them to be squash commit on respective patches.

That was supposed to happen when applying those using -rc7 as a base.

Wei, what's up?

I did use -rc7 as the base. This is what is in hyperv-next right now.

https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git/commit/?h=hyperv-next&id=25dcc7316ef7def25cdab3658ac665bf0ce0ddc5

I think Saurabh was responding to a report that was generated on his v5 series. I don't think the first patch is needed.

The second one is probably still needed.

Thanks,
Wei.

Quoted 6 lines
Signature · 5 lines
-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
maintainer
#5 lore raw
Quoted 9 lines · Wei Liu
Quoted 8 lines · Borislav Petkov
Quoted 4 lines · Saurabh Sengar

[PATCH v5 0/5] Hyper-V VTL support is already applied, however there are couple of kernel test bot warning reported. This patch series on top of [PATCH v5 0/5] Hyper-V VTL support fixes these. I expect them to be squash commit on respective patches.

That was supposed to happen when applying those using -rc7 as a base.

Quoted 8 lines
Quoted 1 line

Wei, what's up?

I did use -rc7 as the base. This is what is in hyperv-next right now.

https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git/commit/?h=hyperv-next&id=25dcc7316ef7def25cdab3658ac665bf0ce0ddc5

I think Saurabh was responding to a report that was generated on his v5 series. I don't think the first patch is needed.

Never mind, I think I messed up when applying Saurabh's patch. I will fix the tree today.

Thanks,
Wei.