From patchwork Tue Jul 10 22:26:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10518145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 09AA96032A for ; Tue, 10 Jul 2018 22:31:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF04628F39 for ; Tue, 10 Jul 2018 22:31:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E30F728F59; Tue, 10 Jul 2018 22:31: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 7DAC528F39 for ; Tue, 10 Jul 2018 22:31:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49F9F6B0006; Tue, 10 Jul 2018 18:31:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3C5286B000C; Tue, 10 Jul 2018 18:31:14 -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 035FE6B000C; Tue, 10 Jul 2018 18:31:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 9CF1B6B000C for ; Tue, 10 Jul 2018 18:31:13 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id v9-v6so4865613pfn.6 for ; Tue, 10 Jul 2018 15:31:13 -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:from:to:cc :subject:date:message-id:in-reply-to:references; bh=EeaDLMQwOELis6Fck36HQv0R/Ho0f34b6bUyk01xJAA=; b=fVbrcBW5iuCIvkKCdzA6SvEfTk7TZT1nGltGojjePs1t0D6h3m0vBAkXspHSQxl0hN Z5/4s1N+SrY9TJM8eDJ6FpmTe39S7sbnIx21Yta5MQa/XPM95vvbZadRjpAUGvLdzDrg DK5ktLWJZgAF4DP/ArwF7Hy1dnLyqYJt9e8tWaklTVn1+BkMWHnhowceevtc7dr+MGli fsW9O2r4BFGn7NX7hlkXXJt8IayLE7zYIgQn3j/rLx/T+ws8wksPflAPUeNmOYEvY8Wt b2pK65gNzh+ez6ThsMFwN7vNThplzPS0rDURYhEA3Dh6T3JTCGfzAXh199UfIHD14VX9 oDVw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E2k0T0haJIGPXv6LUjvE3nVyA0uTP5tWuReP+NZWa2KUz0gyjZo X/p3+c0XghlRvKCeuvsZTYSDI9xThOMRiKIZhJNFnI7pPs9yMTq4OQKCnAtm2ypIUlzq3SeT9rp 16s1O79eLdqrtT+lcsvGCyKP3/d9tmfFcbZtkj2cNbnPdS7G2WTvweumQzbScnYIzzQ== X-Received: by 2002:a17:902:3a3:: with SMTP id d32-v6mr2219765pld.294.1531261873292; Tue, 10 Jul 2018 15:31:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfJxM0VxWHwE3yIejE8L7z8Swa8pn4HuaTYkSaXw7ZuytQS7jUvczZoptwM0yPyeeo9v/t5 X-Received: by 2002:a17:902:3a3:: with SMTP id d32-v6mr2219727pld.294.1531261872607; Tue, 10 Jul 2018 15:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531261872; cv=none; d=google.com; s=arc-20160816; b=purGwYSuqrw4mV7wk1430ulTkgQDjg2pPy4gdVq2nrIErfD8XCqkLv+RxgL4zsZdgL +GYoqUBVTvceYqLuyLTbgEaAmd7wsVsTAFdQdK2k4scEtJFXqFTZGYogrkraWQQcipiO RQC6az0Ldaa6/TzXsFHn73pas7UTH2wR5wAdpknmnYz6voeFDhPYhUQrPxslz/oM+47y QdW1y7kKqqA5NjdzOpuzvMcZkWNhty9Lr8EeSI/AegsG8TwWhgsK6AUsRpbtan4wiN1f s9/yOSca4ywvdLd36sg+lPi3a6mNhT3MR28KEbZt/r88bCtxgXSMd1Ew0GzP0Ca7QePU YhnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=EeaDLMQwOELis6Fck36HQv0R/Ho0f34b6bUyk01xJAA=; b=QUi4XXUfKR5P8D3RNUzkoDfP72ZdasLq+iWilWLkHldDeuS0izyHdSDfv7E9r1RX72 3bATPv89kw1yRFjoApHIGlJhshqptjka8QmO6QhyLaI2kO3B/VK6ak03ZJ2rrKmrrhNt bI5t8DCR1hgzg7MI3pQs+lFhAfb8VmsTXdDJniGwo4snvVQfzlZNPNI/WyFwA8YcuNKB ct00HAyt/TZKjG0rsNseZs7UTgLCRuuWsusAMfUGIEDAhsQzrV++PNTrOLRw+eF5M2YW P8/uVyhxJruiE1HNgXc5Du8qqabJef3+4Yxc9L6pk7xtbmeuz7Fm2V8Cm0nIxw331YsW s8rA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id q185-v6si17504162pga.322.2018.07.10.15.31.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 15:31:12 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 15:31:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,335,1526367600"; d="scan'208";a="70305388" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga004.fm.intel.com with ESMTP; 10 Jul 2018 15:31:11 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Cyrill Gorcunov , Dave Hansen , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v2 08/27] mm: Introduce VM_SHSTK for shadow stack memory Date: Tue, 10 Jul 2018 15:26:20 -0700 Message-Id: <20180710222639.8241-9-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710222639.8241-1-yu-cheng.yu@intel.com> References: <20180710222639.8241-1-yu-cheng.yu@intel.com> 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 VM_SHSTK indicates a shadow stack memory area. A shadow stack PTE must be read-only and dirty. For non shadow stack, we use a spare bit of the 64-bit PTE for dirty. The PTE changes are in the next patch. There is no more spare bit in the 32-bit PTE (except for PAE) and the shadow stack is not implemented for the 32-bit kernel. Signed-off-by: Yu-cheng Yu --- include/linux/mm.h | 8 ++++++++ mm/internal.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index a0fbb9ffe380..d7b338b41593 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -222,11 +222,13 @@ extern unsigned int kobjsize(const void *objp); #define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) #define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) #define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) #define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) #define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS @@ -264,6 +266,12 @@ extern unsigned int kobjsize(const void *objp); # define VM_MPX VM_NONE #endif +#ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER +# define VM_SHSTK VM_HIGH_ARCH_5 +#else +# define VM_SHSTK VM_NONE +#endif + #ifndef VM_GROWSUP # define VM_GROWSUP VM_NONE #endif diff --git a/mm/internal.h b/mm/internal.h index 9e3654d70289..b09c29762d85 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -280,6 +280,14 @@ static inline bool is_data_mapping(vm_flags_t flags) return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE; } +/* + * Shadow stack area + */ +static inline bool is_shstk_mapping(vm_flags_t flags) +{ + return (flags & VM_SHSTK); +} + /* mm/util.c */ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent);