WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned to go

To: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Subject: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned to go in)
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Thu, 10 Mar 2011 17:26:42 -0800
Cc: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>, Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxx, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Delivery-date: Thu, 10 Mar 2011 17:27:14 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20110310192946.GA9175@xxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20110310192946.GA9175@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Thunderbird/3.1.7
On 03/10/2011 11:29 AM, Konrad Rzeszutek Wilk wrote:
> Probably over the weekend Linus is going to open the merge window.
>
> This merge window is much more complicated than the previous
> one b/c we got a lot of good stuff.
>
> For my sanity and book-keeping I was thinking to email Linus
> five git pull requests:
>
>   for-2.6.39/e820
>       [stable/p2m-identity-v4.9.1, stable/e820]
>   for-2.6.39/irq
>       [tip/for-xen, stable/irq.rework, stable/pcifront-fixes, 
> stable/irq.cleanup]
>   for-2.6.39/cleanup
>       [stable/ia64, stable/blkfront-cleanup, stable/cleanup]
>   for-2.6.39/drivers
>       [stable/gntalloc.v6, stable/backends]
>
> .. and then during the next week of the two weeks merge window:
>   for-2.6.39/irq.phase.two
>       [stable/irq.fairness, stable/irq.ween_of_nr_irqs]
>

Good stuff.  And I guess it should all be about done by the time of the
hackathingy?

    J

