From patchwork Mon Sep 17 10:15:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10602347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 990BB1508 for ; Mon, 17 Sep 2018 10:17:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 829DF29724 for ; Mon, 17 Sep 2018 10:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7364D29735; Mon, 17 Sep 2018 10:17:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1BF529724 for ; Mon, 17 Sep 2018 10:17:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ACE48E0010; Mon, 17 Sep 2018 06:17:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 436FB8E0001; Mon, 17 Sep 2018 06:17:42 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D8D28E0010; Mon, 17 Sep 2018 06:17:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id DC9338E0001 for ; Mon, 17 Sep 2018 06:17:41 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id e15-v6so8392801pfi.5 for ; Mon, 17 Sep 2018 03:17:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:to:cc :from:date:message-id:mime-version:content-transfer-encoding; bh=Y/c/r9Dz5/r8ayElauOcMCMZoLZC1O60xw22cdo5tMA=; b=jaV6QEesB6eA7HiGmyhUMQQcsTnBFS1qZaXEuKS0HPxCdCG3VwCDa367ZVA+XIOYpJ vGjXys5AG4tAgCPw7pnSSio1jK9SBg3zNW5WjUBFLcBPj3A1LRqgRT5Pp2V+TAaavjyh TcCtgiLCJn/dM6hTvyJldmoNCD2ddzPIX2sUJ+0VeBlOW8qNAdek+fMxgMldCMndlwzw FaGn6zs2U0p0BGwQUM2U/WkaFD8+ZnWFvQFxWRUuOIRESX3zN+btM5nHuW4HIwdHolVA UiOrP2uixSZol+rXm8g4Y2PdVnd36rZfXJ1PpthPxP8ckN/RJc38SzfZCsQwr6GobdtC P1nA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Gm-Message-State: APzg51AePOKCywbX47594ANng9Ys1jhp9gp/jKAC/nAOFl3HN2z8xUWe 9PDxNCVahFXOtzkvgItCJv0NDTAadpwpk6Cf9e2B8JDXqTZidpdlSeyHidCkdpgaKwSlOZkb5Tq bKDzwJtrLfsHF6Plb6G2uEVzfj90Trk99M2bc00u7Tu4WJMrNYPTZCNP4N1XWID4McA== X-Received: by 2002:a17:902:274a:: with SMTP id j10-v6mr24511641plg.152.1537179461561; Mon, 17 Sep 2018 03:17:41 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaY2g6BYKl8Q5E6QBIhPxqB/Gl5U/R94+Tnra18+/ei2tHn8zRaqsogIKdLXVianjFejDJu X-Received: by 2002:a17:902:274a:: with SMTP id j10-v6mr24511578plg.152.1537179460620; Mon, 17 Sep 2018 03:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537179460; cv=none; d=google.com; s=arc-20160816; b=Hj4UwjxKjyTwc2UVBQs00UNX8p5lkocuTI5HNMp1WUBfnzOx+Do4PFY/YPq+D3osYa 89mn6DObbnRC08IKNBSUUYf1YgJDV0EELKKIQDR4jUtX1qIsdfiAph8UxUglZYrv3hE/ lcbs6BV57nZe3mHJor4bN/M/2CNCBNVdzX5wiqd/asT9kssVJR7drz66nUifUkGIDuLG qDAEYHZ4md34YS08UDbb0QSrP+/S/yqni3j7lSxKS6+wdgdxLk2f+zpX6lL0HoMWgzDO ciYn2AW80xDBjGq3D0r+SuhghyWLkKPppwmM8l5syOPq6i7RljFK6LrZqy3GCtXZxZkt tTXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:from:cc:to :subject; bh=Y/c/r9Dz5/r8ayElauOcMCMZoLZC1O60xw22cdo5tMA=; b=w3ksTLgy5TrBu1HvDt+tDyMrAz0kKGnQnJcGWiG7+k/M1y1lbna9/gpjJ4Sr52JKO/ F3G3vpTLOvDpRmolsOYGREsvMoiYaTKuHoijcbLM0F+aFxlOtder75uk2h21MQNB7qI3 Uw0hpM1mx9Y0GwSTQ+n2sLzblZ4Ca1L/cgnoxGj0qUYuVX14c8/AQKws4MviBnKAB3X7 K/DebR2CqwdQGhSqbfWXrFkzzl4Cyf1D+fszzVB0FjaoCTmNmW7c4pEMSweUEAlZnSgz Ze5UQAcD/R+3Gux2EY1kPRAy5rSIWf/Ebr8aY5b4GhTxrbCW6mx149BJq4/jc+nMIlcJ WWdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id l138-v6si16540014pfd.258.2018.09.17.03.17.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 03:17:40 -0700 (PDT) Received-SPF: pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 9546EBAF; Mon, 17 Sep 2018 10:17:39 +0000 (UTC) Subject: Patch "x86/kexec: Allocate 8k PGDs for PTI" has been added to the 4.4-stable tree To: 1532533683-5988-4-git-send-email-joro@8bytes.org,David.Laight@aculab.com,aarcange@redhat.com,acme@kernel.org,alexander.levin@microsoft.com,alexander.shishkin@linux.intel.com,aliguori@amazon.com,boris.ostrovsky@oracle.com,bp@alien8.de,brgerst@gmail.com,daniel.gruss@iaik.tugraz.at,dave.hansen@intel.com,dhgutteridge@sympatico.ca,dvlasenk@redhat.com,eduval@amazon.com,gregkh@linuxfoundation.org,hpa@zytor.com,hughd@google.com,jgross@suse.com,jkosina@suse.cz,jolsa@redhat.com,joro@8bytes.org,jpoimboe@redhat.com,jroedel@suse.de,keescook@google.com,linux-mm@kvack.org,llong@redhat.com,luto@kernel.org,namhyung@kernel.org,pavel@ucw.cz,peterz@infradead.org,tglx@linutronix.de,torvalds@linux-foundation.org,will.deacon@arm.com Cc: From: Date: Mon, 17 Sep 2018 12:15:38 +0200 Message-ID: <1537179338141229@kroah.com> MIME-Version: 1.0 X-stable: commit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This is a note to let you know that I've just added the patch titled x86/kexec: Allocate 8k PGDs for PTI to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-kexec-allocate-8k-pgds-for-pti.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From foo@baz Mon Sep 17 12:15:09 CEST 2018 From: Joerg Roedel Date: Wed, 25 Jul 2018 17:48:03 +0200 Subject: x86/kexec: Allocate 8k PGDs for PTI From: Joerg Roedel [ Upstream commit ca38dc8f2724d101038b1205122c93a1c7f38f11 ] Fuzzing the PTI-x86-32 code with trinity showed unhandled kernel paging request oops-messages that looked a lot like silent data corruption. Lot's of debugging and testing lead to the kexec-32bit code, which is still allocating 4k PGDs when PTI is enabled. But since it uses native_set_pud() to build the page-table, it will unevitably call into __pti_set_user_pgtbl(), which writes beyond the allocated 4k page. Use PGD_ALLOCATION_ORDER to allocate PGDs in the kexec code to fix the issue. Signed-off-by: Joerg Roedel Signed-off-by: Thomas Gleixner Tested-by: David H. Gutteridge Cc: "H . Peter Anvin" Cc: linux-mm@kvack.org Cc: Linus Torvalds Cc: Andy Lutomirski Cc: Dave Hansen Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Jiri Kosina Cc: Boris Ostrovsky Cc: Brian Gerst Cc: David Laight Cc: Denys Vlasenko Cc: Eduardo Valentin Cc: Greg KH Cc: Will Deacon Cc: aliguori@amazon.com Cc: daniel.gruss@iaik.tugraz.at Cc: hughd@google.com Cc: keescook@google.com Cc: Andrea Arcangeli Cc: Waiman Long Cc: Pavel Machek Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: joro@8bytes.org Link: https://lkml.kernel.org/r/1532533683-5988-4-git-send-email-joro@8bytes.org Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/machine_kexec_32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Patches currently in stable-queue which might be from jroedel@suse.de are queue-4.4/x86-kexec-allocate-8k-pgds-for-pti.patch queue-4.4/iommu-ipmmu-vmsa-fix-allocation-in-atomic-context.patch queue-4.4/x86-mm-remove-in_nmi-warning-from-vmalloc_fault.patch --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c @@ -70,7 +70,7 @@ static void load_segments(void) static void machine_kexec_free_page_tables(struct kimage *image) { - free_page((unsigned long)image->arch.pgd); + free_pages((unsigned long)image->arch.pgd, PGD_ALLOCATION_ORDER); image->arch.pgd = NULL; #ifdef CONFIG_X86_PAE free_page((unsigned long)image->arch.pmd0); @@ -86,7 +86,8 @@ static void machine_kexec_free_page_tabl static int machine_kexec_alloc_page_tables(struct kimage *image) { - image->arch.pgd = (pgd_t *)get_zeroed_page(GFP_KERNEL); + image->arch.pgd = (pgd_t *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, + PGD_ALLOCATION_ORDER); #ifdef CONFIG_X86_PAE image->arch.pmd0 = (pmd_t *)get_zeroed_page(GFP_KERNEL); image->arch.pmd1 = (pmd_t *)get_zeroed_page(GFP_KERNEL);