| Message ID | 1310567861-13700-3-git-send-email-stefan.bader@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 07/13/2011 07:37 AM, Stefan Bader wrote: > From 6c910a6e597df10a591af566e4fb0f5e544d8312 Mon Sep 17 00:00:00 2001 > From: Stefan Bader<stefan.bader@canonical.com> > Date: Wed, 13 Jul 2011 15:00:46 +0200 > Subject: [PATCH] UBUNTU: SAUCE: Re-enable RODATA for i386 virtual > > This basically reverts the following commit as it seems now fixed. > > commit 0b111980fe515c5ab24bf21aca5aebd24c70f605 > Author: Stefan Bader<stefan.bader@canonical.com> > Date: Tue Jan 11 23:29:25 2011 +0000 > > UBUNTU: Temporarily disable RODATA for virtual i386 > > Setting to RO was ok, but the whole patchset seems to cause > i386 EC instances to panic on boot when setting the kernel data > to read-only and no-execute. So while there is no proper fix > found disable this in the i386 virtual flavour > > BugLink: http://bugs.launchpad.net/bugs/809838 > > Signed-off-by: Stefan Bader<stefan.bader@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 - > debian.master/config/armel/config.common.armel | 1 - > debian.master/config/config.common.ubuntu | 1 + > debian.master/config/enforce | 3 +-- > debian.master/config/i386/config.flavour.generic | 1 - > .../config/i386/config.flavour.generic-pae | 1 - > debian.master/config/i386/config.flavour.virtual | 1 - > debian.master/config/powerpc/config.common.powerpc | 1 - > 8 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index ef7e7df..eea6ca9 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -55,7 +55,6 @@ CONFIG_CRYPTO_SEQIV=m > CONFIG_DAB=y > CONFIG_DAVICOM_PHY=y > CONFIG_DEBUG_INFO=y > -CONFIG_DEBUG_RODATA=y > CONFIG_DISPLAY_SUPPORT=m > # CONFIG_DL2K is not set > CONFIG_DM_MIRROR=y > diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel > index 6bcf617..9f7e05f 100644 > --- a/debian.master/config/armel/config.common.armel > +++ b/debian.master/config/armel/config.common.armel > @@ -48,7 +48,6 @@ CONFIG_CRYPTO_SEQIV=m > CONFIG_DAB=y > CONFIG_DAVICOM_PHY=y > CONFIG_DEBUG_INFO=y > -CONFIG_DEBUG_RODATA=y > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_DEADLINE is not set > CONFIG_DEFAULT_IOSCHED="cfq" > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 671614b..d2cbee3 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1111,6 +1111,7 @@ CONFIG_DEBUG_MEMORY_INIT=y > # CONFIG_DEBUG_PAGEALLOC is not set > # CONFIG_DEBUG_PERF_USE_VMALLOC is not set > # CONFIG_DEBUG_PER_CPU_MAPS is not set > +CONFIG_DEBUG_RODATA=y > # CONFIG_DEBUG_RODATA_TEST is not set > # CONFIG_DEBUG_RT_MUTEXES is not set > # CONFIG_DEBUG_SECTION_MISMATCH is not set > diff --git a/debian.master/config/enforce b/debian.master/config/enforce > index e0411b9..67847e4 100644 > --- a/debian.master/config/enforce > +++ b/debian.master/config/enforce > @@ -15,8 +15,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y > # For architectures which support this option ensure it is enabled. > !exists CONFIG_SECCOMP | value CONFIG_SECCOMP y > !exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y > -!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y | \ > - (flavour virtual& arch i386& value CONFIG_DEBUG_RODATA n) > +!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y > !exists CONFIG_DEBUG_SET_MODULE_RONX | value CONFIG_DEBUG_SET_MODULE_RONX y > !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y > # For architectures which support this option ensure it is disabled. > diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic > index 0fccf04..8f1f93e 100644 > --- a/debian.master/config/i386/config.flavour.generic > +++ b/debian.master/config/i386/config.flavour.generic > @@ -3,7 +3,6 @@ > # > # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set > # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set > -CONFIG_DEBUG_RODATA=y > CONFIG_HIGHMEM4G=y > # CONFIG_HIGHMEM64G is not set > CONFIG_I2C_PXA_PCI=y > diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae > index 1cc1fa0..cff8c2a 100644 > --- a/debian.master/config/i386/config.flavour.generic-pae > +++ b/debian.master/config/i386/config.flavour.generic-pae > @@ -3,7 +3,6 @@ > # > CONFIG_ARCH_DMA_ADDR_T_64BIT=y > CONFIG_ARCH_PHYS_ADDR_T_64BIT=y > -CONFIG_DEBUG_RODATA=y > # CONFIG_HIGHMEM4G is not set > CONFIG_HIGHMEM64G=y > # CONFIG_I2C_PXA_PCI is not set > diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual > index 76767d6..54e78a3 100644 > --- a/debian.master/config/i386/config.flavour.virtual > +++ b/debian.master/config/i386/config.flavour.virtual > @@ -3,7 +3,6 @@ > # > CONFIG_ARCH_DMA_ADDR_T_64BIT=y > CONFIG_ARCH_PHYS_ADDR_T_64BIT=y > -# CONFIG_DEBUG_RODATA is not set > # CONFIG_HIGHMEM4G is not set > CONFIG_HIGHMEM64G=y > # CONFIG_I2C_PXA_PCI is not set > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 10cb125..dec42e8 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -45,7 +45,6 @@ CONFIG_CRYPTO_HMAC=y > # CONFIG_DAB is not set > CONFIG_DAVICOM_PHY=m > # CONFIG_DEBUG_INFO is not set > -CONFIG_DEBUG_RODATA=y > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_DEADLINE is not set > CONFIG_DEFAULT_IOSCHED="cfq" Acked-by: Brad Figg <brad.figg@canonical.com>
On Wed, Jul 13, 2011 at 04:37:41PM +0200, Stefan Bader wrote: > From 6c910a6e597df10a591af566e4fb0f5e544d8312 Mon Sep 17 00:00:00 2001 > From: Stefan Bader <stefan.bader@canonical.com> > Date: Wed, 13 Jul 2011 15:00:46 +0200 > Subject: [PATCH] UBUNTU: SAUCE: Re-enable RODATA for i386 virtual > > This basically reverts the following commit as it seems now fixed. > > commit 0b111980fe515c5ab24bf21aca5aebd24c70f605 > Author: Stefan Bader <stefan.bader@canonical.com> > Date: Tue Jan 11 23:29:25 2011 +0000 > > UBUNTU: Temporarily disable RODATA for virtual i386 > > Setting to RO was ok, but the whole patchset seems to cause > i386 EC instances to panic on boot when setting the kernel data > to read-only and no-execute. So while there is no proper fix > found disable this in the i386 virtual flavour > > BugLink: http://bugs.launchpad.net/bugs/809838 > > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 - > debian.master/config/armel/config.common.armel | 1 - > debian.master/config/config.common.ubuntu | 1 + > debian.master/config/enforce | 3 +-- > debian.master/config/i386/config.flavour.generic | 1 - > .../config/i386/config.flavour.generic-pae | 1 - > debian.master/config/i386/config.flavour.virtual | 1 - > debian.master/config/powerpc/config.common.powerpc | 1 - > 8 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index ef7e7df..eea6ca9 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -55,7 +55,6 @@ CONFIG_CRYPTO_SEQIV=m > CONFIG_DAB=y > CONFIG_DAVICOM_PHY=y > CONFIG_DEBUG_INFO=y > -CONFIG_DEBUG_RODATA=y > CONFIG_DISPLAY_SUPPORT=m > # CONFIG_DL2K is not set > CONFIG_DM_MIRROR=y > diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel > index 6bcf617..9f7e05f 100644 > --- a/debian.master/config/armel/config.common.armel > +++ b/debian.master/config/armel/config.common.armel > @@ -48,7 +48,6 @@ CONFIG_CRYPTO_SEQIV=m > CONFIG_DAB=y > CONFIG_DAVICOM_PHY=y > CONFIG_DEBUG_INFO=y > -CONFIG_DEBUG_RODATA=y > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_DEADLINE is not set > CONFIG_DEFAULT_IOSCHED="cfq" > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 671614b..d2cbee3 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1111,6 +1111,7 @@ CONFIG_DEBUG_MEMORY_INIT=y > # CONFIG_DEBUG_PAGEALLOC is not set > # CONFIG_DEBUG_PERF_USE_VMALLOC is not set > # CONFIG_DEBUG_PER_CPU_MAPS is not set > +CONFIG_DEBUG_RODATA=y > # CONFIG_DEBUG_RODATA_TEST is not set > # CONFIG_DEBUG_RT_MUTEXES is not set > # CONFIG_DEBUG_SECTION_MISMATCH is not set > diff --git a/debian.master/config/enforce b/debian.master/config/enforce > index e0411b9..67847e4 100644 > --- a/debian.master/config/enforce > +++ b/debian.master/config/enforce > @@ -15,8 +15,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y > # For architectures which support this option ensure it is enabled. > !exists CONFIG_SECCOMP | value CONFIG_SECCOMP y > !exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y > -!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y | \ > - (flavour virtual & arch i386 & value CONFIG_DEBUG_RODATA n) > +!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y > !exists CONFIG_DEBUG_SET_MODULE_RONX | value CONFIG_DEBUG_SET_MODULE_RONX y > !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y > # For architectures which support this option ensure it is disabled. > diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic > index 0fccf04..8f1f93e 100644 > --- a/debian.master/config/i386/config.flavour.generic > +++ b/debian.master/config/i386/config.flavour.generic > @@ -3,7 +3,6 @@ > # > # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set > # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set > -CONFIG_DEBUG_RODATA=y > CONFIG_HIGHMEM4G=y > # CONFIG_HIGHMEM64G is not set > CONFIG_I2C_PXA_PCI=y > diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae > index 1cc1fa0..cff8c2a 100644 > --- a/debian.master/config/i386/config.flavour.generic-pae > +++ b/debian.master/config/i386/config.flavour.generic-pae > @@ -3,7 +3,6 @@ > # > CONFIG_ARCH_DMA_ADDR_T_64BIT=y > CONFIG_ARCH_PHYS_ADDR_T_64BIT=y > -CONFIG_DEBUG_RODATA=y > # CONFIG_HIGHMEM4G is not set > CONFIG_HIGHMEM64G=y > # CONFIG_I2C_PXA_PCI is not set > diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual > index 76767d6..54e78a3 100644 > --- a/debian.master/config/i386/config.flavour.virtual > +++ b/debian.master/config/i386/config.flavour.virtual > @@ -3,7 +3,6 @@ > # > CONFIG_ARCH_DMA_ADDR_T_64BIT=y > CONFIG_ARCH_PHYS_ADDR_T_64BIT=y > -# CONFIG_DEBUG_RODATA is not set > # CONFIG_HIGHMEM4G is not set > CONFIG_HIGHMEM64G=y > # CONFIG_I2C_PXA_PCI is not set > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 10cb125..dec42e8 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -45,7 +45,6 @@ CONFIG_CRYPTO_HMAC=y > # CONFIG_DAB is not set > CONFIG_DAVICOM_PHY=m > # CONFIG_DEBUG_INFO is not set > -CONFIG_DEBUG_RODATA=y > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_DEADLINE is not set > CONFIG_DEFAULT_IOSCHED="cfq" > -- > 1.7.4.1 Acked-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Applied and pushed to master-next
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ef7e7df..eea6ca9 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -55,7 +55,6 @@ CONFIG_CRYPTO_SEQIV=m CONFIG_DAB=y CONFIG_DAVICOM_PHY=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_RODATA=y CONFIG_DISPLAY_SUPPORT=m # CONFIG_DL2K is not set CONFIG_DM_MIRROR=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 6bcf617..9f7e05f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -48,7 +48,6 @@ CONFIG_CRYPTO_SEQIV=m CONFIG_DAB=y CONFIG_DAVICOM_PHY=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_RODATA=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 671614b..d2cbee3 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1111,6 +1111,7 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set diff --git a/debian.master/config/enforce b/debian.master/config/enforce index e0411b9..67847e4 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -15,8 +15,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y # For architectures which support this option ensure it is enabled. !exists CONFIG_SECCOMP | value CONFIG_SECCOMP y !exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y -!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y | \ - (flavour virtual & arch i386 & value CONFIG_DEBUG_RODATA n) +!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y !exists CONFIG_DEBUG_SET_MODULE_RONX | value CONFIG_DEBUG_SET_MODULE_RONX y !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y # For architectures which support this option ensure it is disabled. diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic index 0fccf04..8f1f93e 100644 --- a/debian.master/config/i386/config.flavour.generic +++ b/debian.master/config/i386/config.flavour.generic @@ -3,7 +3,6 @@ # # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_DEBUG_RODATA=y CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_I2C_PXA_PCI=y diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae index 1cc1fa0..cff8c2a 100644 --- a/debian.master/config/i386/config.flavour.generic-pae +++ b/debian.master/config/i386/config.flavour.generic-pae @@ -3,7 +3,6 @@ # CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_DEBUG_RODATA=y # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y # CONFIG_I2C_PXA_PCI is not set diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual index 76767d6..54e78a3 100644 --- a/debian.master/config/i386/config.flavour.virtual +++ b/debian.master/config/i386/config.flavour.virtual @@ -3,7 +3,6 @@ # CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -# CONFIG_DEBUG_RODATA is not set # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y # CONFIG_I2C_PXA_PCI is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 10cb125..dec42e8 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -45,7 +45,6 @@ CONFIG_CRYPTO_HMAC=y # CONFIG_DAB is not set CONFIG_DAVICOM_PHY=m # CONFIG_DEBUG_INFO is not set -CONFIG_DEBUG_RODATA=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq"