From patchwork Thu Aug 30 14:38:56 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: 10581861 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 B59EB5A4 for ; Thu, 30 Aug 2018 14:45:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A60722B560 for ; Thu, 30 Aug 2018 14:45:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98A142BC83; Thu, 30 Aug 2018 14:45:07 +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 09C2B2B560 for ; Thu, 30 Aug 2018 14:45:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0A036B5220; Thu, 30 Aug 2018 10:43:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9F8596B5233; Thu, 30 Aug 2018 10:43:49 -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 E8A536B5234; Thu, 30 Aug 2018 10:43:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id F070B6B5231 for ; Thu, 30 Aug 2018 10:43:47 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id r2-v6so5168109pgp.3 for ; Thu, 30 Aug 2018 07:43:47 -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=DS339Oq/VMp5xvhucSCa2NrKJaq5mpRNUbsXZO7WFgw=; b=AQLep8Rw838RR+Umax8lbl2PJzgz4+v32NwwOn8WNq0rC3Vpch1NXUgPPrspcSaEV8 eskR2JOmZS53TFRS8RYe4ENAMoIl7s0u2ZFqT/P7TYe8XqcJl05nJsGNNAGqeiQFH9H4 QkLFkhBwwQsSgRLKG3mir48UTdtIAxtb9GIm/M7wPGH8mWeVqYJaa++ZlK8ZGzHzJ9wU J9bCABu4LOiX9Pbi5QbXgIPOumASpw8+ktfzF5w3zo5n+DeNvMOHu7PepgSMG47z5ZiX HOfevDn+2KnMsHHKFoiSuTyENOmeSYJNEbUfRPaZW+EO9HDW6u9gZZL5Ufn2Ftx9lixq Qn1A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.88 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: APzg51Duyo0Oy1M66z8/0ivwVjvxEVQaYHNEpRoNAZc7yT7q5HQj/Ay3 SaqiCQmM3pUVgOAD5l+bUZ6BTR/VL/ou2tQU6D/DUJfp6dJ+ED85q+lfA9xcJjzk/qzGQeUyxRz mCDaggFLa6rU/zG2WJGhaBQxtbFdaK8aADYMHsk2AESHhsb+onUoCeX8JhmkjTn99Gw== X-Received: by 2002:aa7:8087:: with SMTP id v7-v6mr10757683pff.38.1535640227665; Thu, 30 Aug 2018 07:43:47 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda+xVA/HMjZ9PUIefWP0RY7Ky+GP/51mvN8fhilbptk0YIZk7dU71vr4bLFaECkTeCZRyo1 X-Received: by 2002:aa7:8087:: with SMTP id v7-v6mr10757611pff.38.1535640226387; Thu, 30 Aug 2018 07:43:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535640226; cv=none; d=google.com; s=arc-20160816; b=J/hCszZEiHVB5q4yDjADsR8XWtAee63jIk8F8CDiBBVRfOid+1AVAbOwkCQYzWnLNM pftD4y9MuGHqqWp3ASRqcKTgqCx+/WID9Tkq46MDvE1vC+tqd+KX6NGDSW1BmzBrQoEn WScwPrTQBBVnxdk77DV+mq0G/ltLbItCo2EphmKZ1QznmKNO/q5B5RhkWJqxDDTGBBG6 eBQ7nF830tR3oEuPOk/X1guhuZqy7kOX/XPnHM0Onn4uBbwdD5aIUD4YoVvtAbCmnvKC 4YA0yn37JEQcLc3d0pJYy2tQtHMTpopzeuI/Tu5ZeCK+hfwH+uif6XLqJ8u1Fiica72E cy/Q== 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=DS339Oq/VMp5xvhucSCa2NrKJaq5mpRNUbsXZO7WFgw=; b=oMU/BGi2wl7NbZ8rfuYaChQoQfpgOZrTaCNP0y0x5QwiPp7m2z99H9NCHzWfMfpRj1 riqjg5gXT6fIq5FVb6C+dZpYjK4tEMCf/LNyZLOxIEi7SHB3l/SUxcaBVGzh0AnlANsO LfoLcJanQddB7+NMkRvy0qda2/APXjYl6Pq4TZZ6zcpcaoJ/wGHuBd1ropUMP3cYWOS5 ndzFQrA1XMiJ6RmpJnH04VC/4rTOsWr8glzF04IwSh/5FUzy2617NGr5b9BnzuQAkirt KLYDBiqWSd1y08nC5Kg6PlyqsUoPpsw8cebJMXLs5zo3pbDDhLH/8XHttu69GS+0dWHU UnCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id w13-v6si6403728pll.449.2018.08.30.07.43.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 07:43:46 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.88 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 fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Aug 2018 07:43:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,307,1531810800"; d="scan'208";a="67186720" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga008.fm.intel.com with ESMTP; 30 Aug 2018 07:43:42 -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 v3 16/24] mm: Update can_follow_write_pte/pmd for shadow stack Date: Thu, 30 Aug 2018 07:38:56 -0700 Message-Id: <20180830143904.3168-17-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180830143904.3168-1-yu-cheng.yu@intel.com> References: <20180830143904.3168-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 | 18 ++++++++++++++++++ mm/gup.c | 8 +++++--- mm/huge_memory.c | 8 +++++--- 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 0ab38bfbedfc..13dd18ad6fd8 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -889,4 +889,22 @@ inline pmd_t pmd_set_vma_features(pmd_t pmd, struct vm_area_struct *vma) else return pmd; } + +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 0f25186cd38d..2e8e7fa4ab71 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1156,9 +1156,27 @@ static inline pmd_t pmd_set_vma_features(pmd_t pmd, struct vm_area_struct *vma) { return pmd; } + +#ifdef CONFIG_MMU +static inline bool pte_exclusive(pte_t pte, struct vm_area_struct *vma) +{ + return pte_dirty(pte); +} + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +static inline bool pmd_exclusive(pmd_t pmd, struct vm_area_struct *vma) +{ + return pmd_dirty(pmd); +} +#endif +#endif /* CONFIG_MMU */ #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 pte_exclusive(pte_t pte, struct vm_area_struct *vma); +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +bool pmd_exclusive(pmd_t pmd, struct vm_area_struct *vma); +#endif #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 5b4c8f2fb85e..702650eec0b2 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 */