ppc patch queue 2013-03-22
Subsystems (4)
Hi Marcelo / Gleb,
This is my current patch queue for ppc. Please pull.
Changes include:
- race-free in-kernel watchdog handling api
- e500 mmu fixes
Alex
The following changes since commit 2ae33b389601b86a3d0cfe2d09f5e3189d5322fd:
Marcelo Tosatti (1):
Merge remote-tracking branch 'upstream/master' into queue
are available in the git repository at:
git://github.com/agraf/linux-2.6.git kvm-ppc-next
Bharat Bhushan (3):
KVM: PPC: move tsr update in a separate function
KVM: PPC: Added one_reg interface for timer registers
KVM: PPC: booke: Added debug handler
Paul Mackerras (1):
KVM: PPC: Remove unused argument to kvmppc_core_dequeue_external
Scott Wood (3):
kvm/ppc/e500: h2g_tlb1_rmap: esel 0 is valid kvm/ppc/e500: g2h_tlb1_map: clear old bit before setting new bit kvm/ppc/e500: eliminate tlb_refs
Documentation/virtual/kvm/api.txt | 4 ++ arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/asm/kvm_ppc.h | 3 +- arch/powerpc/include/uapi/asm/kvm.h | 5 ++ arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kvm/book3s.c | 3 +- arch/powerpc/kvm/booke.c | 57 +++++++++++++++++++----- arch/powerpc/kvm/booke_interrupts.S | 42 ++++++++++++++++- arch/powerpc/kvm/e500.h | 24 +++------- arch/powerpc/kvm/e500_mmu_host.c | 84 +++++++++++----------------------- arch/powerpc/kvm/powerpc.c | 2 +- 11 files changed, 133 insertions(+), 93 deletions(-)
PATCH 1/7 KVM: PPC: move tsr update in a separate function
From: Bharat Bhushan <[email protected]>
This is done so that same function can be called from SREGS and ONE_REG interface (follow up patch).
--- arch/powerpc/kvm/booke.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-)
arch/powerpc/kvm/booke.c +14 -10
@@ -1148,6 +1148,18 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,return r; } +static void kvmppc_set_tsr (struct kvm_vcpu *vcpu,u32 new_tsr) +{ +u32 old_tsr = vcpu->arch.tsr; + + vcpu->arch.tsr = new_tsr; + +if ((old_tsr ^ vcpu->arch.tsr) & (TSR_ENW |TSR_WIS )) +arm_next_watchdog (vcpu); + +update_timer_ints (vcpu); +} +/* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */ int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) {
@@ -1287,16 +1299,8 @@ static int set_sregs_base(struct kvm_vcpu *vcpu,kvmppc_emulate_dec (vcpu); } -if (sregs->u.e.update_special &KVM_SREGS_E_UPDATE_TSR ) { -u32 old_tsr = vcpu->arch.tsr; - - vcpu->arch.tsr = sregs->u.e.tsr; - -if ((old_tsr ^ vcpu->arch.tsr) & (TSR_ENW |TSR_WIS )) -arm_next_watchdog (vcpu); - -update_timer_ints (vcpu); - } +if (sregs->u.e.update_special &KVM_SREGS_E_UPDATE_TSR ) +kvmppc_set_tsr (vcpu, sregs->u.e.tsr);return 0 ; }
Signature · 1 line
1.6.0.2
PATCH 2/7 KVM: PPC: Added one_reg interface for timer registers
In reply to Alexander GrafFrom: Bharat Bhushan <[email protected]>
If userspace wants to change some specific bits of TSR (timer status register) then it uses GET/SET_SREGS ioctl interface. So the steps will be:
i) user-space will make get ioctl,
ii) change TSR in userspace
iii) then make set ioctl.
It can happen that TSR gets changed by kernel after step i) and before step iii).
To avoid this we have added below one_reg ioctls for oring and clearing specific bits in TSR. This patch adds one registerface for:
1) setting specific bit in TSR (timer status register)
2) clearing specific bit in TSR (timer status register)
3) setting/getting the TCR register. There are cases where we want to only change TCR and not TSR. Although we can uses SREGS without KVM_SREGS_E_UPDATE_TSR flag but I think one reg is better. I am open if someone feels we should use SREGS only here.
4) getting/setting TSR register
--- Documentation/virtual/kvm/api.txt | 4 ++++ arch/powerpc/include/uapi/asm/kvm.h | 5 +++++ arch/powerpc/kvm/booke.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-)
Documentation/virtual/kvm/api.txt +4 -0
@@ -1788,6 +1788,10 @@ registers, find a list below: PPC | KVM_REG_PPC_VPA_DTL | 128 PPC | KVM_REG_PPC_EPCR | 32 PPC | KVM_REG_PPC_EPR | 32 + PPC | KVM_REG_PPC_TCR | 32 + PPC | KVM_REG_PPC_TSR | 32 + PPC | KVM_REG_PPC_OR_TSR | 32 + PPC | KVM_REG_PPC_CLEAR_TSR | 32 ARM registers are mapped using the lower 32 bits. The upper 16 of that is the register group type, or coprocessor number:
arch/powerpc/include/uapi/asm/kvm.h +5 -0
@@ -417,4 +417,9 @@ struct kvm_get_htab_header {#define KVM_REG_PPC_EPCR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x85)#define KVM_REG_PPC_EPR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x86) +/* Timer Status Register OR/CLEAR interface */ +#define KVM_REG_PPC_OR_TSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x87) +#define KVM_REG_PPC_CLEAR_TSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x88) +#define KVM_REG_PPC_TCR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x89) +#define KVM_REG_PPC_TSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x8a)#endif /* __LINUX_KVM_POWERPC_H */
arch/powerpc/kvm/booke.c +30 -0
@@ -1442,6 +1442,12 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) r =put_user (vcpu->arch.epcr, (u32 __user *)(long )reg->addr);break ;#endif +case KVM_REG_PPC_TCR : + r =put_user (vcpu->arch.tcr, (u32 __user *)(long )reg->addr); +break ; +case KVM_REG_PPC_TSR : + r =put_user (vcpu->arch.tsr, (u32 __user *)(long )reg->addr); +break ;default :break ; }
@@ -1485,6 +1491,30 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)break ; }#endif +case KVM_REG_PPC_OR_TSR : { +u32 tsr_bits; + r =get_user (tsr_bits, (u32 __user *)(long )reg->addr); +kvmppc_set_tsr_bits (vcpu, tsr_bits); +break ; + } +case KVM_REG_PPC_CLEAR_TSR : { +u32 tsr_bits; + r =get_user (tsr_bits, (u32 __user *)(long )reg->addr); +kvmppc_clr_tsr_bits (vcpu, tsr_bits); +break ; + } +case KVM_REG_PPC_TSR : { +u32 tsr; + r =get_user (tsr, (u32 __user *)(long )reg->addr); +kvmppc_set_tsr (vcpu, tsr); +break ; + } +case KVM_REG_PPC_TCR : { +u32 tcr; + r =get_user (tcr, (u32 __user *)(long )reg->addr); +kvmppc_set_tcr (vcpu, tcr); +break ; + }default :break ; }
Signature · 1 line
1.6.0.2
PATCH 3/7 KVM: PPC: booke: Added debug handler
In reply to Alexander GrafFrom: Bharat Bhushan <[email protected]>
Installed debug handler will be used for guest debug support and debug facility emulation features (patches for these features will follow this patch).
--- arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kvm/booke_interrupts.S | 42 ++++++++++++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -504,6 +504,7 @@ struct kvm_vcpu_arch {u32 tlbcfg[4 ];u32 mmucfg;u32 epr; +u32 crit_save;struct kvmppc_booke_debug_reg dbg_reg;#endif gpa_t paddr_accessed;
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -596,6 +596,7 @@ int main(void) DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst)); DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear)); DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr)); + DEFINE(VCPU_CRIT_SAVE, offsetof(struct kvm_vcpu, arch.crit_save));#endif /* CONFIG_PPC_BOOK3S */ #endif /* CONFIG_KVM */
arch/powerpc/kvm/booke_interrupts.S +39 -3
60 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 4/7 kvm/ppc/e500: h2g_tlb1_rmap: esel 0 is valid
In reply to Alexander GrafFrom: Scott Wood <[email protected]>
Add one to esel values in h2g_tlb1_rmap, so that "no mapping" can be distinguished from "esel 0". Note that we're not saved by the fact that host esel 0 is reserved for non-KVM use, because KVM host esel numbering is not the raw host numbering (see to_htlb1_esel).
--- arch/powerpc/kvm/e500_mmu_host.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/e500_mmu_host.c +2 -2
@@ -511,10 +511,10 @@ static int kvmppc_e500_tlb1_map_tlb1(struct kvmppc_vcpu_e500 *vcpu_e500, vcpu_e500->g2h_tlb1_map[esel] |= (u64 )1 << sesel; vcpu_e500->gtlb_priv[1 ][esel].ref.flags |=E500_TLB_BITMAP ;if (vcpu_e500->h2g_tlb1_rmap[sesel]) { -unsigned int idx = vcpu_e500->h2g_tlb1_rmap[sesel]; +unsigned int idx = vcpu_e500->h2g_tlb1_rmap[sesel] -1 ; vcpu_e500->g2h_tlb1_map[idx] &= ~(1ULL << sesel); } - vcpu_e500->h2g_tlb1_rmap[sesel] = esel; + vcpu_e500->h2g_tlb1_rmap[sesel] = esel +1 ;return sesel; }
Signature · 1 line
1.6.0.2
PATCH 5/7 kvm/ppc/e500: g2h_tlb1_map: clear old bit before setting new bit
In reply to Alexander GrafFrom: Scott Wood <[email protected]>
It's possible that we're using the same host TLB1 slot to map (a presumably different portion of) the same guest TLB1 entry. Clear the bit in the map before setting it, so that if the esels are the same the bit will remain set.
--- arch/powerpc/kvm/e500_mmu_host.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
arch/powerpc/kvm/e500_mmu_host.c +4 -3
@@ -507,13 +507,14 @@ static int kvmppc_e500_tlb1_map_tlb1(struct kvmppc_vcpu_e500 *vcpu_e500,if (unlikely (vcpu_e500->host_tlb1_nv >=tlb1_max_shadow_size ())) vcpu_e500->host_tlb1_nv =0 ; - vcpu_e500->tlb_refs[1 ][sesel] = *ref; - vcpu_e500->g2h_tlb1_map[esel] |= (u64 )1 << sesel; - vcpu_e500->gtlb_priv[1 ][esel].ref.flags |=E500_TLB_BITMAP ;if (vcpu_e500->h2g_tlb1_rmap[sesel]) {unsigned int idx = vcpu_e500->h2g_tlb1_rmap[sesel] -1 ; vcpu_e500->g2h_tlb1_map[idx] &= ~(1ULL << sesel); } + + vcpu_e500->tlb_refs[1 ][sesel] = *ref; + vcpu_e500->gtlb_priv[1 ][esel].ref.flags |=E500_TLB_BITMAP ; + vcpu_e500->g2h_tlb1_map[esel] |= (u64 )1 << sesel; vcpu_e500->h2g_tlb1_rmap[sesel] = esel +1 ;return sesel;
Signature · 1 line
1.6.0.2
PATCH 6/7 kvm/ppc/e500: eliminate tlb_refs
In reply to Alexander GrafFrom: Scott Wood <[email protected]>
Commit 523f0e5421c12610527c620b983b443f329e3a32 ("KVM: PPC: E500:
Explicitly mark shadow maps invalid") began using E500_TLB_VALID for guest TLB1 entries, and skipping invalidations if it's not set.
However, when E500_TLB_VALID was set for such entries, it was on a fake local ref, and so the invalidations never happen. gtlb_privs is documented as being only for guest TLB0, though we already violate that with E500_TLB_BITMAP.
Now that we have MMU notifiers, and thus don't need to actually retain a reference to the mapped pages, get rid of tlb_refs, and use gtlb_privs for E500_TLB_VALID in TLB1.
Since we can have more than one host TLB entry for a given tlbe_ref, be careful not to clear existing flags that are relevant to other host TLB entries when preparing a new host TLB entry.
--- arch/powerpc/kvm/e500.h | 24 ++++-------- arch/powerpc/kvm/e500_mmu_host.c | 75 +++++++++++--------------------------- 2 files changed, 30 insertions(+), 69 deletions(-)
arch/powerpc/kvm/e500.h +8 -16
@@ -26,17 +26,20 @@#define E500_PID_NUM 3#define E500_TLB_NUM 2 -#define E500_TLB_VALID 1 -#define E500_TLB_BITMAP 2 +/* entry is mapped somewhere in host TLB */ +#define E500_TLB_VALID (1 << 0) +/* TLB1 entry is mapped by host TLB1, tracked by bitmaps */ +#define E500_TLB_BITMAP (1 << 1) +/* TLB1 entry is mapped by host TLB0 */ #define E500_TLB_TLB0 (1 << 2)struct tlbe_ref { -pfn_t pfn; -unsigned int flags;/* E500_TLB_* */ +pfn_t pfn;/* valid only for TLB0, except briefly */ +unsigned int flags;/* E500_TLB_* */ };struct tlbe_priv { -struct tlbe_ref ref;/* TLB0 only -- TLB1 uses tlb_refs */ +struct tlbe_ref ref; };#ifdef CONFIG_KVM_E500V2
@@ -63,17 +66,6 @@ struct kvmppc_vcpu_e500 {unsigned int gtlb_nv[E500_TLB_NUM ]; -/* -* information associated with each host TLB entry -- -* TLB1 only for now. If/when guest TLB1 entries can be -* mapped with host TLB0, this will be used for that too. -* -* We don't want to use this for guest TLB0 because then we'd -* have the overhead of doing the translation again even if -* the entry is still in the guest TLB (e.g. we swapped out -* and back, and our host TLB entries got evicted). -*/ -struct tlbe_ref *tlb_refs[E500_TLB_NUM ];unsigned int host_tlb1_nv;u32 svr;
arch/powerpc/kvm/e500_mmu_host.c +22 -53
159 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 7/7 KVM: PPC: Remove unused argument to kvmppc_core_dequeue_external
In reply to Alexander GrafFrom: Paul Mackerras <[email protected]>
Currently kvmppc_core_dequeue_external() takes a struct kvm_interrupt * argument and does nothing with it, in any of its implementations. This removes it in order to make things easier for forthcoming in-kernel interrupt controller emulation code.
--- arch/powerpc/include/asm/kvm_ppc.h | 3 +-- arch/powerpc/kvm/book3s.c | 3 +-- arch/powerpc/kvm/booke.c | 3 +-- arch/powerpc/kvm/powerpc.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +1 -2
@@ -104,8 +104,7 @@ extern void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu);extern void kvmppc_core_dequeue_dec (struct kvm_vcpu *vcpu);extern void kvmppc_core_queue_external (struct kvm_vcpu *vcpu,struct kvm_interrupt *irq); -extern void kvmppc_core_dequeue_external (struct kvm_vcpu *vcpu, -struct kvm_interrupt *irq); +extern void kvmppc_core_dequeue_external (struct kvm_vcpu *vcpu);extern void kvmppc_core_flush_tlb (struct kvm_vcpu *vcpu); extern int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
arch/powerpc/kvm/book3s.c +1 -2
@@ -160,8 +160,7 @@ void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,kvmppc_book3s_queue_irqprio (vcpu, vec); } -void kvmppc_core_dequeue_external (struct kvm_vcpu *vcpu, -struct kvm_interrupt *irq) +void kvmppc_core_dequeue_external (struct kvm_vcpu *vcpu) {kvmppc_book3s_dequeue_irqprio (vcpu,BOOK3S_INTERRUPT_EXTERNAL );kvmppc_book3s_dequeue_irqprio (vcpu,BOOK3S_INTERRUPT_EXTERNAL_LEVEL );
arch/powerpc/kvm/booke.c +1 -2
@@ -222,8 +222,7 @@ void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,kvmppc_booke_queue_irqprio (vcpu, prio); } -void kvmppc_core_dequeue_external (struct kvm_vcpu *vcpu, -struct kvm_interrupt *irq) +void kvmppc_core_dequeue_external (struct kvm_vcpu *vcpu) {clear_bit (BOOKE_IRQPRIO_EXTERNAL , &vcpu->arch.pending_exceptions);clear_bit (BOOKE_IRQPRIO_EXTERNAL_LEVEL , &vcpu->arch.pending_exceptions);
arch/powerpc/kvm/powerpc.c +1 -1
@@ -739,7 +739,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)int kvm_vcpu_ioctl_interrupt (struct kvm_vcpu *vcpu,struct kvm_interrupt *irq) {if (irq->irq =KVM_INTERRUPT_UNSET ) { -kvmppc_core_dequeue_external (vcpu, irq); +kvmppc_core_dequeue_external (vcpu);return 0 ; }
Signature · 1 line
1.6.0.2
Quoted 11 lines · Alexander Graf
Hi Marcelo / Gleb,
This is my current patch queue for ppc. Please pull.
Changes include:
- race-free in-kernel watchdog handling api
- e500 mmu fixesAlex
Pulled, thanks.
Quoted 22 lines
The following changes since commit
2ae33b389601b86a3d0cfe2d09f5e3189d5322fd:
Marcelo Tosatti (1):
Merge remote-tracking branch 'upstream/master' into queueare available in the git repository at:
git://github.com/agraf/linux-2.6.gitkvm-ppc-nextBharat Bhushan (3):
KVM: PPC: move tsr update in a separate function
KVM: PPC: Addedone_reginterface for timer registers
KVM: PPC: booke: Added debug handlerPaul Mackerras (1):
KVM: PPC: Remove unused argument tokvmppc_core_dequeue_externalScott Wood (3):
kvm/ppc/e500:h2g_tlb1_rmap: esel 0 is valid kvm/ppc/e500:g2h_tlb1_map: clear old bit before setting new bit kvm/ppc/e500: eliminatetlb_refs
Quoted 12 lines
Documentation/virtual/kvm/api.txt | 4 ++ arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/asm/kvm_ppc.h | 3 +- arch/powerpc/include/uapi/asm/kvm.h | 5 ++ arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kvm/book3s.c | 3 +- arch/powerpc/kvm/booke.c | 57 +++++++++++++++++++----- arch/powerpc/kvm/booke_interrupts.S | 42 ++++++++++++++++- arch/powerpc/kvm/e500.h | 24 +++------- arch/powerpc/kvm/e500_mmu_host.c | 84 +++++++++++----------------------- arch/powerpc/kvm/powerpc.c | 2 +- 11 files changed, 133 insertions(+), 93 deletions(-)
--
Gleb.
Quoted 20 lines · Alexander Graf
Hi Marcelo / Gleb,
This is my current patch queue for ppc. Please pull.
Changes include:
- race-free in-kernel watchdog handling api
- e500 mmu fixesAlex
The following changes since commit
2ae33b389601b86a3d0cfe2d09f5e3189d5322fd:
Marcelo Tosatti (1):
Merge remote-tracking branch 'upstream/master' into queueare available in the git repository at:
git://github.com/agraf/linux-2.6.gitkvm-ppc-next
[snip]
Quoted 4 lines
Scott Wood (3):
kvm/ppc/e500:h2g_tlb1_rmap: esel 0 is valid kvm/ppc/e500:g2h_tlb1_map: clear old bit before setting new bit kvm/ppc/e500: eliminatetlb_refs
-next? These are bugfixes, at least partially for regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Also, what about:
http://patchwork.ozlabs.org/patch/226227/
You've got all four patches in kvm-ppc-3.9 as of a few weeks ago -- will you be requesting a pull for that soon?
-Scott
Quoted 18 lines · Scott Wood
Quoted 11 lines · Alexander Graf
Hi Marcelo / Gleb,
This is my current patch queue for ppc. Please pull.
Changes include:
- race-free in-kernel watchdog handling api
- e500 mmu fixes
Alex
The following changes since commit2ae33b389601b86a3d0cfe2d09f5e3189d5322fd:
Marcelo Tosatti (1):
Merge remote-tracking branch 'upstream/master' into queue
are available in the git repository at:
git://github.com/agraf/linux-2.6.gitkvm-ppc-next[snip]
Quoted 4 lines
Scott Wood (3):
kvm/ppc/e500:h2g_tlb1_rmap: esel 0 is valid kvm/ppc/e500:g2h_tlb1_map: clear old bit before setting new bit kvm/ppc/e500: eliminatetlb_refs
Quoted 6 lines
-next? These are bugfixes, at least partially for regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few weeks ago -- will you be requesting a pull for that soon?
Sigh. I guess I've screwed up the whole "let's make -next an unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Since the patches already trickled into kvm's next branch, all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Alex
Quoted 9 lines · Alexander Graf
Quoted 1 line · Scott Wood
-next? These are bugfixes, at least partially for regressions from
3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 4 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/
Quoted 6 lines
Quoted 1 line
You've got all four patches in kvm-ppc-3.9 as of a few weeks ago --
will you be requesting a pull for that soon?
Sigh. I guess I've screwed up the whole "let's make -next an unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Since the patches already trickled into kvm's next branch, all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
-Scott
Quoted 4 lines · Scott Wood
Quoted 3 lines · Alexander Graf
Quoted 2 lines · Scott Wood
-next? These are bugfixes, at least partially for regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few weeks ago -- will you be requesting a pull for that soon?
Sigh. I guess I've screwed up the whole "let's make -next an unusable tree and fix regressions in a separate one" workflow again. Sorry for that. Since the patches already trickled into kvm's next branch, all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge commits when 3.10 opens and kvm/next and linus/master get merged. IIUC that's exactly what Linus complained about with Avi's old workflow.
Alex
Quoted 13 lines · Alexander Graf
Quoted 3 lines · Scott Wood
Quoted 2 lines · Alexander Graf
Quoted 1 line · Scott Wood
-next? These are bugfixes, at least partially for regressions
from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few weeks ago
-- will you be requesting a pull for that soon?
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Sigh. I guess I've screwed up the whole "let's make -next an
unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Quoted 1 line
Quoted 1 line
Since the patches already trickled into kvm's next branch, all we
can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Quoted 2 lines
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge commits when 3.10 opens
That's a lousy excuse for leaving bugs unfixed.
-Scott
Quoted 9 lines · Scott Wood
Quoted 8 lines · Alexander Graf
Quoted 7 lines · Scott Wood
Quoted 6 lines · Alexander Graf
Quoted 5 lines · Scott Wood
-next? These are bugfixes, at least partially for regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Also, what about:
http://patchwork.ozlabs.org/patch/226227/
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
You've got all four patches in kvm-ppc-3.9 as of a few weeks ago -- will you be requesting a pull for that soon?
Sigh. I guess I've screwed up the whole "let's make -next an unusable tree and fix regressions in a separate one" workflow again. Sorry for that. Since the patches already trickled into kvm's next branch, all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge commits when 3.10 opens
That's a lousy excuse for leaving bugs unfixed.
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
Alex
Quoted 16 lines · Alexander Graf
Quoted 13 lines · Scott Wood
Quoted 12 lines · Alexander Graf
Quoted 11 lines · Scott Wood
Quoted 9 lines · Alexander Graf
Quoted 6 lines · Scott Wood
-next? These are bugfixes, at least partially for regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few weeks ago -- will you be requesting a pull for that soon?
Sigh. I guess I've screwed up the whole "let's make -next an unusable tree and fix regressions in a separate one" workflow again. Sorry for that. Since the patches already trickled into kvm's next branch, all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge commits when 3.10 opens
That's a lousy excuse for leaving bugs unfixed.
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
--
Gleb.
Quoted 4 lines · Gleb Natapov
Quoted 2 lines · Alexander Graf
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why not? In the circumstances it seems perfectly reasonable to me. Git should merge the branches without any problem, and even if it doesn't, Linus is good at fixing merge conflicts.
Paul.
Quoted 11 lines · Paul Mackerras
Quoted 4 lines · Gleb Natapov
Quoted 2 lines · Alexander Graf
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why not? In the circumstances it seems perfectly reasonable to me. Git should merge the branches without any problem, and even if it doesn't, Linus is good at fixing merge conflicts.
Paul.
Yes, should avoid duplicate commits but its not fatal for them to exist.
Quoted 7 lines · Marcelo Tosatti
Quoted 6 lines · Paul Mackerras
Quoted 4 lines · Gleb Natapov
Quoted 2 lines · Alexander Graf
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Quoted 7 lines
Quoted 5 lines
Why not? In the circumstances it seems perfectly reasonable to me. Git should merge the branches without any problem, and even if it doesn't, Linus is good at fixing merge conflicts.
Paul.
Yes, should avoid duplicate commits but its not fatal for them to exist.
So I may send a pull request against 3.9 with the 3 commits that already are in kvm/next?
Alex
Quoted 14 lines · Alexander Graf
Quoted 11 lines · Marcelo Tosatti
Quoted 10 lines · Paul Mackerras
Quoted 4 lines · Gleb Natapov
Quoted 2 lines · Alexander Graf
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why not? In the circumstances it seems perfectly reasonable to me. Git should merge the branches without any problem, and even if it doesn't, Linus is good at fixing merge conflicts.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Paul.
Yes, should avoid duplicate commits but its not fatal for them to exist.
So I may send a pull request against 3.9 with the 3 commits that already are in kvm/next?
If you decide that the fixes are important enough to justify the existance of duplicate commits, i don't see a problem.
http://yarchive.net/comp/linux/git_rebase.html
"In fact, we have always had duplicated commits even when they are passed around as email - just because perhaps two different trees simply needed the same fix, and rather than wait for it, they both integrated it (and then when they get merged, the same patch exists twice in the history, just with different committer info etc)."
Quoted 15 lines · Marcelo Tosatti
Quoted 14 lines · Alexander Graf
Quoted 11 lines · Marcelo Tosatti
Quoted 10 lines · Paul Mackerras
Quoted 4 lines · Gleb Natapov
Quoted 2 lines · Alexander Graf
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why not? In the circumstances it seems perfectly reasonable to me. Git should merge the branches without any problem, and even if it doesn't, Linus is good at fixing merge conflicts.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Paul.
Yes, should avoid duplicate commits but its not fatal for them to exist.
So I may send a pull request against 3.9 with the 3 commits that already are in kvm/next?
If you decide that the fixes are important enough to justify the existance of duplicate commits, i don't see a problem.
Great :). I already sent the pull request out with all patches that fix regressions.
Alex
Quoted 20 lines · Alexander Graf
Quoted 17 lines · Marcelo Tosatti
Quoted 16 lines · Alexander Graf
Quoted 13 lines · Marcelo Tosatti
Quoted 11 lines · Paul Mackerras
Quoted 4 lines · Gleb Natapov
Quoted 2 lines · Alexander Graf
I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why not? In the circumstances it seems perfectly reasonable to me. Git should merge the branches without any problem, and even if it doesn't, Linus is good at fixing merge conflicts.
Paul.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Yes, should avoid duplicate commits but its not fatal for them to exist.
So I may send a pull request against 3.9 with the 3 commits that already are in kvm/next?
If you decide that the fixes are important enough to justify the existance of duplicate commits, i don't see a problem.
Great :). I already sent the pull request out with all patches that fix regressions.
Ping? Did these go to Linus?
Alex
Quoted 8 lines · Alexander Graf
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
So I may send a pull request against 3.9 with the 3 commits that already are in kvm/next?
If you decide that the fixes are important enough to justify the existance of duplicate commits, i don't see a problem.
Great :). I already sent the pull request out with all patches that fix regressions.
Ping? Did these go to Linus?
Waiting on Christoffer Dall to generate ARM fixes against kvm.git master branch.
Quoted 23 lines · Gleb Natapov
Quoted 8 lines · Alexander Graf
Quoted 5 lines · Scott Wood
Quoted 4 lines · Alexander Graf
Quoted 3 lines · Scott Wood
Quoted 2 lines · Alexander Graf
Quoted 1 line · Scott Wood
-next? These are bugfixes, at least partially for
regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few
weeks ago -- will you be requesting a pull for that soon?
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Sigh. I guess I've screwed up the whole "let's make -next an
unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Since the patches already trickled into kvm's next branch,
all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge
Quoted 8 lines
commits when 3.10 opens
Quoted 4 lines
Quoted 2 lines
That's a lousy excuse for leaving bugs unfixed.
I agree. So if it doesn't hurt to have the same commits in kvm/next
and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
Quoted 1 line
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why?
-Scott
Quoted 31 lines · Scott Wood
Quoted 30 lines · Gleb Natapov
Quoted 8 lines · Alexander Graf
Quoted 5 lines · Scott Wood
Quoted 4 lines · Alexander Graf
Quoted 3 lines · Scott Wood
Quoted 2 lines · Alexander Graf
Quoted 1 line · Scott Wood
-next? These are bugfixes, at least partially for
regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few
weeks ago -- will you be requesting a pull for that soon?
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Sigh. I guess I've screwed up the whole "let's make -next
an unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Since the patches already trickled into kvm's next branch,
all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge
commits when 3.10 opens
Quoted 3 lines
Quoted 2 lines
That's a lousy excuse for leaving bugs unfixed.
Quoted 9 lines
Quoted 6 lines
Quoted 1 line
I agree. So if it doesn't hurt to have the same commits in
kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
Quoted 1 line
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why?
Because Linus distastes it and mat refuse to pull. There is a way to avoid such double commits: push fix to Linus tree and merge it back to next.
--
Gleb.
Quoted 36 lines · Gleb Natapov
Quoted 35 lines · Scott Wood
Quoted 34 lines · Gleb Natapov
Quoted 8 lines · Alexander Graf
Quoted 5 lines · Scott Wood
Quoted 4 lines · Alexander Graf
Quoted 3 lines · Scott Wood
Quoted 2 lines · Alexander Graf
Quoted 1 line · Scott Wood
-next? These are bugfixes, at least partially for
regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few
weeks ago -- will you be requesting a pull for that soon?
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Sigh. I guess I've screwed up the whole "let's make -next
an unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Since the patches already trickled into kvm's next branch,
all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge
commits when 3.10 opens
Quoted 4 lines
Quoted 2 lines
That's a lousy excuse for leaving bugs unfixed.
I agree. So if it doesn't hurt to have the same commits in
kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why?
Because Linus distastes it and mat refuse to pull. There is a way to avoid such double commits: push fix to Linus tree and merge it back to next.
Yes, that's the normal workflow. But what if we screw up (like I did)? Does having a working 3.9 kernel win over double commits in the tree? I'd say yes, but it might be best to just ask Linus directly.
Linus, I accidentally sent a pull request including fixes that were meant for master for kvm/next which got accepted. Now we have those commits in there. However, I would prefer if we could have them in master, so that we have a known good 3.9 kernel for kvm on powerpc.
I could send another pull request against master, but that would mean that after merging things back on the next merge window, there would be a few duplicate commits in the history.
Do you think that's a big no-go, or would you be ok with duplicate commits in case of an occasional screwup?
Thanks,
Alex
Quoted 49 lines · Alexander Graf
Quoted 36 lines · Gleb Natapov
Quoted 35 lines · Scott Wood
Quoted 34 lines · Gleb Natapov
Quoted 8 lines · Alexander Graf
Quoted 5 lines · Scott Wood
Quoted 4 lines · Alexander Graf
Quoted 3 lines · Scott Wood
Quoted 2 lines · Alexander Graf
Quoted 1 line · Scott Wood
-next? These are bugfixes, at least partially for
regressions from 3.8 (that I pointed out before the bugs were merged!), that should go into master.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Also, what about:
http://patchwork.ozlabs.org/patch/226227/You've got all four patches in kvm-ppc-3.9 as of a few
weeks ago -- will you be requesting a pull for that soon?
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Sigh. I guess I've screwed up the whole "let's make -next
an unusable tree and fix regressions in a separate one" workflow again. Sorry for that.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Since the patches already trickled into kvm's next branch,
all we can do now is to wait for them to come back through stable, right? Marcelo, Gleb?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Well, you can still submit that kvm-ppc-3.9 pull request. :-)
I can, but nobody would pull it, as it'd create ugly merge
commits when 3.10 opens
Quoted 4 lines
Quoted 2 lines
That's a lousy excuse for leaving bugs unfixed.
I agree. So if it doesn't hurt to have the same commits in
kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
Quoted 1 line
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines
If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
Why?
Because Linus distastes it and mat refuse to pull. There is a way
to avoid
Quoted 1 line
such double commits: push fix to Linus tree and merge it back to
next.
Quoted 7 lines
Yes, that's the normal workflow. But what if we screw up (like I did)? Does having a working 3.9 kernel win over double commits in the tree? I'd say yes, but it might be best to just ask Linus directly.
Linus, I accidentally sent a pull request including fixes that were meant for master for kvm/next which got accepted. Now we have those commits in there. However, I would prefer if we could have them in master, so that we have a known good 3.9 kernel for kvm on powerpc.
I could send another pull request against master, but that would mean that after merging things back on the next merge window, there would be a few duplicate commits in the history.
Do you think that's a big no-go, or would you be ok with duplicate commits in case of an occasional screwup?
It doesn't look like there's much time left before 3.9 is released (rc6 was released yesterday, and Linus said he expects rc7 to be the last), so could we come to a conclusion on this soon? While I think it's ridiculous that "the same commit showing twice" would be a reason to let regressions go unfixed[1], at the very least please request a pull for the fourth bugfix patch, which should also go into 3.8 stable, and which did not go into the "next" branch (so no "duplicate commit" issue there). If that doesn't make it into 3.9, it will likely never make it into 3.8 stable because there will be no more 3.8 stable releases at that point.
-Scott
[1] It doesn't help that the bugfix patches were posted almost two months ago, before the patches that introduced the bug were merged...