From patchwork Mon Nov 19 21:48:00 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: 10689547 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 ADCBE6C5 for ; Mon, 19 Nov 2018 21:55:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C8A62A583 for ; Mon, 19 Nov 2018 21:55:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CF2D2A6EE; Mon, 19 Nov 2018 21:55:04 +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 F0D142A583 for ; Mon, 19 Nov 2018 21:55:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E6C5A6B1C9D; Mon, 19 Nov 2018 16:54:29 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DF89A6B1C9E; Mon, 19 Nov 2018 16:54:29 -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 C95B56B1C9F; Mon, 19 Nov 2018 16:54:29 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 7C1866B1C9D for ; Mon, 19 Nov 2018 16:54:29 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id i22-v6so26683967pfj.1 for ; Mon, 19 Nov 2018 13:54:29 -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=62OUP1tZ91xCDgL5KWdzAo5LEZnvgw3ubKR50PUY7os=; b=uavV20F0uqb9CUFGOMliI+N/MDxsOzBpJdK4oG+EOwJP4bxN7vnkWFc+eVUir19Wch jxpglHVxlCpK2SrNG+7OifXNNH/pxF7HbwPGpX/QfujhBrxoMtHg00K6N3uhsWDO6mf/ p3X+BdJ3IWswnMEEJXO1pFST7kti8azKP+NbcatukrUsW3oMw57HDQ/Xm1nCd2Yfenb1 GB42TS4+tGu6gND95LhpUBgfD4h6YcMFoq8JBwOu10poUl3MrsiXn39IvQkCq4cMwAUq +krLL1PjU9ktYPy0aEQI9PdI5kpA3QIdVW2F6M5nGs8t2xqsfVXOQwZI3a+wIRyxPWqY S1sw== 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: AGRZ1gJEFthYEctiBNs7i9Grlac2Ji1YrYspgqoKr/X9YyAMbwwyzFZm XzgYV/lDw+ImEqT8KiSfqwM8B9Em4JCGv/7zp8+ezN3zIQB3I81pQCurJ7WbTi9dGHqvTvP6U0C AIfR0c1IGrmFj8wUcbLtvQhxBUKXaZyM3XT27KH7tcBg2/7TpzBlTBpwGrURaduUyMw== X-Received: by 2002:a63:9e0a:: with SMTP id s10mr21849648pgd.239.1542664469156; Mon, 19 Nov 2018 13:54:29 -0800 (PST) X-Google-Smtp-Source: AJdET5cLTWDxW4RQj0BAzB9S7Mi84fArwZRFlGDXlDU71/D5xsxqtGLpd28GSd0X6oSMGldamc14 X-Received: by 2002:a63:9e0a:: with SMTP id s10mr21849612pgd.239.1542664468354; Mon, 19 Nov 2018 13:54:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542664468; cv=none; d=google.com; s=arc-20160816; b=WkG4DDajYyiNEL+lJiPbdpJMs76OeK0fIR9VDm7/rbHf7ansiBBJUu4/4s0oxi9bke 0fw4ztMJrtjOwDIK6ow+x5FhlMz12rZ06EPCvl6Wm44X4LFZQKe8TrxHZM6CMcvIA0MQ SmYx8NdwDC5gx6aw2ykGy/Ga6zuHngImDdV2+45/Ug4nkwv0rOJv1+Tr/GUxRfu/UOc6 MPGSbkjdz3sqOhB0IQJGrFVuHfwxhQZ6c5XgZ8kAuJUlqv6XeTw0KilnuXJeiPVBkftV rFPU1BXEKZWrJ+TxZBN1nPaYcG0ntzfDlEdrZoo9Ni3apU6MMfuwJmQkjBlfrt+Z5Ih+ 7wbw== 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=62OUP1tZ91xCDgL5KWdzAo5LEZnvgw3ubKR50PUY7os=; b=ztmGhrX48cVRiD0d7CZye9oxLabQ4cL5Dxz+XL9klha1IvcB90l/V5Y43D3Y1nDENg S6uRcnxMJpyWmJypOdzcNlrHHKeo949+XI/8Pnts9zL4/b86xUb9gqrr9oJ21iY9bFgK lVbVUrLStWPzgO6vYVBGYsbDnHFe9LAOV4pRdhYSB3TwW7teKr8FYMVuffJvRb1lvZFk 7QiCHpVg9Z2Y8f3X4VFo+/ImrW8nHW1yJU2Bfrx4+vMx42KXVNmaZgu2gHSYbYgbd9RM r7f/aQaobbxmYGUsZX6iab57e8YNUIqpqdkaVURnSH80dAxg5ECb/elh2aZExVRQ7YWH 8mJw== 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 g12-v6si41569459pla.351.2018.11.19.13.54.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 13:54:28 -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:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,254,1539673200"; d="scan'208";a="93319892" Received: from yyu32-desk1.sc.intel.com ([143.183.136.147]) by orsmga008.jf.intel.com with ESMTP; 19 Nov 2018 13:54:26 -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 17/26] mm: Update can_follow_write_pte/pmd for shadow stack Date: Mon, 19 Nov 2018 13:48:00 -0800 Message-Id: <20181119214809.6086-18-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 can_follow_write_pte/pmd look for the (RO & DIRTY) PTE/PMD to verify an exclusive RO page still exists after a broken COW. A shadow stack PTE is RO & PAGE_DIRTY_SW when it is shared, otherwise RO & PAGE_DIRTY_HW. Introduce pte_exclusive() and pmd_exclusive() to also verify a shadow stack PTE is exclusive. Also rename can_follow_write_pte/pmd() to can_follow_write() to make their meaning clear; i.e. "Can we write to the page?", not "Is the PTE writable?" Signed-off-by: Yu-cheng Yu --- arch/x86/mm/pgtable.c | 18 ++++++++++++++++++ include/asm-generic/pgtable.h | 4 ++++ mm/gup.c | 8 +++++--- mm/huge_memory.c | 8 +++++--- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 4275c80f5832..7629156d30b0 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -909,4 +909,22 @@ inline bool arch_copy_pte_mapping(vm_flags_t vm_flags) { return (vm_flags & VM_SHSTK); } + +inline bool pte_exclusive(pte_t pte, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHSTK) + return pte_dirty_hw(pte); + else + return pte_dirty(pte); +} + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +inline bool pmd_exclusive(pmd_t pmd, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHSTK) + return pmd_dirty_hw(pmd); + else + return pmd_dirty(pmd); +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif /* CONFIG_X86_INTEL_SHADOW_STACK_USER */ diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index b0b375d8bb34..c8685df71521 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1147,10 +1147,14 @@ static inline bool arch_has_pfn_modify_check(void) #define pte_set_vma_features(pte, vma) pte #define pmd_set_vma_features(pmd, vma) pmd #define arch_copy_pte_mapping(vma_flags) false +#define pte_exclusive(pte, vma) pte_dirty(pte) +#define pmd_exclusive(pmd, vma) pmd_dirty(pmd) #else pte_t pte_set_vma_features(pte_t pte, struct vm_area_struct *vma); pmd_t pmd_set_vma_features(pmd_t pmd, struct vm_area_struct *vma); bool arch_copy_pte_mapping(vm_flags_t vm_flags); +bool pte_exclusive(pte_t pte, struct vm_area_struct *vma); +bool pmd_exclusive(pmd_t pmd, struct vm_area_struct *vma); #endif #endif /* _ASM_GENERIC_PGTABLE_H */ diff --git a/mm/gup.c b/mm/gup.c index aa43620a3270..abc200ed1e4a 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -69,10 +69,12 @@ static int follow_pfn_pte(struct vm_area_struct *vma, unsigned long address, * FOLL_FORCE can write to even unwritable pte's, but only * after we've gone through a COW cycle and they are dirty. */ -static inline bool can_follow_write_pte(pte_t pte, unsigned int flags) +static inline bool can_follow_write(pte_t pte, unsigned int flags, + struct vm_area_struct *vma) { return pte_write(pte) || - ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte)); + ((flags & FOLL_FORCE) && (flags & FOLL_COW) && + pte_exclusive(pte, vma)); } static struct page *follow_page_pte(struct vm_area_struct *vma, @@ -110,7 +112,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, } if ((flags & FOLL_NUMA) && pte_protnone(pte)) goto no_page; - if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) { + if ((flags & FOLL_WRITE) && !can_follow_write(pte, flags, vma)) { pte_unmap_unlock(ptep, ptl); return NULL; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 12148a5b60e0..f7476eeed83a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1403,10 +1403,12 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf, pmd_t orig_pmd) * FOLL_FORCE can write to even unwritable pmd's, but only * after we've gone through a COW cycle and they are dirty. */ -static inline bool can_follow_write_pmd(pmd_t pmd, unsigned int flags) +static inline bool can_follow_write(pmd_t pmd, unsigned int flags, + struct vm_area_struct *vma) { return pmd_write(pmd) || - ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pmd_dirty(pmd)); + ((flags & FOLL_FORCE) && (flags & FOLL_COW) && + pmd_exclusive(pmd, vma)); } struct page *follow_trans_huge_pmd(struct vm_area_struct *vma, @@ -1419,7 +1421,7 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma, assert_spin_locked(pmd_lockptr(mm, pmd)); - if (flags & FOLL_WRITE && !can_follow_write_pmd(*pmd, flags)) + if (flags & FOLL_WRITE && !can_follow_write(*pmd, flags, vma)) goto out; /* Avoid dumping huge zero page */