* linux-next: build failure after merge of the kvm-fixes tree
@ 2021-05-26 22:43 Stephen Rothwell
2021-05-27 4:56 ` Wanpeng Li
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2021-05-26 22:43 UTC (permalink / raw)
To: Paolo Bonzini, KVM
Cc: Wanpeng Li, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
Hi all,
After merging the kvm-fixes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from arch/powerpc/include/asm/kvm_ppc.h:19,
from arch/powerpc/include/asm/dbell.h:17,
from arch/powerpc/kernel/asm-offsets.c:38:
include/linux/kvm_host.h: In function 'kvm_vcpu_can_poll':
include/linux/kvm_host.h:270:9: error: implicit declaration of function 'single_task_running' [-Werror=implicit-function-declaration]
270 | return single_task_running() && !need_resched() && ktime_before(cur, stop);
| ^~~~~~~~~~~~~~~~~~~
Caused by commit
85d4c3baeb45 ("KVM: PPC: exit halt polling on need_resched()")
I have used the kvm-fixes tree from next-20210524 again today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the kvm-fixes tree
2021-05-26 22:43 linux-next: build failure after merge of the kvm-fixes tree Stephen Rothwell
@ 2021-05-27 4:56 ` Wanpeng Li
2021-05-27 11:44 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Wanpeng Li @ 2021-05-27 4:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paolo Bonzini, KVM, Wanpeng Li, Linux Kernel Mailing List,
Linux Next Mailing List
On Thu, 27 May 2021 at 10:50, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the kvm-fixes tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> In file included from arch/powerpc/include/asm/kvm_ppc.h:19,
> from arch/powerpc/include/asm/dbell.h:17,
> from arch/powerpc/kernel/asm-offsets.c:38:
> include/linux/kvm_host.h: In function 'kvm_vcpu_can_poll':
> include/linux/kvm_host.h:270:9: error: implicit declaration of function 'single_task_running' [-Werror=implicit-function-declaration]
> 270 | return single_task_running() && !need_resched() && ktime_before(cur, stop);
> | ^~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 85d4c3baeb45 ("KVM: PPC: exit halt polling on need_resched()")
>
> I have used the kvm-fixes tree from next-20210524 again today.
The kvm/master is broken by several patches.
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 0f6f394..e851671 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -1659,7 +1659,7 @@ struct kvm_hv_hcall {
static u64 kvm_hv_flush_tlb(struct kvm_vcpu *vcpu, struct
kvm_hv_hcall *hc, bool ex)
{
- int i, j;
+ int i;
gpa_t gpa;
struct kvm *kvm = vcpu->kvm;
struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9d095bed..feb9611 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3604,7 +3604,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu,
struct msr_data *msr_info)
* to ensure backwards-compatible behavior for migration.
*/
if (msr_info->host_initiated &&
- kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_TSC_HOST_ACCESS))
+ kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_TSC_HOST_ACCESS)) {
offset = vcpu->arch.l1_tsc_offset;
ratio = vcpu->arch.l1_tsc_scaling_ratio;
} else {
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 18905c9..4273e04 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -10,6 +10,7 @@
#include <linux/spinlock.h>
#include <linux/signal.h>
#include <linux/sched.h>
+#include <linux/sched/stat.h>
#include <linux/bug.h>
#include <linux/minmax.h>
#include <linux/mm.h>
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the kvm-fixes tree
2021-05-27 4:56 ` Wanpeng Li
@ 2021-05-27 11:44 ` Paolo Bonzini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2021-05-27 11:44 UTC (permalink / raw)
To: Wanpeng Li, Stephen Rothwell
Cc: KVM, Wanpeng Li, Linux Kernel Mailing List, Linux Next Mailing List
On 27/05/21 06:56, Wanpeng Li wrote:
> On Thu, 27 May 2021 at 10:50, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the kvm-fixes tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> In file included from arch/powerpc/include/asm/kvm_ppc.h:19,
>> from arch/powerpc/include/asm/dbell.h:17,
>> from arch/powerpc/kernel/asm-offsets.c:38:
>> include/linux/kvm_host.h: In function 'kvm_vcpu_can_poll':
>> include/linux/kvm_host.h:270:9: error: implicit declaration of function 'single_task_running' [-Werror=implicit-function-declaration]
>> 270 | return single_task_running() && !need_resched() && ktime_before(cur, stop);
>> | ^~~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>> 85d4c3baeb45 ("KVM: PPC: exit halt polling on need_resched()")
>>
>> I have used the kvm-fixes tree from next-20210524 again today.
>
> The kvm/master is broken by several patches.
I made a mess and pushed a bunch of 5.13 patches to it. Apologies
everyone, I will rewind kvm/master. If you had checked it out
yesterday, be careful to remove anything not belonging to your tree.
Paolo
> diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
> index 0f6f394..e851671 100644
> --- a/arch/x86/kvm/hyperv.c
> +++ b/arch/x86/kvm/hyperv.c
> @@ -1659,7 +1659,7 @@ struct kvm_hv_hcall {
>
> static u64 kvm_hv_flush_tlb(struct kvm_vcpu *vcpu, struct
> kvm_hv_hcall *hc, bool ex)
> {
> - int i, j;
> + int i;
> gpa_t gpa;
> struct kvm *kvm = vcpu->kvm;
> struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu);
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 9d095bed..feb9611 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -3604,7 +3604,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu,
> struct msr_data *msr_info)
> * to ensure backwards-compatible behavior for migration.
> */
> if (msr_info->host_initiated &&
> - kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_TSC_HOST_ACCESS))
> + kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_TSC_HOST_ACCESS)) {
> offset = vcpu->arch.l1_tsc_offset;
> ratio = vcpu->arch.l1_tsc_scaling_ratio;
> } else {
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index 18905c9..4273e04 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -10,6 +10,7 @@
> #include <linux/spinlock.h>
> #include <linux/signal.h>
> #include <linux/sched.h>
> +#include <linux/sched/stat.h>
> #include <linux/bug.h>
> #include <linux/minmax.h>
> #include <linux/mm.h>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: build failure after merge of the kvm-fixes tree
@ 2021-05-24 23:32 Stephen Rothwell
2021-05-24 23:55 ` Wanpeng Li
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2021-05-24 23:32 UTC (permalink / raw)
To: Paolo Bonzini, KVM
Cc: Wanpeng Li, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
Hi all,
After merging the kvm-fixes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
ERROR: modpost: ".kvm_vcpu_can_poll" [arch/powerpc/kvm/kvm-hv.ko] undefined!
Caused by commit
0fee89fbc44b ("KVM: PPC: exit halt polling on need_resched()")
I have used the kvm-fixes tree from next-20210524 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the kvm-fixes tree
2021-05-24 23:32 Stephen Rothwell
@ 2021-05-24 23:55 ` Wanpeng Li
0 siblings, 0 replies; 5+ messages in thread
From: Wanpeng Li @ 2021-05-24 23:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paolo Bonzini, KVM, Wanpeng Li, Linux Kernel Mailing List,
Linux Next Mailing List
On Tue, 25 May 2021 at 07:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the kvm-fixes tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ERROR: modpost: ".kvm_vcpu_can_poll" [arch/powerpc/kvm/kvm-hv.ko] undefined!
>
> Caused by commit
>
> 0fee89fbc44b ("KVM: PPC: exit halt polling on need_resched()")
This is my fault.
From b2a6d98b48fc6b22a0b47f57a98dc3203c678195 Mon Sep 17 00:00:00 2001
From: Wanpeng Li <wanpengli@tencent.com>
Date: Tue, 25 May 2021 07:50:08 +0800
Subject: [PATCH] KVM: Fix ERROR: modpost: .kvm_vcpu_can_poll undefined!
From: Wanpeng Li <wanpengli@tencent.com>
Export kvm_vcpu_can_poll to fix ERROR: modpost: .kvm_vcpu_can_poll undefined!
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
virt/kvm/kvm_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 62522c1..8eaec42 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2949,6 +2949,7 @@ bool kvm_vcpu_can_poll(ktime_t cur, ktime_t stop)
{
return single_task_running() && !need_resched() && ktime_before(cur, stop);
}
+EXPORT_SYMBOL_GPL(kvm_vcpu_can_poll);
/*
* The vCPU has executed a HLT instruction with in-kernel mode enabled.
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-27 11:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-26 22:43 linux-next: build failure after merge of the kvm-fixes tree Stephen Rothwell
2021-05-27 4:56 ` Wanpeng Li
2021-05-27 11:44 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2021-05-24 23:32 Stephen Rothwell
2021-05-24 23:55 ` Wanpeng Li
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).