> In this order or so.
>
> In other trees by other maintainers we have:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git has
>     stable/ttm.pci-api.v4 [Makes radeon,nouveau work under Xen]
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git has
>     xen watchdog [Xen watchdog is watching you..]
>
>  git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git has
>     xen suspend cleanups
>     PVonHVM improvements - makes spinlocks be PV aware, balloon in HVM
>
>
> The things that are not on this list are:
>
>  devel/balloon [Daniel Kipers' cleanup of balloon code]
>  devel/balloon.v2 [above, plus Daniel De Graaf's cleanup of balloon and using
>               them in gntalloc]
>  devel/gntalloc.v7 [cleanup in gntalloc]
>  devel/fb_kb_front_use_page_gref [Daniel De Graaf's modifications]
>  
> Which we could squeeze in the end of the merge window if we
> are comfortable with the patches.
>
> The things that are not going in 2.6.39 are:
>
>   devel/xen-pciback-0.4.driver [xen-pciback]
>   devel/xen-blkback-v1 [xen-blkback]
>   git://xenbits.xen.org/people/ianc/linux-2.6 upstream/dom0/backend/netback
>       [xen-netback - well, it could if the network maintainers are comfortable
>        with the driver, but I think it is still going through the review]
>
> The diffstat of those "for-2.6.39/*" is:
>
>  arch/ia64/include/asm/xen/hypercall.h |    2 +-
>  arch/x86/include/asm/xen/page.h       |   47 ++-
>  arch/x86/include/asm/xen/pci.h        |    8 +-
>  arch/x86/pci/xen.c                    |  192 +++++----
>  arch/x86/xen/Kconfig                  |    8 +
>  arch/x86/xen/enlighten.c              |    2 +-
>  arch/x86/xen/mmu.c                    |   72 +++-
>  arch/x86/xen/p2m.c                    |  330 ++++++++++++++-
>  arch/x86/xen/setup.c                  |   68 +++-
>  arch/x86/xen/time.c                   |    4 +-
>  drivers/block/xen-blkfront.c          |    8 +-
>  drivers/pci/xen-pcifront.c            |   31 +-
>  drivers/xen/Kconfig                   |   10 +
>  drivers/xen/Makefile                  |    2 +
>  drivers/xen/balloon.c                 |    2 +-
>  drivers/xen/events.c                  |  775 
> +++++++++++++++++----------------
>  drivers/xen/gntalloc.c                |  545 +++++++++++++++++++++++
>  drivers/xen/gntdev.c                  |  386 +++++++++++------
>  drivers/xen/grant-table.c             |   10 +
>  include/linux/interrupt.h             |    3 +-
>  include/xen/events.h                  |   38 +-
>  include/xen/gntalloc.h                |   82 ++++
>  include/xen/gntdev.h                  |   31 ++
>  include/xen/interface/io/blkif.h      |   16 +-
>  kernel/irq/manage.c                   |   11 +-
>  kernel/irq/pm.c                       |    3 -
>  26 files changed, 2024 insertions(+), 662 deletions(-)
>
> And shortlog:
>
> Daniel De Graaf (14):
>       xen-gntdev: Change page limit to be global instead of per-open
>       xen-gntdev: Use find_vma rather than iterating our vma list manually
>       xen-gntdev: Add reference counting to maps
>       xen-gntdev: Support mapping in HVM domains
>       xen-gntalloc: Userspace grant allocation driver
>       xen/gntalloc,gntdev: Add unmap notify ioctl
>       xen-gntdev: Fix memory leak when mmap fails
>       xen-gntdev: Fix unmap notify on PV domains
>       xen-gntdev: Use map->vma for checking map validity
>       xen-gntdev: Avoid unmapping ranges twice
>       xen-gntdev: Avoid double-mapping memory
>       xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings
>       xen-gntdev: Fix incorrect use of zero handle
>       xen-gntdev: Add cast to pointer
>
> Ian Campbell (48):
>       xen: handled remapped IRQs when enabling a pcifront PCI device.
>       xen:events: move find_unbound_irq inside CONFIG_PCI_MSI
>       xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq
>       xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges.
>       xen: events: do not free legacy IRQs
>       xen: Fix compile error introduced by "switch to new irq_chip functions"
>       xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
>       xen: events: mark cpu_evtchn_mask_p as __refdata
>       xen p2m: annotate variable which appears unused
>       xen: annotate functions which only call into __init at start of day
>       xen: pci: only define xen_initdom_setup_msi_irqs if CONFIG_XEN_DOM0
>       xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq 
> available.
>       xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi
>       xen: events: return irq from xen_allocate_pirq_msi
>       xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq
>       xen: events: assume PHYSDEVOP_get_free_pirq exists
>       xen: events: separate MSI PIRQ allocation from PIRQ binding to IRQ
>       xen: events: refactor xen_create_msi_irq slightly
>       xen: events: update pirq_to_irq in xen_create_msi_irq
>       xen: events: push set_irq_msi down into xen_create_msi_irq
>       xen: events: use xen_bind_pirq_msi_to_irq from xen_create_msi_irq
>       xen: events: remove dom0 specific xen_create_msi_irq
>       xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend 
> drivers
>       xen: ia64 build broken due to "xen: switch to new schedop hypercall by 
> default."
>       xen: handled remapped IRQs when enabling a pcifront PCI device.
>       xen:events: move find_unbound_irq inside CONFIG_PCI_MSI
>       xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq
>       xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges.
>       xen: events: do not free legacy IRQs
>       xen: Fix compile error introduced by "switch to new irq_chip functions"
>       xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
>       xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override
>       xen: gntdev: fix build warning
>       xen: events: Make last processed event channel a per-cpu variable.
>       xen: events: separate two unrelated halves of if condition
>       xen: events: simplify comment
>       xen: events: fix xen_map_pirq_gsi error return
>       xen: events: remove unused public functions
>       xen: events: rename restore_cpu_pirqs -> restore_pirqs
>       xen: events: refactor GSI pirq bindings functions
>       xen: events: use per-cpu variable for cpu_evtchn_mask
>       xen: events: turn irq_info constructors into initialiser functions
>       xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into 
> irq_info init functions
>       xen: events: maintain a list of Xen interrupts
>       xen: events: dynamically allocate irq info structures
>       xen: events: remove use of nr_irqs as upper bound on number of pirqs
>       xen: events: do not workaround too-small nr_irqs
>       xen: events: propagate irq allocation failure instead of panicking
>
> Keir Fraser (3):
>       xen: events: Clean up round-robin evtchn scan.
>       xen: events: Make round-robin scan fairer by snapshotting each l2 word 
> once only
>       xen: events: Remove redundant clear of l2i at end of round-robin loop
>
> Konrad Rzeszutek Wilk (16):
>       xen/irq: Don't fall over when nr_irqs_gsi > nr_irqs.
>       xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests 
> as well.
>       xen-pcifront: Sanity check the MSI/MSI-X values
>       pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq
>       pci/xen: Cleanup: convert int** to int[]
>       pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code.
>       xen: Mark all initial reserved pages for the balloon as 
> INVALID_P2M_ENTRY.
>       xen/mmu: Add the notion of identity (2-1) mapping.
>       xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN.
>       xen/mmu: WARN_ON when racing to swap middle leaf.
>       xen/setup: Set identity mapping for non-RAM E820 and E820 gaps.
>       xen/debugfs: Add 'p2m' file for printing out the P2M layout.
>       xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set.
>       xen/m2p: No need to catch exceptions when we know that there is no RAM
>       xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests 
> as well.
>       xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as 
> guest.
>
> Owen Smith (1):
>       xen: Union the blkif_request request specific fields
>
> Scott Rixner (1):
>       xen: events: Process event channels notifications in round-robin order.
>
> Stefano Stabellini (2):
>       xen: change xen/[gntdev/gntalloc] to default m
>       xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set..
>
> Tejun Heo (1):
>       xen-pcifront: don't use flush_scheduled_work()
>
> Thomas Gleixner (7):
>       genirq: Add IRQF_FORCE_RESUME
>       xen: Remove stale irq_chip.end
>       xen: Switch to new irq_chip functions
>       xen: Use IRQF_FORCE_RESUME
>       xen: Remove stale irq_chip.end
>       xen: Switch to new irq_chip functions
>       xen: Use IRQF_FORCE_RESUME
>
> Zhang, Fengzhe (1):
>       xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI 
> mem gaps.
>


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel