Re: KVM/ARM in next
Hi Christoffer, On Sat, 20 Apr 2013 09:59:20 -0700 Christoffer Dall wrote: > > I'm maintaining the KVM/ARM implementation, which was merged during > the 3.9 merge window. > > I'd like for you to pull changes from my kvm-arm-next branch at > git://github.com/columbia/linux-kvm-arm.git into linux-next. > > The merge procedure for this tree is typically through the kvm tree, > but occasionally through Russell King's ARM tree, if there are > substantial changes to generic ARM code in there. > > In case of problems please notify me and Marc Zyngier I have added your tree from today with you and Marc as contacts. Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You may be sent e-mail messages indicating errors or other issues when the patches/commits from your subsystem tree are merged and tested in linux-next. These messages may also be cross-posted to the linux-next mailing list, the linux-kernel mailing list, etc. The linux-next tree project and IBM (my employer) make no warranties regarding the linux-next project, the testing procedures, the results, the e-mails, etc. If you don't agree to these ground rules, let me know and I'll remove your tree from participation in linux-next. pgpq1xk5fNAzX.pgp Description: PGP signature
Re: [GIT PULL] VFIO updates for v3.8
Hi Linus, On Tue, 11 Dec 2012 12:08:07 -0700 Alex Williamson wrote: > > The following changes since commit 29594404d7fe73cd80eaa4ee8c43dcc53970c60e: > > Linux 3.7 (2012-12-10 19:30:57 -0800) > > are available in the git repository at: > > git://github.com/awilliam/linux-vfio.git tags/vfio-for-v3.8 > > for you to fetch changes up to a9e3ccfa452c8c5bac49637fe6ece1ac3246d312: > > vfio-pci: Enable device before attempting reset (2012-12-11 11:25:37 -0700) This has been rebased from what was in linux-next yesterday onto v3.7. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpWGWnKCe6EF.pgp Description: PGP signature
Re: [GIT PULL] VFIO updates for v3.8
Hi Alex, On Tue, 11 Dec 2012 17:06:56 -0700 Alex Williamson wrote: > > Is that a bad thing? I can start tagging from my next branch if that's > preferred. Thanks, Linus has said many times to not rebase before sending a pull request. When you rebase your tree you effectively throw away your testing (since the thing you rebased on top of may have introduced semantic conflicts with the work in your tree). If you don't rebase your tested tree, any conflicts are then restricted to the actual merge and can be fixed there (or at least the diagnosis will lead there). So, if I was a maintiner, at the start of the merge window (or just before) I would create a test branch that contained my work plus a *merge* with Linus' tree and do some testing on that and then ask Linus to pull my tree (not the merged version). It may prove that the test merge with Linus' tree produces an "interesting" syntactic conflict - in this case I would mention that to Linus and put the merged tree somewhere public for him to use as a guide. (Mind you, this conflict would already have most likely been noted by the linux-next maintainer.) Also, your testing may have brought to light a semantic conflict, in which case the fix could be supplied to Linus with the pull request, or a well changed logged back merge of Linus' tree containing the fix could be done and Linus asked to pull the result. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpBpXfOShCsR.pgp Description: PGP signature
Re: [GIT PULL] KVM updates for the 3.8 merge window
Hi Marcello, Alexander, On Wed, 12 Dec 2012 10:35:19 -0200 Marcelo Tosatti wrote: > > Please pull from > > git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-3.8-1 > > to receive the KVM updates for the 3.8 merge window, including > considerable KVM/PPC work, x86 kvmclock vsyscall support, IA32_TSC_ADJUST > MSR emulation, amongst others. There is a section of this tree (the kvm-ppc tree in linux-next) that has been rebased before being merged into this tree. Alexander, please don't do that (especially since it has *not* bee rebased in the kvm-ppc tree but more work has been added on top of it :-(). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpHnXbejFQ3v.pgp Description: PGP signature
Re: [GIT PULL] KVM updates for the 3.8 merge window
Hi Linus, On Thu, 13 Dec 2012 14:22:34 -0800 Linus Torvalds wrote: > > On Wed, Dec 12, 2012 at 1:19 PM, Stephen Rothwell > wrote: > > > > There is a section of this tree (the kvm-ppc tree in linux-next) that has > > been rebased before being merged into this tree. Alexander, please > > don't do that (especially since it has *not* bee rebased in the kvm-ppc > > tree but more work has been added on top of it :-(). > > Christ, why can't people learn? > > Solution: I'm not pulling this, if it means that we will have > duplicate commits somewhere. Actually only in my tree (until Alexander cleans his tree up). I am going to have a conversation with Alexander about process. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpbS0YZJpZBa.pgp Description: PGP signature
Re: linux-next: Tree for Jan 25 (kvm)
On Fri, 25 Jan 2013 08:53:58 -0800 Randy Dunlap wrote:
>
> Seeing lots of this error on i386:
>
> arch/x86/kvm/emulate.c:1016: Error: unsupported for `push'
Caused by commit 9ae9febae950 ("KVM: x86 emulator: covert SETCC to
fastop") from the kvm tree. cc's added.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpItVwlZeuzC.pgp
Description: PGP signature
Re: [GIT PULL] KVM updates for the 3.6 merge window
On Wed, 25 Jul 2012 08:38:36 +1000 Benjamin Herrenschmidt wrote: > > On Tue, 2012-07-24 at 12:04 -0700, Linus Torvalds wrote: > > Ok, this caused conflicts with the s390 and ppc trees. I think I fixed > > them correctly, but the respective arch people really should take a > > look. > > A quick peek at the merge commit looks allright, but Alex mentioned that > there's some more fallover that needs an actual patch to fix (the > changes to enforce a cleaner ASM syntax need to be applied to some new > code from Avi's tree that didn't actually trigger merge conflicts). > > I'll follow up with Alex and send you the relevant patches if any. There was at least one, but Linus got it (I checked all the mentions of VCPU_GPR). His merge resolution matches the one that has been in linux-next for quite some time. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp6OK6G6MBK5.pgp Description: PGP signature
Re: qemu-kvm loops after kernel udpate
Hi Andrew, On Tue, 18 Sep 2012 12:46:46 -0700 Andrew Morton wrote: > > hm, thanks. This will probably take some time to resolve so I think > I'll drop > > mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock.patch > mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix.patch > mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix-fix.patch > mm-wrap-calls-to-set_pte_at_notify-with-invalidate_range_start-and-invalidate_range_end.patch Should I attempt to remove these from the akpm tree in linux-next today? Or should I just wait for a new mmotm? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpurzS3znHG8.pgp Description: PGP signature
Re: qemu-kvm loops after kernel udpate
Hi Andrew, On Tue, 18 Sep 2012 17:20:29 -0700 Andrew Morton wrote: > > On Wed, 19 Sep 2012 10:00:34 +1000 Stephen Rothwell > wrote: > > > On Tue, 18 Sep 2012 12:46:46 -0700 Andrew Morton > > wrote: > > > > > > hm, thanks. This will probably take some time to resolve so I think > > > I'll drop > > > > > > mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock.patch > > > mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix.patch > > > mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix-fix.patch > > > mm-wrap-calls-to-set_pte_at_notify-with-invalidate_range_start-and-invalidate_range_end.patch > > > > Should I attempt to remove these from the akpm tree in linux-next today? > > That would be best - there's no point in having people test (and debug) > dead stuff. OK, I removed them. > > Or should I just wait for a new mmotm? > > You could be brave and test http://ozlabs.org/~akpm/mmots/ for me :) Brave? maybe. Stupid? no :-) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpKj6oVlHxHG.pgp Description: PGP signature
Re: Linux-next changes for module and virtio trees.
Hi Rusty, On Tue, 02 Oct 2012 15:56:56 +0930 Rusty Russell wrote: > > Please remove my quilt tree > http://ozlabs.org/~rusty/kernel/rr-latest/ from linux-next, and use my > git trees from now on: > > git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git > Branches: > modules-next > virtio-next Done. > For others: beware that these will rebase, usually once after the merge > window closes (so I can work on a more modern tree), and again just > before it opens (where I squash in fixup patches). The first should not be necessary since everything in these trees should have been merged by Linus during the merge window, so a merge of -rc1 or later should be a fast forward (though merging with the tag itself may produce a real merge). The second can be tricky to pick the right moment :-) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcWF6h5n5N0.pgp Description: PGP signature
Re: Linux-next changes for module and virtio trees.
Hi Rusty, On Wed, 31 Oct 2012 13:58:15 +1030 Rusty Russell wrote: > > Stephen Rothwell writes: > > > > On Tue, 02 Oct 2012 15:56:56 +0930 Rusty Russell > > wrote: > >> > >> Please remove my quilt tree > >> http://ozlabs.org/~rusty/kernel/rr-latest/ from linux-next, and use my > >> git trees from now on: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git > >> Branches: > >> modules-next > >> virtio-next > > > > Done. > > And please add my 'fixes' branch from the same tree. Done. Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You may be sent e-mail messages indicating errors or other issues when the patches/commits from your subsystem tree are merged and tested in linux-next. These messages may also be cross-posted to the linux-next mailing list, the linux-kernel mailing list, etc. The linux-next tree project and IBM (my employer) make no warranties regarding the linux-next project, the testing procedures, the results, the e-mails, etc. If you don't agree to these ground rules, let me know and I'll remove your tree from participation in linux-next. pgpki0dAZ6HMu.pgp Description: PGP signature
Re: [PATCH RFC] virtio-net: remove useless disable on freeze
Hi all, On Wed, 30 May 2012 19:41:47 +0930 Rusty Russell wrote: > > On Mon, 28 May 2012 15:53:25 +0300, "Michael S. Tsirkin" > wrote: > > On Wed, Apr 04, 2012 at 12:19:54PM +0300, Michael S. Tsirkin wrote: > > > disable_cb is just an optimization: it > > > can not guarantee that there are no callbacks. > > > > > > I didn't yet figure out whether a callback > > > in freeze will trigger a bug, but disable_cb > > > won't address it in any case. So let's remove > > > the useless calls as a first step. > > > > > > Signed-off-by: Michael S. Tsirkin > > > > Looks like this isn't in the 3.5 pull request - > > just lost in the shuffle? > > disable_cb is advisory so can't be relied upon. > > I always (try to?) reply as I accept patches. > > This one did slip by, but it's harmless so no need to push AFAICT. > > Applied. This patch exists in two trees in linux-next already ... Davem's net tree (so presumably he will send it to Linus shortly) and Michael's vhost tree (is that tree needed any more?). Presumably it is now also in the rr tree? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpsAKJ5kzVVL.pgp Description: PGP signature
Re: Request VFIO inclusion in linux-next
Hi Alex, On Mon, 25 Jun 2012 22:55:52 -0600 Alex Williamson wrote: > > VFIO has been kicking around for well over a year now and has been > posted numerous times for review. The pre-requirements are finally > available in linux-next (or will be in the 20120626 build) so I'd like > to request a new branch be included in linux-next with a goal of being > accepted into v3.6. > > The info for linux-next: > > Tree: git://github.com/awilliam/linux-vfio.git > Branch: next > Contact: Alex Williamson > > This branch should be applied after both Bjorn's PCI next branch and > Joerg's IOMMU next branch I have added this from today. Since this tree merges (parts of) the pci and iommu trees, I am hoping that those are to remain stable - if not, then you need to stay alert if they are rebased. Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You may be sent e-mail messages indicating errors or other issues when the patches/commits from your subsystem tree are merged and tested in linux-next. These messages may also be cross-posted to the linux-next mailing list, the linux-kernel mailing list, etc. The linux-next tree project and IBM (my employer) make no warranties regarding the linux-next project, the testing procedures, the results, the e-mails, etc. If you don't agree to these ground rules, let me know and I'll remove your tree from participation in linux-next. pgpBcKIHoRdyA.pgp Description: PGP signature
Re: kvm linux-next tree
Hi Avi, On Tue, 27 Sep 2011 15:25:02 +0300 Avi Kivity wrote: > > Please add > >git://github.com/avikivity/kvm.git kvm-updates/3.2 > > to the linux-next collection, until kernel.org is back up. Thanks. I will switch to this tomorrow. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpsSrtlYk2CI.pgp Description: PGP signature
Re: linux-next: Tree for Sept 29 (kvm)
[Just cc'ing the kvm guys ] On Thu, 29 Sep 2011 12:50:24 -0700 Randy Dunlap wrote: > > On 09/28/11 23:57, Stephen Rothwell wrote: > > Hi all, > > > > The linux-next tree is now available from > > git://github.com/sfrothwell/linux-next.git as a temporary measure while > > the kernel.org servers are unavailable. > > > kvm build on i386 says: > > ERROR: "__udivdi3" [arch/x86/kvm/kvm.ko] undefined! > > which is used in somewhere in start_apic_timer() (probably the divide :). > > > -- > ~Randy > *** Remember to use Documentation/SubmitChecklist when testing your code *** > -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpmbXBPQ3pe8.pgp Description: PGP signature
[PATCH] powerpc/kvm: fix some init/exit annotations
Fixes a couple of warnings like this one:
WARNING: arch/powerpc/kvm/kvm-440.o(.text+0x1e8c): Section mismatch in
reference from the function kvmppc_44x_exit() to the function
.exit.text:kvmppc_booke_exit()
The function kvmppc_44x_exit() references a function in an exit section.
Often the function kvmppc_booke_exit() has valid usage outside the exit section
and the fix is to remove the __exit annotation of kvmppc_booke_exit.
Also add some __init annotations on obvious routines.
Signed-off-by: Stephen Rothwell
---
arch/powerpc/kvm/44x.c |4 ++--
arch/powerpc/kvm/booke.c |2 +-
arch/powerpc/kvm/e500.c |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
index 0cef809..f4d1b55 100644
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -138,7 +138,7 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)
kmem_cache_free(kvm_vcpu_cache, vcpu_44x);
}
-static int kvmppc_44x_init(void)
+static int __init kvmppc_44x_init(void)
{
int r;
@@ -149,7 +149,7 @@ static int kvmppc_44x_init(void)
return kvm_init(NULL, sizeof(struct kvmppc_vcpu_44x), THIS_MODULE);
}
-static void kvmppc_44x_exit(void)
+static void __exit kvmppc_44x_exit(void)
{
kvmppc_booke_exit();
}
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 642e420..e7bf4d0 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -520,7 +520,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
return kvmppc_core_vcpu_translate(vcpu, tr);
}
-int kvmppc_booke_init(void)
+int __init kvmppc_booke_init(void)
{
unsigned long ivor[16];
unsigned long max_ivor = 0;
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index d8067fd..674e796 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -132,7 +132,7 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)
kmem_cache_free(kvm_vcpu_cache, vcpu_e500);
}
-static int kvmppc_e500_init(void)
+static int __init kvmppc_e500_init(void)
{
int r, i;
unsigned long ivor[3];
@@ -160,7 +160,7 @@ static int kvmppc_e500_init(void)
return kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500), THIS_MODULE);
}
-static void kvmppc_e500_exit(void)
+static void __init kvmppc_e500_exit(void)
{
kvmppc_booke_exit();
}
--
1.6.3.1
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: New kvm.git branch for linux-next
Hi Avi, On Wed, 09 Sep 2009 20:55:18 +0300 Avi Kivity wrote: > > Stephen, please pick up the 'linux-next' branch of kvm.git instead > 'master' as you do now. This will better reflect what is actually going > to -next, will cause fewer merge errors, and will improve -next > bisectability. > > (this is actually a symbolic ref to kvm-updates/2.6.32 which will be > updated when kvm-updates/2.6.33 is created) That sounds great. I have changed over starting from today. Thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpVmzZfGkgSY.pgp Description: PGP signature
Re: [PATCH] [PPC] Add dequeue for external on BookE
On Wed, 7 Apr 2010 12:58:34 -0300 Marcelo Tosatti wrote: > > On Wed, Apr 07, 2010 at 10:03:25AM +0200, Alexander Graf wrote: > > Commit a0abee86af2d1f048dbe99d2bcc4a2cefe685617 introduced unsetting of the > > IRQ line from userspace. This added a new core specific callback that I > > apparently forgot to add for BookE. > > > > So let's add the callback for BookE as well, making it build again. > > > > Signed-off-by: Alexander Graf > > --- > > arch/powerpc/kvm/booke.c |6 ++ > > 1 files changed, 6 insertions(+), 0 deletions(-) > > Applied, thanks. Thanks, guys. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpiHVmUvpI5v.pgp Description: PGP signature
Re: [GIT PULL] KVM updates for the 2.6.37 merge window
Hey Linus, On Sun, 24 Oct 2010 15:29:12 +0200 Avi Kivity wrote: > > Linus, the repository and branch > >git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-updates/2.6.37 > > contains the kvm updates for the 2.6.37 merge window. Major changes > this time around include powerpc paravirtualization, a virtual tsc > rework, and exposing npt to the guest for fast nested virtualization. > Please pull. This entire branch was rebased just 11 hours or so before being merged and you have "talked" about this for many merge windows that I can remember. "Just saying" :-) [Avi, I am not particularly picking on you, your tree just happened to strike me this morning ... there are many others. At least you also updated your linux-next branch so I won't have to cope with two slightly different versions and all the conflicts that causes :-)] -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpiUKG4yEFLk.pgp Description: PGP signature
Re: [PATCH 19/27] Export symbols for KVM module
Hi Alexander, On Fri, 30 Oct 2009 16:47:19 +0100 Alexander Graf wrote: > > diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c > index c8b27bb..baf778c 100644 > --- a/arch/powerpc/kernel/ppc_ksyms.c > +++ b/arch/powerpc/kernel/ppc_ksyms.c > @@ -163,11 +163,12 @@ EXPORT_SYMBOL(screen_info); > #ifdef CONFIG_PPC32 > EXPORT_SYMBOL(timer_interrupt); > EXPORT_SYMBOL(irq_desc); > -EXPORT_SYMBOL(tb_ticks_per_jiffy); > EXPORT_SYMBOL(cacheable_memcpy); > EXPORT_SYMBOL(cacheable_memzero); > #endif > > +EXPORT_SYMBOL(tb_ticks_per_jiffy); Since you are moving this anyway, how about moving it into arch/powerpc/kernel/time.c where tb_ticks_per_jiffy is defined. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgp9GzKJo66J0.pgp Description: PGP signature
Re: [PATCH 20/27] Split init_new_context and destroy_context
Hi Alexander, On Fri, 30 Oct 2009 16:47:20 +0100 Alexander Graf wrote: > > --- a/arch/powerpc/include/asm/mmu_context.h > +++ b/arch/powerpc/include/asm/mmu_context.h > @@ -23,6 +23,11 @@ extern void switch_slb(struct task_struct *tsk, struct > mm_struct *mm); > extern void set_context(unsigned long id, pgd_t *pgd); > > #ifdef CONFIG_PPC_BOOK3S_64 > +extern int __init_new_context(void); > +extern void __destroy_context(int context_id); > +#endif > + > +#ifdef CONFIG_PPC_BOOK3S_64 don't add the #endif/#ifdef pair ... -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgp84HJavMq89.pgp Description: PGP signature
Re: [PATCH 3/6 v5] powerpc: export debug registers save function for KVM
Hi, On Wed, 26 Jun 2013 11:12:23 +0530 Bharat Bhushan wrote: > > diff --git a/arch/powerpc/include/asm/switch_to.h > b/arch/powerpc/include/asm/switch_to.h > index 200d763..50b357f 100644 > --- a/arch/powerpc/include/asm/switch_to.h > +++ b/arch/powerpc/include/asm/switch_to.h > @@ -30,6 +30,10 @@ extern void enable_kernel_spe(void); > extern void giveup_spe(struct task_struct *); > extern void load_up_spe(struct task_struct *); > > +#ifdef CONFIG_PPC_ADV_DEBUG_REGS > +extern void switch_booke_debug_regs(struct thread_struct *new_thread); > +#endif We usually don't bother guarding function declarations. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp_yJYfcoXUd.pgp Description: PGP signature
Re: [PATCH 3/8] vfio: add external user support
Hi Alexy,
On Thu, 27 Jun 2013 15:02:31 +1000 Alexey Kardashevskiy wrote:
>
> index c488da5..54192b2 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -1370,6 +1370,59 @@ static const struct file_operations vfio_device_fops =
> {
> };
>
> /**
> + * External user API, exported by symbols to be linked dynamically.
> + */
> +
> +/* Allows an external user (for example, KVM) to lock an IOMMU group */
> +static int vfio_group_add_external_user(struct file *filep)
> +{
> + struct vfio_group *group = filep->private_data;
> +
> + if (filep->f_op != &vfio_group_fops)
> + return -EINVAL;
> +
> + if (!atomic_inc_not_zero(&group->container_users))
> + return -EINVAL;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(vfio_group_add_external_user);
You cannot EXPORT a static symbol ... The same through the rest of the
file.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp6E1OHQCz1Z.pgp
Description: PGP signature
Re: [PATCH 3/8] vfio: add external user support
Hi Alexy,
On Thu, 27 Jun 2013 15:02:31 +1000 Alexey Kardashevskiy wrote:
>
> +/* Allows an external user (for example, KVM) to unlock an IOMMU group */
> +static void vfio_group_del_external_user(struct file *filep)
> +{
> + struct vfio_group *group = filep->private_data;
> +
> + BUG_ON(filep->f_op != &vfio_group_fops);
We usually reserve BUG_ON for situations where there is no way to
continue running or continuing will corrupt the running kernel. Maybe
WARN_ON() and return?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpPoxT1H0ADV.pgp
Description: PGP signature
Re: [PATCH v2] vfio: add external user support
Hi Alexy, Thanks for the changes. On Thu, 27 Jun 2013 17:14:20 +1000 Alexey Kardashevskiy wrote: > > diff --git a/include/linux/vfio.h b/include/linux/vfio.h > index ac8d488..7ee6575 100644 > --- a/include/linux/vfio.h > +++ b/include/linux/vfio.h > @@ -90,4 +90,11 @@ extern void vfio_unregister_iommu_driver( > TYPE tmp; \ > offsetof(TYPE, MEMBER) + sizeof(tmp.MEMBER); }) \ > > +/* > + * External user API > + */ > +int vfio_group_add_external_user(struct file *filep); > +void vfio_group_del_external_user(struct file *filep); > +int vfio_group_iommu_id_from_file(struct file *filep); Just being picky, but all the other function declarations in that file state "extern" explicitly. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpPUcDwAhRfo.pgp Description: PGP signature
Re: [PATCH] virtio: include asm/barrier explicitly
Hi Rusty, On Mon, 08 Jul 2013 11:31:45 +0930 Rusty Russell wrote: > > PS. I'll squeeze these into this merge window, since they're trivial. s/'re trivial/fix bugs/ ;-) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpQCBOOsFabg.pgp Description: PGP signature
Re: linux-next: Tree for Sep 10
Hi Christian, [cc'ing the current contacts] On Thu, 10 Sep 2015 10:05:01 +0200 Christian Borntraeger wrote: > > Can you add > kvm@vger.kernel.org > for build failures of the kernel tree? Done. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-next: manual merge of the kvm-arm tree with the kvm tree
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/x86/include/asm/kvm_host.h
between commit:
d84f1e0755ba ("KVM: make kvm_set_msi_irq() public")
from the kvm tree and commits:
8feb4a04dc75 ("KVM: Define a new interface kvm_intr_is_single_vcpu()")
8fc52eb9cee4 ("KVM: Add kvm_arch_vcpu_{un}blocking callbacks")
from the kvm-arm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/x86/include/asm/kvm_host.h
index 53deb2750bf6,b926137d591f..
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@@ -1256,9 -1232,7 +1256,13 @@@ int x86_set_memory_region(struct kvm *k
bool kvm_vcpu_is_reset_bsp(struct kvm_vcpu *vcpu);
bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu);
+bool kvm_intr_is_single_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
+ struct kvm_vcpu **dest_vcpu);
+
+void kvm_set_msi_irq(struct kvm_kernel_irq_routing_entry *e,
+ struct kvm_lapic_irq *irq);
++
+ static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}
+ static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}
+
#endif /* _ASM_X86_KVM_HOST_H */
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-next: manual merge of the kvms390 tree with the kvm tree
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
include/linux/kvm_host.h
arch/s390/kvm/interrupt.c
arch/s390/kvm/sigp.c
between commits:
db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id")
b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency signal
injection")
152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index")
from the kvm tree and commit:
a8ab7a5fd13b ("KVM: Provide function for VCPU lookup by id")
e896d1d08efc ("KVM: s390: avoid memory overwrites on emergency signal
injection")
32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index")
from the kvms390 tree.
These patches used different names for the added function. I used the
name from the kvm tree (kvm_get_vcpu_by_id).
This also required the following merge patch:
From: Stephen Rothwell
Date: Fri, 20 Nov 2015 12:42:17 +1100
Subject: [PATCH] KVM: s390: update for kvm_lookup_vcpu name change
Signed-off-by: Stephen Rothwell
---
arch/powerpc/kvm/book3s_hv.c | 2 +-
arch/s390/kvm/diag.c | 2 +-
virt/kvm/kvm_main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 904b3b0afb48..a29da44cdc6c 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -311,7 +311,7 @@ static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm,
int id)
struct kvm_vcpu *ret;
mutex_lock(&kvm->lock);
- ret = kvm_lookup_vcpu(kvm, id);
+ ret = kvm_get_vcpu_by_id(kvm, id);
mutex_unlock(&kvm->lock);
return ret;
}
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index aaa7cc041335..05f7de9869a9 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -165,7 +165,7 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu
*vcpu)
if (tid == vcpu->vcpu_id)
return 0;
- tcpu = kvm_lookup_vcpu(vcpu->kvm, tid);
+ tcpu = kvm_get_vcpu_by_id(vcpu->kvm, tid);
if (tcpu)
kvm_vcpu_yield_to(tcpu);
return 0;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 1ee2f738bf61..1f0f8c4ca345 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2358,7 +2358,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32
id)
r = -EINVAL;
goto unlock_vcpu_destroy;
}
- if (kvm_lookup_vcpu(kvm, id)) {
+ if (kvm_get_vcpu_by_id(kvm, id)) {
r = -EEXIST;
goto unlock_vcpu_destroy;
}
--
2.6.2
This should probably all be cleaned up in the kvms390 tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] virtio: virtio 1.0 support, misc patches
Hi Michael, On Thu, 11 Dec 2014 14:02:48 +0200 "Michael S. Tsirkin" wrote: > > The following changes since commit b2776bf7149bddd1f4161f14f79520f17fc1d71d: > > Linux 3.18 (2014-12-07 14:21:05 -0800) hmmm ... > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus > > for you to fetch changes up to 803cd18f7b5e6c7ad6bee9571ae8f4450190ab58: > > virtio_ccw: finalize_features error handling (2014-12-09 16:32:41 +0200) > > Note: some net drivers are affected by these patches. > David said he's fine with merging these patches through > my tree. > Rusty's on vacation, he acked using my tree for these, too. So, either none of this has been in linux-next or you have just rebased it all on top of v3.18 ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpuqQnbcDp5I.pgp Description: OpenPGP digital signature
Re: [PULL] virtio: virtio 1.0 support, misc patches
Hi Michael, On Fri, 12 Dec 2014 00:01:57 +0200 "Michael S. Tsirkin" wrote: > > It was on linux next for a while, then I wanted to tweak the commit log > for some messages a bit. > So since I rewrote the history anyway, I went ahead and rebased it > on v3.18, after this rebase it's been in linux-next for several days. Maybe you think you pushed it into a linux-next included branch (or maybe you think I am fetching a branch that I am not), but when I look at those commits in my tree (as I fetch Linus' tree into mine) none of them precede any of the next-* tags ... I am not doubting that these patches have been published and reviewed and tested, all I am saying is that they have not been in linux-next as those commits. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgplJ3pzj5ZEB.pgp Description: OpenPGP digital signature
Re: [PATCH RFC 00/73] tree-wide: clean up some no longer required #include
Hi Paul, On Tue, 21 Jan 2014 16:22:03 -0500 Paul Gortmaker wrote: > > Where: This work exists as a queue of patches that I apply to > linux-next; since the changes are fixing some things that currently > can only be found there. The patch series can be found at: > >http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git >git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git > > I've avoided annoying Stephen with another queue of patches for > linux-next while the development content was in flux, but now that > the merge window has opened, and new additions are fewer, perhaps he > wouldn't mind tacking it on the end... Stephen? OK, I have added this to the end of linux-next today - we will see how we go. It is called "init". Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window. You will need to ensure that the patches/commits in your tree/series have been: * submitted under GPL v2 (or later) and include the Contributor's Signed-off-by, * posted to the relevant mailing list, * reviewed by you (or another maintainer of your subsystem tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You may be sent e-mail messages indicating errors or other issues when the patches/commits from your subsystem tree are merged and tested in linux-next. These messages may also be cross-posted to the linux-next mailing list, the linux-kernel mailing list, etc. The linux-next tree project and IBM (my employer) make no warranties regarding the linux-next project, the testing procedures, the results, the e-mails, etc. If you don't agree to these ground rules, let me know and I'll remove your tree from participation in linux-next. pgp3YkmBevRNl.pgp Description: PGP signature
Re: [GIT PULL] tree-wide: clean up no longer required #include
Hi Ingo, On Wed, 5 Feb 2014 07:06:33 +0100 Ingo Molnar wrote: > > So, if you meant Linus to pull it, you probably want to cite a real > Git URI along the lines of: > >git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git Paul provided the proper git url further down in the mail along with the usual pull request message (I guess he should have put that bit at the top). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpCupBnQvITX.pgp Description: PGP signature
Re: [GIT PULL] tree-wide: clean up no longer required #include
Hi Linus, On Tue, 4 Feb 2014 15:51:58 -0500 Paul Gortmaker wrote: > > We've had this in linux-next for 2+ weeks (thanks Stephen!) as a > linux-stable like queue of patches, and as can be seen here: > > https://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git > > most of the changes in the last week have been trivial adding acks > or dropping patches that maintainers decided to take themselves. Any thoughts on merging this? I can feel it bitrotting :-( -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpLBzb9EX2uu.pgp Description: PGP signature
linux-next: kvm tree build failure
Hi Avi,
Today's linux-next build (powerpc ppc44x_config) failed like this:
In file included from include/linux/kvm_host.h:27,
from arch/powerpc/include/asm/kvm_44x.h:23,
from arch/powerpc/kernel/asm-offsets.c:52:
arch/powerpc/include/asm/kvm_host.h:203: error: redefinition of 'struct
kvm_guest_debug'
Caused by commit 887e823e3f9c402ff2fe1ea2dc25072ebe81b5b1 ("KVM: New
guest debug interface") which added struct kvm_guest_debug to
include/linux/kvm.h but didn't remove it from
arch/powerpc/include/asm/kvm_host.h. (ia64 and s390 probably have the
same problem.)
I have reverted the kvm tree for today.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpiBM252L09F.pgp
Description: PGP signature
linux-next: manual merge of the akpm-current tree with the kvm tree
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/x86/kvm/mmu.c
between commits:
7ee0e5b29d27 ("KVM: x86: MMU: Remove unused parameter of __direct_map()")
029499b47738 ("KVM: x86: MMU: Make mmu_set_spte() return emulate value")
from the kvm tree and commit:
7fd3f3e7c320 ("kvm: rename pfn_t to kvm_pfn_t")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/x86/kvm/mmu.c
index a1a3d1907fdc,2dd83650d867..
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@@ -2546,9 -2564,10 +2546,9 @@@ done
return ret;
}
-static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
- unsigned pte_access, int write_fault, int *emulate,
- int level, gfn_t gfn, kvm_pfn_t pfn, bool speculative,
- bool host_writable)
+static bool mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, unsigned
pte_access,
-int write_fault, int level, gfn_t gfn, pfn_t pfn,
++ int write_fault, int level, gfn_t gfn, kvm_pfn_t pfn,
+ bool speculative, bool host_writable)
{
int was_rmapped = 0;
int rmap_count;
@@@ -2606,11 -2624,9 +2606,11 @@@
}
kvm_release_pfn_clean(pfn);
+
+ return emulate;
}
- static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
+ static kvm_pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
bool no_dirty_log)
{
struct kvm_memory_slot *slot;
@@@ -2691,8 -2708,9 +2691,8 @@@ static void direct_pte_prefetch(struct
__direct_pte_prefetch(vcpu, sp, sptep);
}
-static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
- int map_writable, int level, gfn_t gfn, kvm_pfn_t pfn,
- bool prefault)
+static int __direct_map(struct kvm_vcpu *vcpu, int write, int map_writable,
- int level, gfn_t gfn, pfn_t pfn, bool prefault)
++ int level, gfn_t gfn, kvm_pfn_t pfn, bool prefault)
{
struct kvm_shadow_walk_iterator iterator;
struct kvm_mmu_page *sp;
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
