From patchwork Tue Apr 26 08:53:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 614838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3qvH2V21x0z9t5Y; Tue, 26 Apr 2016 18:54:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1auykt-0001qa-OH; Tue, 26 Apr 2016 08:54:03 +0000 Received: from mail-wm0-f49.google.com ([74.125.82.49]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1auyko-0001qP-TQ for kernel-team@lists.ubuntu.com; Tue, 26 Apr 2016 08:53:58 +0000 Received: by mail-wm0-f49.google.com with SMTP id u206so25386367wme.1 for ; Tue, 26 Apr 2016 01:53:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=I7sHc2+EpsZE5BEbKdMZF+MpzJkWj7Fs3d9QTEWx1vs=; b=kwpbjRqbjApBDz4sK78jp6v3csyBYw7Gv7Z+nFTZTsTSa9S7RtezaxfPYYv/NL/G4h Sup0fjr8U6bYdy8ExzcUALJb+5fshiQynWTVWp9CEOQT64/SXu3i/vbGAj8+VBKZ0HbO ezLwrJVPHHEGhFLjlNl7RAkJUcDgNRCtc8ky7Mgx75NrM5pIqVczbglQBcwyilyi3Z2z nfg2upiVQKoEXnT3QJ5dHGwvRXFSzJTkl+xp7lJpqZMb+rLFqxVm7y3B6WkMEx58TTwX zmH0cUF/qoSZwai+nfB02iVkr66mXvY0zPthnSZYSF8tkvTDHoajVfqGbMkCiP8UML8C CT1A== X-Gm-Message-State: AOPr4FVlD7jU/z+brL7wfLylVXe7pGfPUTrurEq6dTClGAph3yV8Go/nDahRZVrsK6lSbZKM X-Received: by 10.28.133.14 with SMTP id h14mr2275069wmd.100.1461660838087; Tue, 26 Apr 2016 01:53:58 -0700 (PDT) Received: from localhost ([2001:470:6973:2:567:dab4:2da:a095]) by smtp.gmail.com with ESMTPSA id y91sm2009009wmh.10.2016.04.26.01.53.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 01:53:57 -0700 (PDT) Date: Tue, 26 Apr 2016 09:53:56 +0100 From: Andy Whitcroft To: tim.gardner@canonical.com Subject: [Acked/cmt] [PATCH Xenial SRU] UBUNTU: [Config] CONFIG_VM86=y, CONFIG_X86_LEGACY_VM86=y Message-ID: <20160426085356.GB3463@brain> References: <1461596662-28696-1-git-send-email-tim.gardner@canonical.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1461596662-28696-1-git-send-email-tim.gardner@canonical.com> User-Agent: Mutt/1.5.24 (2015-08-30) Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com On Mon, Apr 25, 2016 at 09:04:22AM -0600, tim.gardner@canonical.com wrote: > From: Tim Gardner > > BugLink: http://bugs.launchpad.net/bugs/1499089 > > Signed-off-by: Tim Gardner > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/config.common.ubuntu | 3 +-- > debian.master/config/i386/config.common.i386 | 1 + > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 3f616c4..2f89bb5 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -446,6 +446,7 @@ CONFIG_UWB=m > CONFIG_VFIO_IOMMU_TYPE1=m > CONFIG_VGASTATE=m > CONFIG_VIRTIO_MMIO=y > +# CONFIG_VM86 is not set > CONFIG_VME_BUS=y > CONFIG_VMXNET3=m > CONFIG_VXFS_FS=m > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 505a3c7..b129731 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -8767,7 +8767,6 @@ CONFIG_VLAN_8021Q=m > CONFIG_VLAN_8021Q_GVRP=y > CONFIG_VLAN_8021Q_MVRP=y > CONFIG_VLSI_FIR=m > -# CONFIG_VM86 is not set > CONFIG_VMCP=y > CONFIG_VME_CA91CX42=m > CONFIG_VME_PIO2=m > @@ -8935,7 +8934,7 @@ CONFIG_X86_INTEL_USERCOPY=y > CONFIG_X86_INTERNODE_CACHE_SHIFT=6 > CONFIG_X86_IO_APIC=y > CONFIG_X86_L1_CACHE_SHIFT=6 > -# CONFIG_X86_LEGACY_VM86 is not set > +CONFIG_X86_LEGACY_VM86=y > CONFIG_X86_LOCAL_APIC=y > CONFIG_X86_LONGHAUL=m > CONFIG_X86_LONGRUN=m > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index d749ac9..df5d5f8 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -441,6 +441,7 @@ CONFIG_UWB=m > CONFIG_VFIO_IOMMU_TYPE1=m > CONFIG_VGASTATE=m > CONFIG_VIRTIO_MMIO=y > +CONFIG_VM86=y > CONFIG_VME_BUS=y > CONFIG_VMXNET3=m > CONFIG_VXFS_FS=m Yes, this was on for Wily and seems to have been lost for Xenial. The reasoning is still sound, it cannot be used without changing a sysctl explicity to allow access to page 0 therefore is low risk, and has vocal users. Acked-by: Andy Whitcroft We do want to update the annotations to match so we need to squash in the fragment below on application. -apw diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 3d4a064..8e3dfaa 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -9539,7 +9539,7 @@ CONFIG_GART_IOMMU policy<{'amd64': 'y'}> CONFIG_CALGARY_IOMMU policy<{'amd64': 'y'}> CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT policy<{'amd64': 'y'}> CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS policy<{'amd64': 'y', 'i386': 'y'}> -CONFIG_X86_LEGACY_VM86 policy<{'i386': 'n'}> +CONFIG_X86_LEGACY_VM86 policy<{'i386': 'y'}> CONFIG_X86_16BIT policy<{'amd64': 'y', 'i386': 'y'}> CONFIG_X86_VSYSCALL_EMULATION policy<{'amd64': 'y'}> CONFIG_TOSHIBA policy<{'i386': 'n'}> @@ -9573,7 +9573,7 @@ CONFIG_COMPAT_VDSO policy<{'amd64': 'n', 'i386': 'n CONFIG_MODIFY_LDT_SYSCALL policy<{'amd64': 'y', 'i386': 'y'}> # CONFIG_COMPAT_VDSO mark -CONFIG_X86_LEGACY_VM86 flag note +CONFIG_X86_LEGACY_VM86 note CONFIG_KEXEC_BZIMAGE_VERIFY_SIG flag note CONFIG_MODIFY_LDT_SYSCALL flag note