From patchwork Fri Sep 21 15:03:40 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: 10610261 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 4A11715E8 for ; Fri, 21 Sep 2018 15:10:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3915C2E42A for ; Fri, 21 Sep 2018 15:10:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D52A2E430; Fri, 21 Sep 2018 15:10:03 +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 91A652E42F for ; Fri, 21 Sep 2018 15:10:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A36D8E0016; Fri, 21 Sep 2018 11:08:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 607AA8E001B; Fri, 21 Sep 2018 11:08:54 -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 1EC9E8E0016; Fri, 21 Sep 2018 11:08:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 5F8A58E0010 for ; Fri, 21 Sep 2018 11:08:53 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id 11-v6so837836pgd.1 for ; Fri, 21 Sep 2018 08:08:53 -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=h73YAqb1qP/EQ0K+GtjIqsg5+zhUjTo3FsgsOLKvJKU=; b=BEMIYN8ExrDu5dYrwbuymFukbaJbbvyeCm2dJ0bnS3rhJmY60g4WuvnCoh75Ft6h9A QMCa4RMVXyYQAHdkJKz7qJIoixLea3sL7RB0/C1BCkkZrhWwqAXFV0C6/zC+BlNLB+9k 6X5Zbc7bmsLxElo+eBTt3tcFJiaOeMwDccd4Pbz3yH3oYYVJuD+C6akMZYHCxZRDrVv6 Ym3K/oib5MvOxC0sc6V2amw0HhdFULp+Nlzb+xGakL5KKuVx6ojTlorMgp/1isIs1dAl Ny/dZeXFFWlricTwwMNBc8AAhpwTVgNJQg6IkH/ssy+JlcbigkevqCAYd8uZjzAc6fU8 ZLww== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 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: APzg51BNlgFTAteUzjSt6ItfHE7l2N2Ow7d+4f6kZwkly79C7na7XmSD gsw8mca0y/7ROqrXfuJlS/TXsoWlHDymp5bsVxzVgiIjoXT6SVuWCEuUcjKdJXF3nEKQFBXgnvH sDmfD/ACjSkqPpjDorwS5tRJhgErgQp/zPucs/dGaSCA8daSeirVcZ2/7smAq2LqXGw== X-Received: by 2002:a62:5ec3:: with SMTP id s186-v6mr47308137pfb.146.1537542533084; Fri, 21 Sep 2018 08:08:53 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYLlxP8s4Th6t8lCwfdYo4ebbD24AVSssliqr6w+RI8GsWPf+TAJRiqVcQcvQBzLEgsLq6L X-Received: by 2002:a62:5ec3:: with SMTP id s186-v6mr47308027pfb.146.1537542531518; Fri, 21 Sep 2018 08:08:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542531; cv=none; d=google.com; s=arc-20160816; b=0oCEV0/s2v8ebCvPh04uokOkO0PSrPum6htgkGZEQnnwIxtPdeW7herHiIEdFg6g2K 3boDcp0fYEsq9hhsXFMHy+XzrmEnQLgPuP7kw+LSVmJ71KOJsFO1ldFMMrM8EK1gdsYe 4jnAQrp+oa5z2N/+EOYcIKgrUPNbwEEUx1HLlWkqjmEOhjiwv6JFjnL4JlK2LwKTfxkQ m4QcG54jlVbX/lCHPJ6+R/15Jx0ZEiG6D763e3YobQS2P9lo7KgckqjfOeke55R+7w47 mmZFccdEKjH+aceAkVqHeLGWDmJZMt0VmqIahz+C2jOfQfJfEMJrj82nfYYBtZdp7F05 8kSQ== 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=h73YAqb1qP/EQ0K+GtjIqsg5+zhUjTo3FsgsOLKvJKU=; b=AvfxdPQo2twYRIsSXHRHkwZlB1rs4cPQ7OAZEX4vCDRWyJXN0ZWPoNfmXe+0RMB/jd 0TqdgLjBn/5GNe/UPYSOGuYlJi7hjcH53XIX9ic23SGgkIqxPx0aHsKWpD3cTYCh+EI6 82PIiN27RRHB+qmmqcu3mGHVIi3+msVFRyO2u9gZzDWabKLAFqbkE6WjLjh8/P5ybo4d y8h5rfQ5Cy8rQVl96tMB0nhuKgPUHxuQksoi7s+RyivkZI7BnxZM3GIZ8WriyL02lEzv sM/ZA+IdFbMW7XDORI+G8+HIvYggfIY4jAqcMcZLWH5rqga/f4W5PbyZWAYBBQEeKKco JdNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id r7-v6si26956600pga.77.2018.09.21.08.08.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 08:08:51 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 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 fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Sep 2018 08:08:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,285,1534834800"; d="scan'208";a="71856577" Received: from 2b52.sc.intel.com ([143.183.136.51]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2018 08:08:50 -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 , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v4 16/27] mm: Update can_follow_write_pte/pmd for shadow stack Date: Fri, 21 Sep 2018 08:03:40 -0700 Message-Id: <20180921150351.20898-17-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921150351.20898-1-yu-cheng.yu@intel.com> References: <20180921150351.20898-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 | 19 +++++++++++++++++++ include/asm-generic/pgtable.h | 4 ++++ mm/gup.c | 8 +++++--- mm/huge_memory.c | 8 +++++--- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index ccdfd3dd7163..e13a020e37db 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -894,4 +894,23 @@ 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 + #endif /* CONFIG_X86_INTEL_SHADOW_STACK_USER */ diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index a91f07454ced..6223017929be 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1131,10 +1131,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 inline pte_t pte_set_vma_features(pte_t pte, struct vm_area_struct *vma); inline 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 1abc8b4afff6..03cb2e331f80 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -64,10 +64,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, @@ -105,7 +107,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 df39ae20fe40..c70aa8fa4cb2 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1387,10 +1387,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, @@ -1403,7 +1405,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 */