From patchwork Thu Oct 11 15:15:13 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: 10636887 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 E0BE5112B for ; Thu, 11 Oct 2018 15:22:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C97412B9DB for ; Thu, 11 Oct 2018 15:22:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCFC02BA3A; Thu, 11 Oct 2018 15:22:09 +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 2540D2B9DB for ; Thu, 11 Oct 2018 15:22:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 010D46B028B; Thu, 11 Oct 2018 11:21:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E8B866B0290; Thu, 11 Oct 2018 11:21:01 -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 B30426B0289; Thu, 11 Oct 2018 11:21:01 -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 57D3D6B0280 for ; Thu, 11 Oct 2018 11:21:01 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id b7-v6so6250989pgt.10 for ; Thu, 11 Oct 2018 08:21:01 -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=ICzAJYaQm7Rxm6UBhR7njAsEqpmzxdHr9fB/FjNVRU8=; b=Bkeq0pEWOEoiWdN6RiZ9QZ1ADBDPvTQ1gYWt0DcOpenqUxY2TWXowcYaOhhCko+2ZM 6IQ6NFWAbAYKDg9EKoq7kHMvTaT/Wg45KUI7/VL6Fur7bRCRWxnhIvxEDhvSBFZeF7lH 0yUiqcJOj2mILjZUDgcS8GKzVzcAeKQZpGoUouNNyUMYkgVQiO6T/RR0tdVVWach8wFC /+IQWYz56krSTpmDRQ+E9SxtLcntD3pJlTzOUfL8Bu96JyopbD7mhtUSetvXW4DcDoc3 sxF3Kb2srh1y4gjA8eOeWsa7aS/T8NkpTf6FBuFGArUx7pr5SEoHDaJHGJWBjEqUXj0j 0DBQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.31 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: ABuFfogiAmSNwn3TPgSiYcfQjixqSvQyeM1tRld/OQobq3BLEgiQJAAT dLQ4h6s/aq7n6HzPD9H2Byqsj8gJXuvjWJZESALt3914q+URk8HpzNm1rZcEyLa1P9JRpl/21ce +LlSg3ztkqH50wQfm/fjIY+0frBmpdFSKVzLEepAm9ct0m2xbeqd3Tjfzo6xLm6JQRA== X-Received: by 2002:a17:902:70c3:: with SMTP id l3-v6mr2061259plt.125.1539271261048; Thu, 11 Oct 2018 08:21:01 -0700 (PDT) X-Google-Smtp-Source: ACcGV61MRRwI3PrYORqZe2DdMdb7GgIKsBdtGmFbTLPvwh9Cpvt/yEv9r+xm9ibl0KBLrvYp2hXg X-Received: by 2002:a17:902:70c3:: with SMTP id l3-v6mr2061208plt.125.1539271260249; Thu, 11 Oct 2018 08:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539271260; cv=none; d=google.com; s=arc-20160816; b=UecrZpIF9YN9xAUK1pq9JESlEV6KkST40b4Kx1gBS6lwgTcqej2lS5GxYmpprMATTH hnow/fLKKS1UU348/rO3/7DK2WIGlt4J8TjEbXLVM0dY8/8bfO3wMWhzhMKghVJjbxU8 ud2t0l+VXMSV712nkaG8OzxsYqb+4RRD7e5cbvgaOFr3snrLVPvbFnArXroMkfMKiFOm RUE9TIYkKb4igkjY1Mss9ODq5EPTLZ4eT4YOOVdSB851Td5k1bP1Q3Rxp5A/GXeCVbvC Il8RY8kvo3Mc0BC4UESnlCJn7SLvOPNJQw/Z0coc2QmB0p0xENMSTUBurdreuRls8QUC ugZQ== 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=ICzAJYaQm7Rxm6UBhR7njAsEqpmzxdHr9fB/FjNVRU8=; b=udg5cr85bVz4ixj7z239B4mptlbzf4rTIIS6zAgQ4fNOEBSYD/hrlULW0aU1Ru9VOZ 6EEKnzxcZEUPounhlUTetBK+RW00aJQOiB5MTXGhseC7fsVibXTYiDT/6u0YpLyP7MH7 u3g1lTOkHFMskWdhiksH1p9jFL/l/QP3pNyi7snC+jWS7iz0v6bjkbh/Sk3BcbUAVtXh g7nnmq8OInQlaGUvp34vmv2vSJD1ZVhXRin+iHtHabWG8gPVLfeqlgX3BQYYoGbedzdB BQ1GBdCoJzPg4ucB4pzpNVqyXVSF2qvh26mO1gHUFlKoAIx1k550yI8K0900y+aug+H3 xMXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga06.intel.com (mga06.intel.com. [134.134.136.31]) by mx.google.com with ESMTPS id g9-v6si6571810plo.328.2018.10.11.08.21.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 08:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.31 as permitted sender) client-ip=134.134.136.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.31 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 orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Oct 2018 08:20:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,368,1534834800"; d="scan'208";a="78019134" Received: from 2b52.sc.intel.com ([143.183.136.147]) by fmsmga008.fm.intel.com with ESMTP; 11 Oct 2018 08:20:45 -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 , 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: [PATCH v5 17/27] mm: Handle THP/HugeTLB shadow stack page fault Date: Thu, 11 Oct 2018 08:15:13 -0700 Message-Id: <20181011151523.27101-18-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011151523.27101-1-yu-cheng.yu@intel.com> References: <20181011151523.27101-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 This patch implements THP shadow stack memory copying in the same way as the previous patch for regular PTE. In copy_huge_pmd(), we clear the dirty bit from the PMD. On the next shadow stack access to the PMD, a page fault occurs. At that time, the page is copied/re-used and the PMD is fixed. Signed-off-by: Yu-cheng Yu --- arch/x86/mm/pgtable.c | 8 ++++++++ include/asm-generic/pgtable.h | 2 ++ mm/huge_memory.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index e9ee4c86a477..864954bda7fe 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -891,6 +891,14 @@ inline pte_t pte_set_vma_features(pte_t pte, struct vm_area_struct *vma) return pte; } +inline pmd_t pmd_set_vma_features(pmd_t pmd, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHSTK) + return pmd_mkdirty_shstk(pmd); + else + return pmd; +} + inline bool arch_copy_pte_mapping(vm_flags_t vm_flags) { return (vm_flags & VM_SHSTK); diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 015b769377a3..7512e4dfd642 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1129,9 +1129,11 @@ static inline bool arch_has_pfn_modify_check(void) #ifndef CONFIG_ARCH_HAS_SHSTK #define pte_set_vma_features(pte, vma) pte +#define pmd_set_vma_features(pmd, vma) pmd #define arch_copy_pte_mapping(vma_flags) false #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); #endif diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 00704060b7f7..6e03e26c1cec 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -597,6 +597,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, entry = mk_huge_pmd(page, vma->vm_page_prot); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); + entry = pmd_set_vma_features(entry, vma); page_add_new_anon_rmap(page, vma, haddr, true); mem_cgroup_commit_charge(page, memcg, false, true); lru_cache_add_active_or_unevictable(page, vma); @@ -1194,6 +1195,7 @@ static vm_fault_t do_huge_pmd_wp_page_fallback(struct vm_fault *vmf, pte_t entry; entry = mk_pte(pages[i], vma->vm_page_prot); entry = maybe_mkwrite(pte_mkdirty(entry), vma); + entry = pte_set_vma_features(entry, vma); memcg = (void *)page_private(pages[i]); set_page_private(pages[i], 0); page_add_new_anon_rmap(pages[i], vmf->vma, haddr, false); @@ -1278,6 +1280,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf, pmd_t orig_pmd) pmd_t entry; entry = pmd_mkyoung(orig_pmd); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); + entry = pmd_set_vma_features(entry, vma); if (pmdp_set_access_flags(vma, haddr, vmf->pmd, entry, 1)) update_mmu_cache_pmd(vma, vmf->address, vmf->pmd); ret |= VM_FAULT_WRITE; @@ -1349,6 +1352,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf, pmd_t orig_pmd) pmd_t entry; entry = mk_huge_pmd(new_page, vma->vm_page_prot); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); + entry = pmd_set_vma_features(entry, vma); pmdp_huge_clear_flush_notify(vma, haddr, vmf->pmd); page_add_new_anon_rmap(new_page, vma, haddr, true); mem_cgroup_commit_charge(new_page, memcg, false, true);