Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the kvm tree with the rcu tree
@ 2020-05-18  5:42 Stephen Rothwell
  2020-05-18  5:46 ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2020-05-18  5:42 UTC (permalink / raw)
  To: Paolo Bonzini, KVM, Paul E. McKenney
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Qian Cai, Wanpeng Li


[-- Attachment #1: Type: text/plain, Size: 815 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/svm/svm.c

between commit:

  9f24847d8fdb ("kvm/svm: Disable KCSAN for svm_vcpu_run()")

from the rcu tree and commits:

  a9ab13ff6e84 ("KVM: X86: Improve latency for single target IPI fastpath")
  404d5d7bff0d ("KVM: X86: Introduce more exit_fastpath_completion enum values")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the kvm tree with the rcu tree
  2020-05-18  5:42 linux-next: manual merge of the kvm tree with the rcu tree Stephen Rothwell
@ 2020-05-18  5:46 ` Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2020-05-18  5:46 UTC (permalink / raw)
  To: Paolo Bonzini, KVM, Paul E. McKenney
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Qian Cai, Wanpeng Li


[-- Attachment #1: Type: text/plain, Size: 1961 bytes --]

Hi all,

On Mon, 18 May 2020 15:42:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the kvm tree got a conflict in:
> 
>   arch/x86/kvm/svm/svm.c
> 
> between commit:
> 
>   9f24847d8fdb ("kvm/svm: Disable KCSAN for svm_vcpu_run()")
> 
> from the rcu tree and commits:
> 
>   a9ab13ff6e84 ("KVM: X86: Improve latency for single target IPI fastpath")
>   404d5d7bff0d ("KVM: X86: Introduce more exit_fastpath_completion enum values")
> 
> from the kvm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/svm/svm.c
index dca2bdbe34a7,4e9cd2a73ad0..000000000000
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -3279,10 -3315,21 +3315,21 @@@ static void svm_cancel_injection(struc
        svm_complete_interrupts(svm);
  }

+ static fastpath_t svm_exit_handlers_fastpath(struct kvm_vcpu *vcpu)
+ {
+       if (!is_guest_mode(vcpu) &&
+           to_svm(vcpu)->vmcb->control.exit_code == SVM_EXIT_MSR &&
+           to_svm(vcpu)->vmcb->control.exit_info_1)
+               return handle_fastpath_set_msr_irqoff(vcpu);
+
+       return EXIT_FASTPATH_NONE;
+ }
+
  void __svm_vcpu_run(unsigned long vmcb_pa, unsigned long *regs);

- static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
 -static fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
++static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
  {
+       fastpath_t exit_fastpath;
        struct vcpu_svm *svm = to_svm(vcpu);

        svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
s

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* linux-next: manual merge of the kvm tree with the rcu tree
@ 2020-04-22  3:52 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2020-04-22  3:52 UTC (permalink / raw)
  To: Paolo Bonzini, KVM, Paul E. McKenney
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Qian Cai, Wanpeng Li


[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/svm/svm.c

between commit:

  c60e60a23f24 ("kvm/svm: Disable KCSAN for svm_vcpu_run()")

from the rcu tree and commit:

  a9ab13ff6e84 ("KVM: X86: Improve latency for single target IPI fastpath")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/svm/svm.c
index b303ae0803d2,a6f4e1bdb045..000000000000
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -3276,10 -3299,21 +3299,21 @@@ static void svm_cancel_injection(struc
  	svm_complete_interrupts(svm);
  }
  
+ static enum exit_fastpath_completion svm_exit_handlers_fastpath(struct kvm_vcpu *vcpu)
+ {
+ 	if (!is_guest_mode(vcpu) &&
+ 	    to_svm(vcpu)->vmcb->control.exit_code == SVM_EXIT_MSR &&
+ 	    to_svm(vcpu)->vmcb->control.exit_info_1)
+ 		return handle_fastpath_set_msr_irqoff(vcpu);
+ 
+ 	return EXIT_FASTPATH_NONE;
+ }
+ 
  void __svm_vcpu_run(unsigned long vmcb_pa, unsigned long *regs);
  
- static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
 -static enum exit_fastpath_completion svm_vcpu_run(struct kvm_vcpu *vcpu)
++static __no_kcsan enum exit_fastpath_completion svm_vcpu_run(struct kvm_vcpu *vcpu)
  {
+ 	enum exit_fastpath_completion exit_fastpath;
  	struct vcpu_svm *svm = to_svm(vcpu);
  
  	svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* linux-next: manual merge of the kvm tree with the rcu tree
@ 2014-12-08  7:28 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-12-08  7:28 UTC (permalink / raw)
  To: Marcelo Tosatti, Gleb Natapov, Paul E. McKenney
  Cc: linux-next, linux-kernel, Pranith Kumar, Paolo Bonzini


[-- Attachment #1: Type: text/plain, Size: 443 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/ia64/kvm/Kconfig between commit d80bd9c0e85f ("tinification: Make
SRCU optional by using CONFIG_SRCU") from the rcu tree and commit
003f7de62589 ("KVM: ia64: remove") from the kvm tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-18  5:42 linux-next: manual merge of the kvm tree with the rcu tree Stephen Rothwell
2020-05-18  5:46 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-04-22  3:52 Stephen Rothwell
2014-12-08  7:28 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git