Skip to contentSkip to conversation

paravirt_ops and xen updates for 2.6.24

GIT PULL Jeremy Fitzhardinge 4 participants 7 messages Oct 16, 2007 – Oct 17, 2007

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull:

ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git xen-upstream

This contains updates for arch/x86 paravirt_ops and Xen.

A quick overview of the patchset:

paravirt_ops:
Remove the monolithic paravirt_ops structure, and replace it with smaller structures of related functions. Also, clean up the handling of lazy mode to make it easier to implement.

x86/mm/init.c: remove a chunk of dead code

Xen:
- remove duplicate includes
- yield if the target vcpu of an IPI is not currently running
- add post-batch callbacks for multicalls [*]
- deal with unpinning pagetables when another vcpu still has a cr3 reference [*]
- deal with split ptelocks by pinning each pte page separately under lock
- determine the kernel/hypervisor address split dynamically
- use the right arg structure for register_vcpu_info [*]
- add extra debugging output for failed multicalls

XFS:
- eagerly unmap vmapped areas to avoid confict with Xen [*]

[*] bugfix needed for 2.6.23. I've also cc:d them to [email protected]

Diffstat:

 arch/x86/kernel/alternative.c         |    4 
 arch/x86/kernel/asm-offsets_32.c      |   14 
 arch/x86/kernel/entry_32.S            |    2 
 arch/x86/kernel/paravirt_32.c         |  234 ++++++++-----
 arch/x86/kernel/vmi_32.c              |  211 ++++++------
 arch/x86/mm/init_32.c                 |   22 -
 arch/x86/xen/enlighten.c              |  295 +++++++++-------
 arch/x86/xen/mmu.c                    |  149 ++++++--
 arch/x86/xen/multicalls.c             |   52 ++
 arch/x86/xen/multicalls.h             |    5 
 arch/x86/xen/smp.c                    |   14 
 arch/x86/xen/time.c                   |    6 
 arch/x86/xen/xen-ops.h                |   10 
 drivers/char/hvc_lguest.c             |    2 
 drivers/lguest/core.c                 |    6 
 drivers/lguest/lguest.c               |  154 ++++----
 drivers/lguest/lguest_bus.c           |    2 
 fs/xfs/linux-2.6/xfs_buf.c            |   13 
 include/asm-x86/paravirt.h            |  507 ++++++++++++++++-------------
 include/asm-x86/pgtable-3level-defs.h |    2 
 include/xen/interface/vcpu.h          |    5 
 mm/Kconfig                            |    1 
 22 files changed, 1027 insertions(+), 683 deletions(-)

Thanks,
J

#1 lore raw
Quoted 2 lines · Jeremy Fitzhardinge

Hi Linus,

Ping?

Quoted 66 lines

Please pull:

ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git xen-upstream

This contains updates for arch/x86 paravirt_ops and Xen.

A quick overview of the patchset:

paravirt_ops:
Remove the monolithic paravirt_ops structure, and replace it with smaller structures of related functions. Also, clean up the handling of lazy mode to make it easier to implement.

x86/mm/init.c: remove a chunk of dead code

Xen:
- remove duplicate includes
- yield if the target vcpu of an IPI is not currently running
- add post-batch callbacks for multicalls [*]
- deal with unpinning pagetables when another vcpu still has a cr3 reference [*]
- deal with split ptelocks by pinning each pte page separately under lock
- determine the kernel/hypervisor address split dynamically
- use the right arg structure for register_vcpu_info [*]
- add extra debugging output for failed multicalls

XFS:
- eagerly unmap vmapped areas to avoid confict with Xen [*]

[*] bugfix needed for 2.6.23. I've also cc:d them to [email protected]

Diffstat:

 arch/x86/kernel/alternative.c         |    4 
 arch/x86/kernel/asm-offsets_32.c      |   14 
 arch/x86/kernel/entry_32.S            |    2 
 arch/x86/kernel/paravirt_32.c         |  234 ++++++++-----
 arch/x86/kernel/vmi_32.c              |  211 ++++++------
 arch/x86/mm/init_32.c                 |   22 -
 arch/x86/xen/enlighten.c              |  295 +++++++++-------
 arch/x86/xen/mmu.c                    |  149 ++++++--
 arch/x86/xen/multicalls.c             |   52 ++
 arch/x86/xen/multicalls.h             |    5 
 arch/x86/xen/smp.c                    |   14 
 arch/x86/xen/time.c                   |    6 
 arch/x86/xen/xen-ops.h                |   10 
 drivers/char/hvc_lguest.c             |    2 
 drivers/lguest/core.c                 |    6 
 drivers/lguest/lguest.c               |  154 ++++----
 drivers/lguest/lguest_bus.c           |    2 
 fs/xfs/linux-2.6/xfs_buf.c            |   13 
 include/asm-x86/paravirt.h            |  507 ++++++++++++++++-------------
 include/asm-x86/pgtable-3level-defs.h |    2 
 include/xen/interface/vcpu.h          |    5 
 mm/Kconfig                            |    1 
 22 files changed, 1027 insertions(+), 683 deletions(-)

Thanks,
J

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
Quoted 11 lines · Jeremy Fitzhardinge
Quoted 2 lines · Jeremy Fitzhardinge

Hi Linus,

Ping?

Quoted 5 lines

Please pull:

ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git xen-upstream

This contains updates for arch/x86 paravirt_ops and Xen.

hm, could we do the arch/x86 changes via the arch/x86 tree instead? We've got about a 100 patches pending there now, under QA, preparing them for pushout. Will check your paravirt patches too, ok?

Ingo

#3 lore raw
Quoted 8 lines · Ingo Molnar
Quoted 7 lines · Jeremy Fitzhardinge
Quoted 2 lines

Hi Linus,

Ping?

Quoted 2 lines

Please pull:

Quoted 7 lines
Quoted 3 lines
Quoted 3 lines

ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git xen-upstream

This contains updates for arch/x86 paravirt_ops and Xen.

hm, could we do the arch/x86 changes via the arch/x86 tree instead? We've got about a 100 patches pending there now, under QA, preparing them for pushout. Will check your paravirt patches too, ok?

Yeah, I'm fixing merge conflicts the third time today :)

tglx

#4 lore raw
In reply to Ingo Molnar
Quoted 3 lines · Ingo Molnar

hm, could we do the arch/x86 changes via the arch/x86 tree instead? We've got about a 100 patches pending there now, under QA, preparing them for pushout. Will check your paravirt patches too, ok?

Yep, that's fine.

J

#5 lore raw
Quoted 6 lines · Jeremy Fitzhardinge
Quoted 3 lines · Ingo Molnar

hm, could we do the arch/x86 changes via the arch/x86 tree instead? We've got about a 100 patches pending there now, under QA, preparing them for pushout. Will check your paravirt patches too, ok?

Yep, that's fine.

I just pulled your tree on top of my tip and there are no conflicts. I checked the diffs and there is nothing, which is conflicting with our backlogs.

Linus, please go ahead and pull it yourself.

Thanks,

tglx

#6 lore raw
Quoted 2 lines · Thomas Gleixner

Linus, please go ahead and pull it yourself.

Heh. I had already done so.

Sometimes I'm tardy and miss things for weeks and need prodding, and sometimes I pull almost before you've sent the "please pull" message.

I'm unpredictable. Or keeping you on your toes. Or incompetent. Pick whatever suits your mood ;)

Linus