From patchwork Mon Sep 17 09:46:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10602297 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 09671157B for ; Mon, 17 Sep 2018 09:48:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E767929273 for ; Mon, 17 Sep 2018 09:48:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D76272927B; Mon, 17 Sep 2018 09:48:23 +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 6040229273 for ; Mon, 17 Sep 2018 09:48:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E1BC8E000C; Mon, 17 Sep 2018 05:48:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8B8E88E0001; Mon, 17 Sep 2018 05:48:21 -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 781B48E000C; Mon, 17 Sep 2018 05:48:21 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 38E698E0001 for ; Mon, 17 Sep 2018 05:48:21 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id d132-v6so6159735pgc.22 for ; Mon, 17 Sep 2018 02:48:21 -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=LlpJPyjKOOhPa5WkwABPEWkUP2T0i+V6gnoMzDtR2xg=; b=nGjKaHTRM73EVYLr5qsNI8pnqzvNX0DXhds8ylXZ9w2wzb4RYyNqTJ2OAqpaHKmfCY Rc1kkGnn8/Kyh53p+hBp9HCYh+QBq6UT/9XC88ceXr3aF/lH3LUoYqIw7cWI82xMGzWY 7pzkJnob4ZUsGWrNO2NaPkZKW3zfayG4/SuWqhXTHI1GekEJtzfqaixw9ein38sOFT3b dUD38wXj5n69U4ut0p/WJ0O+IyZ+pAy+i4AVRWSkCKEx0ghGoB+wbd13k+mEkiVA2EvU iZTQLWEsdB9idw6H90Nw/2Ju4VsVzDqQz+ZXUqCgOeb6Jn2fO+UxOdgL9cJBlhzaRbe+ PFSA== 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: APzg51CUGM9/lTACI8ix8OU+VDyClq3gNKy+LTY7A/8/MyHnUIYVyLME 0tqV99DYDKnizBagSH8iSQWrn+gqCUX2/VTA+RcxtsKI45AL/Gc9RfgOh7N+PjA3zZdHEI0n7jx 29wib5VhxKvSHjO4Z6kDXfHPPV2h1gryTBwrtmV+cmFj0bN4QbXll2t38YTz1Ffz7uw== X-Received: by 2002:a63:6d4f:: with SMTP id i76-v6mr22498891pgc.215.1537177700895; Mon, 17 Sep 2018 02:48:20 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZjQG1pDxYczHygxaa1EjHIPEKJflMgcwxXVqe+ygrsrrmjjxFVCh8gFC99xO7tX3NiF2L7 X-Received: by 2002:a63:6d4f:: with SMTP id i76-v6mr22498837pgc.215.1537177699832; Mon, 17 Sep 2018 02:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537177699; cv=none; d=google.com; s=arc-20160816; b=vk999o03pYf0RtOqkqbOy5g+djkr9Acwtmr71dqvmDwdimVIXy7RmnaEzGS8ASRcMS Qb/4qkBhpya8pKszY4uc2/IaKUwpb4dX47RIJ1gDH70it3y8n91Q39gA5l6LNA5s37wL 8tMAisqP8Gjngs/UC44Yp8mnYL3qIraonJAhzVbHbHuALB6gpkHWeWskLhlrg3TOewyS SktrwmX1BtLbCndDWhY/u1kPl1DV85ddZNg29khRXsFHj21Q8myxCDGUdAiETr5NY3+i 2cCNSRu23jKl33kmlT6ChlD+ZFa6ademj5Tpdlr55tVfPw7R4fl76Xj9g2weIusG/ggj P5wg== 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=LlpJPyjKOOhPa5WkwABPEWkUP2T0i+V6gnoMzDtR2xg=; b=r8CyJ/ROAzYOkB3zIxcLJ14/ogCNd9gDb3TaL0aioBLmJxtbtNhjrTBQrCVk9tQ/vR O1pzpQWRo/p65T8SCUeYutCPYiXPkNj1a0Lbl8/FWTwlVLXyCmxZvttgPoHfwJhuoL7w DE9ck5duxZa2QtWyhZ1Z55xK66VhN68daonjXGspG7w2S1SIujd7JwurKLsI1kJ+NZ7K kaKd/Oz0ER8dpEMDOhBfmQQPAK0nPmq1FKCfvJftnaWpjv4bGhUt5NK1fm/KxuajCcUU TDfBMbI0twkP3Rf+oropSrzvcK0GhB2lyjg3P4CqY4r+PwtSX26rQgDwyiJfEEyBqnnl PZ3g== 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 z21-v6si13332164pgu.163.2018.09.17.02.48.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 02:48:19 -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 AD30BBAE; Mon, 17 Sep 2018 09:48:18 +0000 (UTC) Subject: Patch "x86/kexec: Allocate 8k PGDs for PTI" has been added to the 3.18-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 11:46:57 +0200 Message-ID: <1537177617126129@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 3.18-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-3.18 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 11:45:57 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-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch queue-3.18/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 @@ -69,7 +69,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); @@ -85,7 +85,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);