From patchwork Mon Nov 19 21:47:58 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: 10689543 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 BC74813BB for ; Mon, 19 Nov 2018 21:54:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEAE32A583 for ; Mon, 19 Nov 2018 21:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A29572A6F3; Mon, 19 Nov 2018 21:54:58 +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 135442A583 for ; Mon, 19 Nov 2018 21:54:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0B466B1C9B; Mon, 19 Nov 2018 16:54:27 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E6A586B1C9C; Mon, 19 Nov 2018 16:54:27 -0500 (EST) 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 CBB5C6B1C9D; Mon, 19 Nov 2018 16:54:27 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id 836336B1C9B for ; Mon, 19 Nov 2018 16:54:27 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id k14-v6so24583098pls.21 for ; Mon, 19 Nov 2018 13:54:27 -0800 (PST) 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=O92AXCbrqBSxJV0ao/5hXiZk219rpE4NX9OaI3z1mq4=; b=cpMSWs8UCW0t3yg/Zrp0HGGbdCiDP6lrhTFxsC9bzxh2HRyEGASTVis7S/MTpDJmfq NWr32lilqto4teLycoFugocSMHvIlNV0pEDODNEdQZA/IfiuVrPXfAP/2RhzhE2APmjS +7jXT+O70KAOu14N0f/T1vb2e/Z2JYZ/ZgOY52+YKtnS8I+to//XLgBsKgY2akbd7lTH WHbgr/aFdXl+daweXI5jkbTzmKdfPy5VvkXaGKJMi5Otn1o0LayXKdRuWWBteUhzYjjF shxXIOFCyUQDRqjDa8+VTfn2xk3LNCsJs2u3tTAI2ECDkxxTemiCHTeJy3XTBXTbx2I2 J0EA== 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: AGRZ1gKkENt4fazyIPOJdJ9Y1whqe/dMhaUIV73gKQlBNTancXOp5iLB CUZtkHV5uWTENkjNjuqMWrOw8jAMZP7kmEH22ILPL/ItdzamWIsfPYJpIGhm+VQc4HHL5evL1Cn U+4Sp9omUl/2tPzM/zxqll5xn3fcCKXNrhuyM2zt2ZE+Zt6EbIJVKJ5YPlGoOj74MvA== X-Received: by 2002:a63:9712:: with SMTP id n18mr21317081pge.295.1542664467185; Mon, 19 Nov 2018 13:54:27 -0800 (PST) X-Google-Smtp-Source: AJdET5fAcfVXD2povKP3D0a0bFJgec/+9Spgrs23DDG4okP77cRnGOSXeNyQFpPodYQil5Dpxxdn X-Received: by 2002:a63:9712:: with SMTP id n18mr21317050pge.295.1542664466439; Mon, 19 Nov 2018 13:54:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542664466; cv=none; d=google.com; s=arc-20160816; b=x2n0QfLEZRxdy1gVZMLZwCA1s/WEtgRMIW20q9QY0X58HbCWhjiYpwJqheo+XfF26W jPNFujeBOcIPAfWZU/5JS6AFemSBdb2A1tHQw52fsQH81Nazp/RmC6BPXsvfsvs3D16S HSSaKPGXTAc9AE2jCqdC52YIqZHInX8/Sa645pRiljSrPeWxWD7PNB1O5Ab2wdnGZ6Y9 9RxUzWIqWDJ9om9f9wye43QUdCVDiYUNnWTDMVe4EDttdfLl3QkP3cOMjIT2cNwiPq7N 1/vZb65dqFL+wXwf7pKt3rN0Di7yyk1EQWUztIH6WP1crqi8+D75tchkmUIQ80TrCioX k/cg== 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; bh=O92AXCbrqBSxJV0ao/5hXiZk219rpE4NX9OaI3z1mq4=; b=gdn0Ny93tSNFqf8Qar88tLsliytaDcK5ptg3UMI2kLSryAnXYdsmibF+akv1fdxgVG lXAQq4T5yxQJ2xt/0kghaaDBmgKs864HW+0J+vVJYI5oZ+OqxQrYvydnSiUI2hjorKRR 9OpHOnEJXfvFamvKyuKJAboIBqVH1v9wobi7YXQ71/ryZSsTcyzbTbNBkbs6nfmA8xbQ YkeiS93tvOk/QgLWyw3bhYYErqRMK1SqYPeAPYst/eLPQrzFOe70FdIg8fUpI+Qym08C Ktzqi5S5HWZn0b4HguBIYcXSmj5P81d4ZDVdCT3h7FarsMq1poCSfMkk2Q0mnAbvJIms vt7w== 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 o12-v6si32492543plg.114.2018.11.19.13.54.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 13:54:26 -0800 (PST) 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 orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2018 13:54:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,254,1539673200"; d="scan'208";a="93319883" Received: from yyu32-desk1.sc.intel.com ([143.183.136.147]) by orsmga008.jf.intel.com with ESMTP; 19 Nov 2018 13:54:24 -0800 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 , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v6 15/26] mm: Handle shadow stack page fault Date: Mon, 19 Nov 2018 13:47:58 -0800 Message-Id: <20181119214809.6086-16-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119214809.6086-1-yu-cheng.yu@intel.com> References: <20181119214809.6086-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 When a task does fork(), its shadow stack (SHSTK) must be duplicated for the child. This patch implements a flow similar to copy-on-write of an anonymous page, but for SHSTK. A SHSTK PTE must be RO and dirty. This dirty bit requirement is used to effect the copying. In copy_one_pte(), clear the dirty bit from a SHSTK PTE to cause a page fault upon the next SHSTK access. At that time, fix the PTE and copy/re-use the page. Signed-off-by: Yu-cheng Yu --- arch/x86/mm/pgtable.c | 15 +++++++++++++++ include/asm-generic/pgtable.h | 8 ++++++++ mm/memory.c | 7 ++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 59274e2c1ac4..75dddc3d8451 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -887,3 +887,18 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) #endif /* CONFIG_X86_64 */ #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ + +#ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER +inline pte_t pte_set_vma_features(pte_t pte, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHSTK) + return pte_mkdirty_shstk(pte); + else + return pte; +} + +inline bool arch_copy_pte_mapping(vm_flags_t vm_flags) +{ + return (vm_flags & VM_SHSTK); +} +#endif /* CONFIG_X86_INTEL_SHADOW_STACK_USER */ diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 359fb935ded6..30ac390fb2d4 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1143,4 +1143,12 @@ static inline bool arch_has_pfn_modify_check(void) #define mm_pmd_folded(mm) __is_defined(__PAGETABLE_PMD_FOLDED) #endif +#ifndef CONFIG_ARCH_HAS_SHSTK +#define pte_set_vma_features(pte, vma) pte +#define arch_copy_pte_mapping(vma_flags) false +#else +pte_t pte_set_vma_features(pte_t pte, struct vm_area_struct *vma); +bool arch_copy_pte_mapping(vm_flags_t vm_flags); +#endif + #endif /* _ASM_GENERIC_PGTABLE_H */ diff --git a/mm/memory.c b/mm/memory.c index 4ad2d293ddc2..f6b2e1ece4ab 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -775,7 +775,8 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, * If it's a COW mapping, write protect it both * in the parent and the child */ - if (is_cow_mapping(vm_flags) && pte_write(pte)) { + if ((is_cow_mapping(vm_flags) && pte_write(pte)) || + arch_copy_pte_mapping(vm_flags)) { ptep_set_wrprotect(src_mm, addr, src_pte); pte = pte_wrprotect(pte); } @@ -2218,6 +2219,7 @@ static inline void wp_page_reuse(struct vm_fault *vmf) flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte)); entry = pte_mkyoung(vmf->orig_pte); entry = maybe_mkwrite(pte_mkdirty(entry), vma); + entry = pte_set_vma_features(entry, vma); if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1)) update_mmu_cache(vma, vmf->address, vmf->pte); pte_unmap_unlock(vmf->pte, vmf->ptl); @@ -2291,6 +2293,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte)); entry = mk_pte(new_page, vma->vm_page_prot); entry = maybe_mkwrite(pte_mkdirty(entry), vma); + entry = pte_set_vma_features(entry, vma); /* * Clear the pte entry and flush it first, before updating the * pte with the new entry. This will avoid a race condition @@ -2801,6 +2804,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) pte = mk_pte(page, vma->vm_page_prot); if ((vmf->flags & FAULT_FLAG_WRITE) && reuse_swap_page(page, NULL)) { pte = maybe_mkwrite(pte_mkdirty(pte), vma); + pte = pte_set_vma_features(pte, vma); vmf->flags &= ~FAULT_FLAG_WRITE; ret |= VM_FAULT_WRITE; exclusive = RMAP_EXCLUSIVE; @@ -2943,6 +2947,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) entry = mk_pte(page, vma->vm_page_prot); if (vma->vm_flags & VM_WRITE) entry = pte_mkwrite(pte_mkdirty(entry)); + entry = pte_set_vma_features(entry, vma); vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl);