From patchwork Tue Apr 26 19:54:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 8944071 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0DB679F441 for ; Tue, 26 Apr 2016 19:59:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A57A3201EC for ; Tue, 26 Apr 2016 19:58:53 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A38B2014A for ; Tue, 26 Apr 2016 19:58:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1av95a-0001O1-Db; Tue, 26 Apr 2016 19:56:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1av95Z-0001Nv-5L for xen-devel@lists.xenproject.org; Tue, 26 Apr 2016 19:56:05 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 00/61-03443-4D7CF175; Tue, 26 Apr 2016 19:56:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRWlGSWpSXmKPExsUSvTeyQPfycfl wg+PblS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1owry10L/kpVTJx8hLGB8bx4FyMXh5DAD0aJ a6desHUxcgI5kxgltvwSBLHZBDQlXu/bwAhiiwgoS/T++s0C0sAs0MomMWHvMSaQhLBAmcTBE wfAbBYBVYmlix+DDeIVcJL4tfk3WLOEgJzEzXOdzBC2uMS0hktMExi5FjAyrGJUL04tKkst0r XUSyrKTM8oyU3MzNE1NDDWy00tLk5MT81JTCrWS87P3cQI9GI9AwPjDsbXP50OMUpyMCmJ8sa ukw8X4kvKT6nMSCzOiC8qzUktPsQow8GhJMG75hhQTrAoNT21Ii0zBxhOMGkJDh4lEV4XkDRv cUFibnFmOkTqFKOilDjvWZCEAEgiozQPrg0WwpcYZaWEeRkZGBiEeApSi3IzS1DlXzGKczAqC fMeB5nCk5lXAjf9FdBiJqDFlw/JgiwuSURISTUw+qusut138L+5laz1YuXCI98veF6w6G/8zl 19KmBORMuDkBeKx7oCdv3kexeq+8X3/RzJecENe5SKV/VfauPbuvb1C7NS/Yq0qombHHVvlay atGVmV5hT8kvNuuS3Avttln94Js9z8jy34pnyDRtsGgycRWpWrUmSz68TfKBqs3fmum8KrMxB SizFGYmGWsxFxYkADCYNaFwCAAA= X-Env-Sender: kamal@canonical.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1461700563!10808176!1 X-Originating-IP: [91.189.89.112] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43813 invoked from network); 26 Apr 2016 19:56:03 -0000 Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Apr 2016 19:56:03 -0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1av949-0008FY-7W; Tue, 26 Apr 2016 19:54:37 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1av946-0001PE-HL; Tue, 26 Apr 2016 12:54:34 -0700 From: Kamal Mostafa To: Jan Beulich Date: Tue, 26 Apr 2016 12:54:33 -0700 Message-Id: <1461700473-5369-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 X-Extended-Stable: 3.19 Cc: Juergen Gross , Denys Vlasenko , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Brian Gerst , "Luis R . Rodriguez" , Ingo Molnar , Kamal Mostafa , Andy Lutomirski , xen-devel , kernel-team@lists.ubuntu.com, Borislav Petkov , David Vrabel , Jan Beulich , "H . Peter Anvin" , Toshi Kani , Boris Ostrovsky , Linus Torvalds , Vitaly Kuznetsov Subject: [Xen-devel] [3.19.y-ckt stable] Patch "x86/mm/xen: Suppress hugetlbfs in PV guests" has been added to the 3.19.y-ckt tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a note to let you know that I have just added a patch titled x86/mm/xen: Suppress hugetlbfs in PV guests to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue This patch is scheduled to be released in version 3.19.8-ckt20. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.19.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ---8<------------------------------------------------------------ From d34f71f0ba7a50c24907c38797f54bc303b4ca44 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 21 Apr 2016 00:27:04 -0600 Subject: x86/mm/xen: Suppress hugetlbfs in PV guests commit 103f6112f253017d7062cd74d17f4a514ed4485c upstream. Huge pages are not normally available to PV guests. Not suppressing hugetlbfs use results in an endless loop of page faults when user mode code tries to access a hugetlbfs mapped area (since the hypervisor denies such PTEs to be created, but error indications can't be propagated out of xen_set_pte_at(), just like for various of its siblings), and - once killed in an oops like this: kernel BUG at .../fs/hugetlbfs/inode.c:428! invalid opcode: 0000 [#1] SMP ... RIP: e030:[] [] remove_inode_hugepages+0x25b/0x320 ... Call Trace: [] hugetlbfs_evict_inode+0x15/0x40 [] evict+0xbd/0x1b0 [] __dentry_kill+0x19a/0x1f0 [] dput+0x1fe/0x220 [] __fput+0x155/0x200 [] task_work_run+0x60/0xa0 [] do_exit+0x160/0x400 [] do_group_exit+0x3b/0xa0 [] get_signal+0x1ed/0x470 [] do_signal+0x14/0x110 [] prepare_exit_to_usermode+0xe9/0xf0 [] retint_user+0x8/0x13 This is CVE-2016-3961 / XSA-174. Reported-by: Vitaly Kuznetsov Signed-off-by: Jan Beulich Cc: Andrew Morton Cc: Andy Lutomirski Cc: Boris Ostrovsky Cc: Borislav Petkov Cc: Brian Gerst Cc: David Vrabel Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Juergen Gross Cc: Linus Torvalds Cc: Luis R. Rodriguez Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Toshi Kani Cc: xen-devel Link: http://lkml.kernel.org/r/57188ED802000078000E431C@prv-mh.provo.novell.com Signed-off-by: Ingo Molnar Signed-off-by: Kamal Mostafa --- arch/x86/include/asm/hugetlb.h | 1 + 1 file changed, 1 insertion(+) -- 2.7.4 diff --git a/arch/x86/include/asm/hugetlb.h b/arch/x86/include/asm/hugetlb.h index 68c0539..7aadd3c 100644 --- a/arch/x86/include/asm/hugetlb.h +++ b/arch/x86/include/asm/hugetlb.h @@ -4,6 +4,7 @@ #include #include +#define hugepages_supported() cpu_has_pse static inline int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,