diff mbox

[Maverick,pull,request] Xen pv-ops for EC2

Message ID 4C5305B4.7040500@canonical.com
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Tim Gardner July 30, 2010, 5:02 p.m. UTC 
On 07/30/2010 08:23 AM, John Johansen wrote:
> The following request pull enables -virtual kernel to function as a pv-ops
> kernel on EC2.  This does not include the pv-on-HVM drivers which are required
> for Amazon's Compute Cloud, will be in a separate request.
>
> The following changes since commit 8f2ff69dce18ed856a8d1b93176f768b47eeed86:
>
>    UBUNTU: SAUCE: drm -- stop early access to drm devices (2010-07-29 11:41:40 -0700)
>
> are available in the git repository at:
>    git://kernel.ubuntu.com/jj/ubuntu-maverick.git pvops
>
> John Johansen (3):
>        UBUNTU: SAUCE: fix pv-ops for legacy Xen
>        UBUNTU: SAUCE: blkfront: default to sd devices
>        UBUNTU: [Config] Build in drivers required for Xen pv-ops
>
>   arch/x86/xen/enlighten.c                           |    1 +
>   .../abi/2.6.35-12.17/amd64/virtual.modules         |    2 --
>   .../abi/2.6.35-12.17/i386/virtual.modules          |    2 --
>   debian.master/config/amd64/config.flavour.generic  |    2 ++
>   debian.master/config/amd64/config.flavour.server   |    2 ++
>   debian.master/config/amd64/config.flavour.virtual  |    2 ++
>   debian.master/config/armel/config.common.armel     |    2 ++
>   debian.master/config/config.common.ubuntu          |    2 --
>   debian.master/config/i386/config.flavour.generic   |    2 ++
>   .../config/i386/config.flavour.generic-pae         |    2 ++
>   debian.master/config/i386/config.flavour.virtual   |    2 ++
>   drivers/block/xen-blkfront.c                       |    2 +-
>   12 files changed, 16 insertions(+), 7 deletions(-)
>

A couple of minor commit log edits, and a rerun of updateconfigs after 
changing the Xen config options.

rtg

Comments

Leann Ogasawara July 31, 2010, 12:29 a.m. UTC | #1 
Applied to Maverick linux master.

Thanks,
Leann

On Fri, 2010-07-30 at 11:02 -0600, Tim Gardner wrote:
> On 07/30/2010 08:23 AM, John Johansen wrote:
> > The following request pull enables -virtual kernel to function as a pv-ops
> > kernel on EC2.  This does not include the pv-on-HVM drivers which are required
> > for Amazon's Compute Cloud, will be in a separate request.
> >
> > The following changes since commit 8f2ff69dce18ed856a8d1b93176f768b47eeed86:
> >
> >    UBUNTU: SAUCE: drm -- stop early access to drm devices (2010-07-29 11:41:40 -0700)
> >
> > are available in the git repository at:
> >    git://kernel.ubuntu.com/jj/ubuntu-maverick.git pvops
> >
> > John Johansen (3):
> >        UBUNTU: SAUCE: fix pv-ops for legacy Xen
> >        UBUNTU: SAUCE: blkfront: default to sd devices
> >        UBUNTU: [Config] Build in drivers required for Xen pv-ops
> >
> >   arch/x86/xen/enlighten.c                           |    1 +
> >   .../abi/2.6.35-12.17/amd64/virtual.modules         |    2 --
> >   .../abi/2.6.35-12.17/i386/virtual.modules          |    2 --
> >   debian.master/config/amd64/config.flavour.generic  |    2 ++
> >   debian.master/config/amd64/config.flavour.server   |    2 ++
> >   debian.master/config/amd64/config.flavour.virtual  |    2 ++
> >   debian.master/config/armel/config.common.armel     |    2 ++
> >   debian.master/config/config.common.ubuntu          |    2 --
> >   debian.master/config/i386/config.flavour.generic   |    2 ++
> >   .../config/i386/config.flavour.generic-pae         |    2 ++
> >   debian.master/config/i386/config.flavour.virtual   |    2 ++
> >   drivers/block/xen-blkfront.c                       |    2 +-
> >   12 files changed, 16 insertions(+), 7 deletions(-)
> >
> 
> A couple of minor commit log edits, and a rerun of updateconfigs after 
> changing the Xen config options.
> 
> rtg
diff mbox

Patch

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 1ea06f8..f7ff4c7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -794,6 +794,7 @@  static void xen_write_cr4(unsigned long cr4)
 {
 	cr4 &= ~X86_CR4_PGE;
 	cr4 &= ~X86_CR4_PSE;
+	cr4 &= ~X86_CR4_OSXSAVE;
 
 	native_write_cr4(cr4);
 }
