linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kernel/kvm.c between commits: b037b09b9058 ("x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit()") a27a0a55495c ("x86/entry: Cleanup idtentry_enter/exit") from the tip tree and commits:

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kernel/kvm.c between commit: b037b09b9058 ("x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit()") from the tip tree and commit: b1d405751cd5 ("KVM: x86: Switch KVM guest to using

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi all, On Tue, 2 Jun 2020 14:53:58 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kernel/kvm.c > > between commit: > > a707ae1a9bbb ("x86/entry: Switch page fault exception to IDTENTRY_RAW") > > from the tip tree

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kernel/kvm.c between commit: a707ae1a9bbb ("x86/entry: Switch page fault exception to IDTENTRY_RAW") from the tip tree and commit: 68fd66f100d1 ("KVM: x86: extend struct kvm_vcpu_pv_apf_data with token info")

Re: "x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree)

On 19/12/18 22:28, Dave Hansen wrote: > > On 12/19/18 1:00 PM, Paolo Bonzini wrote: >> On 19/12/18 21:54, Dave Hansen wrote: >>> I should have called this out in the changelog, but I removed *all* the >>> support because I assumed that guests don't need MPX because no other OS >>> supported it

Re: "x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree)

On 12/19/18 1:00 PM, Paolo Bonzini wrote: > On 19/12/18 21:54, Dave Hansen wrote: >> I should have called this out in the changelog, but I removed *all* the >> support because I assumed that guests don't need MPX because no other OS >> supported it that I know of. > > Well, as long as you could

Re: "x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree)

On 19/12/18 21:54, Dave Hansen wrote: > I should have called this out in the changelog, but I removed *all* the > support because I assumed that guests don't need MPX because no other OS > supported it that I know of. Well, as long as you could have code that sets the MPX bits in XCR0, KVM will

Re: "x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree)

On 12/19/18 12:32 PM, Paolo Bonzini wrote: > On 19/12/18 05:12, Stephen Rothwell wrote: >> I fixed it up (the former removed some code updated by the latter, so I >> did that) and can carry the fix as necessary. This is now fixed as far as >> linux-next is concerned, but any non trivial conflicts

"x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree)

On 19/12/18 05:12, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kvm/x86.c > > between commit: > > eb012ef3b4e3 ("x86: Remove Intel MPX") > > from the tip tree and commit: > > b666a4b69739 ("kvm: x86: Dynamically allocate

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/x86.c between commit: eb012ef3b4e3 ("x86: Remove Intel MPX") from the tip tree and commit: b666a4b69739 ("kvm: x86: Dynamically allocate guest_fpu") from the kvm tree. I fixed it up (the former removed

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: a97673a1c43d ("x86: Fix various typos in comments") from the tip tree and commit: a821bab2d1ee ("KVM: VMX: Move VMX specific files to a "vmx" subdirectory") from the kvm tree. I

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: tools/include/uapi/linux/kvm.h between commit: 25fe15e54fe5 ("tools headers uapi: Sync kvm.h copy") from the tip tree and commit: c939989d74e2 ("tools/headers: update kvm.h") from the kvm tree. I fixed it up (the

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: tools/include/uapi/linux/kvm.h between commit: 25fe15e54fe5 ("tools headers uapi: Sync kvm.h copy") from the tip tree and commit: c939989d74e2 ("tools/headers: update kvm.h") from the kvm tree. I fixed it up (the

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi all, On Wed, 8 Aug 2018 13:54:45 +1000 Stephen Rothwell wrote: > > Paolo pointed out a semantic conflict between the kvm tree and the tip > tree in > > arch/x86/kernel/kvm.c > > between commit: > > 368a540e0232 ("x86/kvmclock: Remove memblock dependency") > > from the tip tree and

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi all, On Wed, 8 Aug 2018 13:54:45 +1000 Stephen Rothwell wrote: > > Paolo pointed out a semantic conflict between the kvm tree and the tip > tree in > > arch/x86/kernel/kvm.c > > between commit: > > 368a540e0232 ("x86/kvmclock: Remove memblock dependency") > > from the tip tree and

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Paolo pointed out a semantic conflict between the kvm tree and the tip tree in arch/x86/kernel/kvm.c between commit: 368a540e0232 ("x86/kvmclock: Remove memblock dependency") from the tip tree and commit: d63bae079b64 ("KVM: X86: Add kvm hypervisor init time platform setup

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Paolo pointed out a semantic conflict between the kvm tree and the tip tree in arch/x86/kernel/kvm.c between commit: 368a540e0232 ("x86/kvmclock: Remove memblock dependency") from the tip tree and commit: d63bae079b64 ("KVM: X86: Add kvm hypervisor init time platform setup

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi Stephen: Thanks for fix. I will discuss with maintainer about how to deal with the issue. On 8/6/2018 1:12 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > >arch/x86/include/asm/trace/hyperv.h > > between commit: > >

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi Stephen: Thanks for fix. I will discuss with maintainer about how to deal with the issue. On 8/6/2018 1:12 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > >arch/x86/include/asm/trace/hyperv.h > > between commit: > >

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/include/asm/trace/hyperv.h between commit: 58ec5e9c9044 ("x86/hyper-v: Trace PV IPI send") from the tip tree and commit: 47c054685621 ("X86/Hyper-V: Add hyperv_nested_flush_guest_mapping ftrace support")

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/include/asm/trace/hyperv.h between commit: 58ec5e9c9044 ("x86/hyper-v: Trace PV IPI send") from the tip tree and commit: 47c054685621 ("X86/Hyper-V: Add hyperv_nested_flush_guest_mapping ftrace support")

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: 085331dfc6bb ("x86/kvm: Update spectre-v1 mitigation") from the tip tree and commit: 58e9ffae5efd ("kvm: vmx: Reduce size of vmcs_field_to_offset_table") from the kvm tree. I fixed

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: 085331dfc6bb ("x86/kvm: Update spectre-v1 mitigation") from the tip tree and commit: 58e9ffae5efd ("kvm: vmx: Reduce size of vmcs_field_to_offset_table") from the kvm tree. I fixed

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: 117cc7a908c8 ("x86/retpoline: Fill return stack buffer on vmexit") from the tip tree and commit: 3e95fd6d0561 ("KVM: x86: Add Intel Processor Trace virtualization mode") from the kvm

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: 117cc7a908c8 ("x86/retpoline: Fill return stack buffer on vmexit") from the tip tree and commit: 3e95fd6d0561 ("KVM: x86: Add Intel Processor Trace virtualization mode") from the kvm

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi all, On Mon, 28 Aug 2017 14:52:09 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kvm/mmu.c > > between commit: > > ea2800ddb20d ("kvm/x86: Avoid clearing the C-bit in rsvd_bits()") > > from the tip

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi all, On Mon, 28 Aug 2017 14:52:09 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kvm/mmu.c > > between commit: > > ea2800ddb20d ("kvm/x86: Avoid clearing the C-bit in rsvd_bits()") > > from the tip tree and commit: > >

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/mmu.c between commit: ea2800ddb20d ("kvm/x86: Avoid clearing the C-bit in rsvd_bits()") from the tip tree and commit: d6321d493319 ("KVM: x86: generalize guest_cpuid_has_ helpers") from the kvm tree. I

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/mmu.c between commit: ea2800ddb20d ("kvm/x86: Avoid clearing the C-bit in rsvd_bits()") from the tip tree and commit: d6321d493319 ("KVM: x86: generalize guest_cpuid_has_ helpers") from the kvm tree. I

Re: linux-next: manual merge of the kvm tree with the tip tree

* Paolo Bonzini wrote: > On 25/08/2017 22:41, Brijesh Singh wrote: > > > > >> Neither my version nor yours is correct. :) The right one has [0][i] > >> and [1][i] (I inverted the indices by mistake). > >> > >> With that change, you can include my > >> > >> Acked-by:

Re: linux-next: manual merge of the kvm tree with the tip tree

* Paolo Bonzini wrote: > On 25/08/2017 22:41, Brijesh Singh wrote: > > > > >> Neither my version nor yours is correct. :) The right one has [0][i] > >> and [1][i] (I inverted the indices by mistake). > >> > >> With that change, you can include my > >> > >> Acked-by: Paolo Bonzini > >> >

Re: linux-next: manual merge of the kvm tree with the tip tree

On 25/08/2017 22:41, Brijesh Singh wrote: > >> Neither my version nor yours is correct. :) The right one has [0][i] >> and [1][i] (I inverted the indices by mistake). >> >> With that change, you can include my >> >> Acked-by: Paolo Bonzini >> > > Ingo, > > I assuming

Re: linux-next: manual merge of the kvm tree with the tip tree

On 25/08/2017 22:41, Brijesh Singh wrote: > >> Neither my version nor yours is correct. :) The right one has [0][i] >> and [1][i] (I inverted the indices by mistake). >> >> With that change, you can include my >> >> Acked-by: Paolo Bonzini >> > > Ingo, > > I assuming that this patch

Re: linux-next: manual merge of the kvm tree with the tip tree

On 08/25/2017 03:05 PM, Paolo Bonzini wrote: On 25/08/2017 18:53, Brijesh Singh wrote: Neither my version nor yours is correct. :) The right one has [0][i] and [1][i] (I inverted the indices by mistake). With that change, you can include my Acked-by: Paolo Bonzini

Re: linux-next: manual merge of the kvm tree with the tip tree

On 08/25/2017 03:05 PM, Paolo Bonzini wrote: On 25/08/2017 18:53, Brijesh Singh wrote: Neither my version nor yours is correct. :) The right one has [0][i] and [1][i] (I inverted the indices by mistake). With that change, you can include my Acked-by: Paolo Bonzini Ingo, I assuming

Re: linux-next: manual merge of the kvm tree with the tip tree

On 25/08/2017 18:53, Brijesh Singh wrote: >> > > Thanks for the tip, I have expanded the patch to cover tdp cases and > have verified > that it works fine with SME enabled KVM. If you are okay with this then > I can > send patch. > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index

Re: linux-next: manual merge of the kvm tree with the tip tree

On 25/08/2017 18:53, Brijesh Singh wrote: >> > > Thanks for the tip, I have expanded the patch to cover tdp cases and > have verified > that it works fine with SME enabled KVM. If you are okay with this then > I can > send patch. > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi Paolo, On 08/25/2017 08:57 AM, Tom Lendacky wrote: On 8/25/2017 1:39 AM, Paolo Bonzini wrote: On 25/08/2017 06:39, Stephen Rothwell wrote: First, rsvd_bits is just a simple function to return some 1 bits. Applying a mask based on properties of the host MMU is incorrect. Second, the

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi Paolo, On 08/25/2017 08:57 AM, Tom Lendacky wrote: On 8/25/2017 1:39 AM, Paolo Bonzini wrote: On 25/08/2017 06:39, Stephen Rothwell wrote: First, rsvd_bits is just a simple function to return some 1 bits. Applying a mask based on properties of the host MMU is incorrect. Second, the

Re: linux-next: manual merge of the kvm tree with the tip tree

On 8/25/2017 1:39 AM, Paolo Bonzini wrote: On 25/08/2017 06:39, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/mmu.h between commit: d0ec49d4de90 ("kvm/x86/svm: Support Secure Memory Encryption within KVM") from the tip tree

Re: linux-next: manual merge of the kvm tree with the tip tree

On 8/25/2017 1:39 AM, Paolo Bonzini wrote: On 25/08/2017 06:39, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/mmu.h between commit: d0ec49d4de90 ("kvm/x86/svm: Support Secure Memory Encryption within KVM") from the tip tree

Re: linux-next: manual merge of the kvm tree with the tip tree

On 25/08/2017 06:39, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kvm/mmu.h > > between commit: > > d0ec49d4de90 ("kvm/x86/svm: Support Secure Memory Encryption within KVM") > > from the tip tree and commit: > >

Re: linux-next: manual merge of the kvm tree with the tip tree

On 25/08/2017 06:39, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kvm/mmu.h > > between commit: > > d0ec49d4de90 ("kvm/x86/svm: Support Secure Memory Encryption within KVM") > > from the tip tree and commit: > >

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/mmu.h between commit: d0ec49d4de90 ("kvm/x86/svm: Support Secure Memory Encryption within KVM") from the tip tree and commit: d1cd3ce90044 ("KVM: MMU: check guest CR3 reserved bits based on its physical

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/mmu.h between commit: d0ec49d4de90 ("kvm/x86/svm: Support Secure Memory Encryption within KVM") from the tip tree and commit: d1cd3ce90044 ("KVM: MMU: check guest CR3 reserved bits based on its physical

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/cpuid.c between commit: c592b5734706 ("x86/fpu: Remove use_eager_fpu()") from the tip tree and commit: 4504b5c9414c ("kvm: x86: Add AVX512_4VNNIW and AVX512_4FMAPS support") from the kvm tree. I fixed it

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/cpuid.c between commit: c592b5734706 ("x86/fpu: Remove use_eager_fpu()") from the tip tree and commit: 4504b5c9414c ("kvm: x86: Add AVX512_4VNNIW and AVX512_4FMAPS support") from the kvm tree. I fixed it

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi Thomas, On Thu, 17 Nov 2016 08:07:27 +0100 (CET) Thomas Gleixner wrote: > > On Thu, 17 Nov 2016, Stephen Rothwell wrote: > > + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */ > > + static const struct cpuid_bit cpuid_bits[] = { > > + {

Re: linux-next: manual merge of the kvm tree with the tip tree

Hi Thomas, On Thu, 17 Nov 2016 08:07:27 +0100 (CET) Thomas Gleixner wrote: > > On Thu, 17 Nov 2016, Stephen Rothwell wrote: > > + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */ > > + static const struct cpuid_bit cpuid_bits[] = { > > + { X86_FEATURE_APERFMPERF,

Re: linux-next: manual merge of the kvm tree with the tip tree

On Thu, 17 Nov 2016, Stephen Rothwell wrote: > + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */ > + static const struct cpuid_bit cpuid_bits[] = { > + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x0006, 0 }, > + { X86_FEATURE_EPB, CPUID_ECX, 3,

Re: linux-next: manual merge of the kvm tree with the tip tree

On Thu, 17 Nov 2016, Stephen Rothwell wrote: > + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */ > + static const struct cpuid_bit cpuid_bits[] = { > + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x0006, 0 }, > + { X86_FEATURE_EPB, CPUID_ECX, 3,

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kernel/cpu/scattered.c between commit: 4ab1586488cb ("x86/cpufeature: Add RDT CPUID feature bits") from the tip tree and commits: 47f10a36003e ("x86/cpuid: Cleanup cpuid_regs definitions") 47bdf3378d62

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kernel/cpu/scattered.c between commit: 4ab1586488cb ("x86/cpufeature: Add RDT CPUID feature bits") from the tip tree and commits: 47f10a36003e ("x86/cpuid: Cleanup cpuid_regs definitions") 47bdf3378d62

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: drivers/irqchip/irq-gic.c between commits: dc9722cc57eb ("irqchip/gic: Return an error if GIC initialisation fails") f673b9b5cb54 ("irqchip/gic: Store GIC configuration parameters") d6490461a102 ("irqchip/gic: Add

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: drivers/irqchip/irq-gic.c between commits: dc9722cc57eb ("irqchip/gic: Return an error if GIC initialisation fails") f673b9b5cb54 ("irqchip/gic: Store GIC configuration parameters") d6490461a102 ("irqchip/gic: Add

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/lapic.c between commit: b6ac06953221 "KVM: x86: fix lapic.timer_mode on restore" from the tip tree and commit: 90de4a187518 "KVM: x86: Support for disabling quirks" from the kvm tree. I fixed it up (see

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/lapic.c between commit: b6ac06953221 KVM: x86: fix lapic.timer_mode on restore from the tip tree and commit: 90de4a187518 KVM: x86: Support for disabling quirks from the kvm tree. I fixed it up (see

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got conflicts in arch/x86/include/asm/kvm_host.h and arch/x86/kvm/x86.c between commit 0ee6a5172573 ("x86/fpu, kvm: Simplify fx_init()") (and a few others) from the tip tree and commit d28bc9dd25ce ("KVM: x86: INIT and reset sequences are

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got conflicts in arch/x86/include/asm/kvm_host.h and arch/x86/kvm/x86.c between commit 0ee6a5172573 (x86/fpu, kvm: Simplify fx_init()) (and a few others) from the tip tree and commit d28bc9dd25ce (KVM: x86: INIT and reset sequences are different)

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in kernel/sched/core.c between commit 0a74bef8bed1 ("sched: Add an rq migration call-back to sched_class") from the tip tree and commit 582b336ec2c0 ("sched: add notifier for cross-cpu migrations") from the kvm tree. I fixed it up

linux-next: manual merge of the kvm tree with the tip tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in kernel/sched/core.c between commit 0a74bef8bed1 (sched: Add an rq migration call-back to sched_class) from the tip tree and commit 582b336ec2c0 (sched: add notifier for cross-cpu migrations) from the kvm tree. I fixed it up (see