Received: by 10.223.185.116 with SMTP id b49csp2372635wrg; Thu, 22 Feb 2018 12:39:19 -0800 (PST) X-Google-Smtp-Source: AH8x225uqRhxxMkbkpywj/zC7bjXUmpZjb1pfKqJD0N5HhcdH1UhhSShTcd2A0AFU5+E9KpSLVJk X-Received: by 10.98.86.15 with SMTP id k15mr8157719pfb.187.1519331959856; Thu, 22 Feb 2018 12:39:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519331959; cv=none; d=google.com; s=arc-20160816; b=fTk30rfv+mOEYrBy2UNHOoxuJ7WzDfjaXFbDie9zZOM/qxnU2mpLKN+lHi7wBfvjZM HQMMNlTeKvNyiNq+lOhrdI8BDySGbF7E6MVHMlH2KkzoZq57H9Ki3yMD8gcy0JEv4MoG CDwaeDReznO77vfXIcWOhfrtHnDe7dO+S587ugMd7ah5z4e0vYsC053NIOGYZm9oELgn V27zZalvXuOIVG0UlaHYpD5+gM6e9r4ZHlXlYz0YGRjU08MS8h/cvGkAyYSc/RkUUK05 r0vgBAim0uDDgM28d/0qIvRLecEWDfIL6ngISHd7QSRKKr40oUDf/JR3/kOmXBQEuntV 1ivA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:in-reply-to:references:date :from:cc:to:subject:arc-authentication-results; bh=QwwtHwGKNpSyQTpKReIl1JkJubea5/fg1kd85ygPruQ=; b=D+nMN1IAfj+CycAkoWnhBRuYMCf8HUzCVoTM1lWEe+3vgW6+DTlAdgJqmJI464EnQF 09ecjYZeC6Ewa9p5d67PF8dz20wl0HoP2P5u14A4BKfcJUeg/ioN5whSvm9Lk/4hMpdn 4moYVDDa3LSLeu71oQy3WVDxa+019txXslURPVdizpRy6pJDVHqoL+qrsFtJC1DqONR+ ICqmhSVIoh2UWUvOspx5YX8NYuQGnxbeBTYxo8IRcU+OYIjHoP3vY3QytIq0c5CEDFA6 BpWL2JdcKNZ4tFs30hKIHrF3E9AtGs/Pg6h5BZZ6/mvn0G8kEXeEPFrRRmD9wR80DU44 NQjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d4-v6si549853plr.598.2018.02.22.12.39.04; Thu, 22 Feb 2018 12:39:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751456AbeBVUhL (ORCPT + 99 others); Thu, 22 Feb 2018 15:37:11 -0500 Received: from mga09.intel.com ([134.134.136.24]:49853 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751411AbeBVUhH (ORCPT ); Thu, 22 Feb 2018 15:37:07 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2018 12:37:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,378,1515484800"; d="scan'208";a="19605599" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.39.119]) by orsmga007.jf.intel.com with ESMTP; 22 Feb 2018 12:37:06 -0800 Subject: [RFC][PATCH 04/10] x86/espfix: use kernel-default PTE mask To: linux-kernel@vger.kernel.org Cc: Dave Hansen , aarcange@redhat.com, luto@kernel.org, torvalds@linux-foundation.org, keescook@google.com, hughd@google.com, jgross@suse.com, x86@kernel.org, namit@vmware.com From: Dave Hansen Date: Thu, 22 Feb 2018 12:36:58 -0800 References: <20180222203651.B776810C@viggo.jf.intel.com> In-Reply-To: <20180222203651.B776810C@viggo.jf.intel.com> Message-Id: <20180222203658.80705136@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen In creating its page tables, the espfix code masks its PGTABLE_PROT value with the supported mask: __supported_pte_mask. This ensures that unsupported bits are not set in the final PTE. But, it also sets _PAGE_GLOBAL which we do not want for PTE. Use __default_kernel_pte_mask instead which clears _PAGE_GLOBAL for PTI. Signed-off-by: Dave Hansen Cc: Andrea Arcangeli Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Kees Cook Cc: Hugh Dickins Cc: Juergen Gross Cc: x86@kernel.org Cc: Nadav Amit --- b/arch/x86/kernel/espfix_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86/kernel/espfix_64.c~espfix-use-kern-defaults-not-supported arch/x86/kernel/espfix_64.c --- a/arch/x86/kernel/espfix_64.c~espfix-use-kern-defaults-not-supported 2018-02-22 12:36:19.217036552 -0800 +++ b/arch/x86/kernel/espfix_64.c 2018-02-22 12:36:19.221036552 -0800 @@ -167,7 +167,7 @@ void init_espfix_ap(int cpu) goto unlock_done; node = cpu_to_node(cpu); - ptemask = __supported_pte_mask; + ptemask = __default_kernel_pte_mask; pud_p = &espfix_pud_page[pud_index(addr)]; pud = *pud_p; _