-- 
1.7.0.4


From e4abd74d96f7a74bb74b47354b6d6434894778bb Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Wed, 28 Jul 2010 11:44:04 -0700
Subject: [PATCH 2/3] UBUNTU: SAUCE: blkfront: default to sd devices

EC2 defaults to "/dev/sda" rather than "/dev/xvd". Once they finally
switch then this patch should be dropped.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/block/xen-blkfront.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 82ed403..cda9b5a 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -119,7 +119,7 @@  static DEFINE_SPINLOCK(blkif_io_lock);
 #define VDEV_IS_EXTENDED(dev) ((dev)&(EXTENDED))
 #define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED))
 
-#define DEV_NAME	"xvd"	/* name in /dev */
+#define DEV_NAME	"sd"	/* name in /dev */
 
 static int get_id_from_freelist(struct blkfront_info *info)
 {
-- 
1.7.0.4


From 10f627556319f67875502f3e3ffd8463f1b94427 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Fri, 30 Jul 2010 03:29:31 -0700
Subject: [PATCH 3/3] UBUNTU: [Config] Build in drivers required for Xen pv-ops

Build in the Xen drivers so that we don't require a ramdisk on EC2
instance store images.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 .../abi/2.6.35-12.17/amd64/virtual.modules         |    2 --
 .../abi/2.6.35-12.17/i386/virtual.modules          |    2 --
 debian.master/config/amd64/config.flavour.generic  |    2 ++
 debian.master/config/amd64/config.flavour.server   |    2 ++
 debian.master/config/amd64/config.flavour.virtual  |    2 ++
 debian.master/config/armel/config.common.armel     |    2 ++
 debian.master/config/config.common.ubuntu          |    2 --
 .../config/i386/config.flavour.generic-pae         |    2 ++
 debian.master/config/i386/config.flavour.virtual   |    2 ++
 9 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian.master/abi/2.6.35-12.17/amd64/virtual.modules b/debian.master/abi/2.6.35-12.17/amd64/virtual.modules
index 37b8980..ff1393a 100644
--- a/debian.master/abi/2.6.35-12.17/amd64/virtual.modules
+++ b/debian.master/abi/2.6.35-12.17/amd64/virtual.modules
@@ -422,11 +422,9 @@  wanrouter
 wp512
 x25
 xcbc
-xen-blkfront
 xen-fbfront
 xenfs
 xen-kbdfront
-xen-netfront
 xfrm4_mode_beet
 xfrm4_mode_transport
 xfrm4_mode_tunnel
diff --git a/debian.master/abi/2.6.35-12.17/i386/virtual.modules b/debian.master/abi/2.6.35-12.17/i386/virtual.modules
index f4fc5a8..5b49085 100644
--- a/debian.master/abi/2.6.35-12.17/i386/virtual.modules
+++ b/debian.master/abi/2.6.35-12.17/i386/virtual.modules
@@ -420,11 +420,9 @@  wanrouter
 wp512
 x25
 xcbc
-xen-blkfront
 xen-fbfront
 xenfs
 xen-kbdfront
-xen-netfront
 xfrm4_mode_beet
 xfrm4_mode_transport
 xfrm4_mode_tunnel
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index 1dae2db..e25d3d6 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -14,3 +14,5 @@  CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index d9bd9be..43c6c71 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -14,3 +14,5 @@  CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
index 442a3b1..54164a3 100644
--- a/debian.master/config/amd64/config.flavour.virtual
+++ b/debian.master/config/amd64/config.flavour.virtual
@@ -14,3 +14,5 @@  CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 4147c7b..0f0e053 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -127,4 +127,6 @@  CONFIG_VIRTIO_RING=m
 # CONFIG_WM8350_WATCHDOG is not set
 # CONFIG_X25_ASY is not set
 # CONFIG_X86_X2APIC is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3127524..804967a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5006,14 +5006,12 @@  CONFIG_X86_XADD=y
 CONFIG_XEN=y
 CONFIG_XENFS=m
 CONFIG_XEN_BALLOON=y
-CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_COMPAT_XENFS=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=32
-CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index d227cdc..d14011f 100644
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -13,3 +13,5 @@  CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
index b006b26..327b2f2 100644
--- a/debian.master/config/i386/config.flavour.virtual
+++ b/debian.master/config/i386/config.flavour.virtual
@@ -13,3 +13,5 @@  CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_RING=y
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=y