From patchwork Tue Jul 10 22:26:26 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: 10518219 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C4E1600CA for ; Tue, 10 Jul 2018 22:33:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EFA92623D for ; Tue, 10 Jul 2018 22:33:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 731BA28F39; Tue, 10 Jul 2018 22:33:17 +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=unavailable 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 0B3C22623D for ; Tue, 10 Jul 2018 22:33:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16D5A6B0292; Tue, 10 Jul 2018 18:33:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0FBC36B0294; Tue, 10 Jul 2018 18:33:13 -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 E11106B0295; Tue, 10 Jul 2018 18:33:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 9C8226B0292 for ; Tue, 10 Jul 2018 18:33:13 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id p91-v6so13271858plb.12 for ; Tue, 10 Jul 2018 15:33:13 -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=wQcGbsB/ofZc6dS2bFwEBoKCU1p+6qlp5orYA5TsQBE=; b=N4mdsHY/nTJzDpUO1brL4Phu0uRSCyYCxcHKN0WrSD2CPzXxci+Ym+QUyYDs6DrjVF oRMWNKgfF/sQEDMcS2adbaEFlHPQTtKO+rzw4UIaGe4lCVBUAjOn+3BptTzJJI15ra0E kdJjvbHOP63OnvjNAJKIyY8Ej680ra8KC79EvDiWIP5+njR5YJe5mIb4ceHL0zjms+xT SH4JYkFSo32ZXD6as86TAJ2UPrUiYvAA62hyoh06V4W+rz6vxbHFanK3qaMKuL3Asd3x LJ7O8XiaWN6CNzbcJZ/mp/kRHHuEjrYd/GUVehNTz9jDoNvHsf2P6n7dLnIICBUMk8cH 10CA== 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: APt69E0+6A6JkqUx77IacawSg0b7a3J8umeHJZ/7FmsXB27lgTmfU/3I wmTkZi6GgDB4FwxvXPCw12cHwly+j5snshXsX1iT+r+TpeFJM7oTQ7Unn3vXAUh39Mo9fRVZRjI /qignZdY2VU/KvEg3HNtmxvk3z5s5ir660sbVXKjJA8IcZgJNfB15C7IR+6rC53mCwA== X-Received: by 2002:a17:902:6b86:: with SMTP id p6-v6mr26508098plk.75.1531261993333; Tue, 10 Jul 2018 15:33:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeT/gdQyth78xAa2Qm/5nDX37ae1MqItUj0przTmEngG+v8Hr6bIuiNviLqjSio3Cnktz6+ X-Received: by 2002:a17:902:6b86:: with SMTP id p6-v6mr26502824plk.75.1531261874750; Tue, 10 Jul 2018 15:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531261874; cv=none; d=google.com; s=arc-20160816; b=nCuzhws/1UNiUBw0q4YfugW8LH9gp+c+WWBBRzK5JrJFy24hZyyeOql/y8SxR3SMcI GZmf92ZrMsPh+6PDuoLl50sGzylbt5NESpDrM0QFrdeVhQbE7iJee78bjL+btgcqnRVE rlYw3Xuh8DyIc0FYZStT1XfwYas2ODW1Yd8GWNVrpjx0wC3QF5xlVCgjQ/3VzEJ0H4KJ dhHgm0EXkOuEagsEcOzkD09wrpGSj6mS4FKZ1UMn+1BuJkmZ3grdidIy+GegcUMVqcFh vydscUExTWrQ+ikRIiAIAuZASjTn7NVBDruYhVpsj+zUKkDXE+lFGFL225xLiedcK8wD NrwQ== 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=wQcGbsB/ofZc6dS2bFwEBoKCU1p+6qlp5orYA5TsQBE=; b=IDYxyNeXHrzP0GjA02EYZySvyorE5pn3DwrPFtsX6cyjF2iemYjZCcxrJAchIsupeq hfobYnU3p7kCYuXuhagcQW64iKuaEGJQv5x8JZfAvZYipxpKpUlZPJ49E+5X7c3dMigo zulBH2ZVlotM49fFawjvbbtGko68FvSfuzI0vXanPPBDa4U1p14g8Wl7RiPTXWy9cfAn belbhriNkedxRAPnss1xNpOVr6mR3X9g7TlJ3SpGDvtR+AThe625LJ2TYCxweVE7+E4z vymEbWALqITYg3nUUjXVFJo9Vu2LmAbbhj90kB1zKutmARdHaWrUr19HNE+vON5eHYD5 gBxQ== 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 31-v6si17386340plz.217.2018.07.10.15.31.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 15:31:14 -0700 (PDT) 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 fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 15:31:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,335,1526367600"; d="scan'208";a="70305417" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga004.fm.intel.com with ESMTP; 10 Jul 2018 15:31:13 -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 v2 14/27] mm: Handle THP/HugeTLB shadow stack page fault Date: Tue, 10 Jul 2018 15:26:26 -0700 Message-Id: <20180710222639.8241-15-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710222639.8241-1-yu-cheng.yu@intel.com> References: <20180710222639.8241-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 --- mm/huge_memory.c | 8 ++++++++ mm/memory.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1cd7c1a57a14..7f3e11d3b64a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -597,6 +597,8 @@ static int __do_huge_pmd_anonymous_page(struct vm_fault *vmf, struct page *page, entry = mk_huge_pmd(page, vma->vm_page_prot); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); + if (is_shstk_mapping(vma->vm_flags)) + entry = pmd_mkdirty_shstk(entry); 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); @@ -1193,6 +1195,8 @@ static int do_huge_pmd_wp_page_fallback(struct vm_fault *vmf, pmd_t orig_pmd, pte_t entry; entry = mk_pte(pages[i], vma->vm_page_prot); entry = maybe_mkwrite(pte_mkdirty(entry), vma); + if (is_shstk_mapping(vma->vm_flags)) + entry = pte_mkdirty_shstk(entry); memcg = (void *)page_private(pages[i]); set_page_private(pages[i], 0); page_add_new_anon_rmap(pages[i], vmf->vma, haddr, false); @@ -1277,6 +1281,8 @@ int 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); + if (is_shstk_mapping(vma->vm_flags)) + entry = pmd_mkdirty_shstk(entry); if (pmdp_set_access_flags(vma, haddr, vmf->pmd, entry, 1)) update_mmu_cache_pmd(vma, vmf->address, vmf->pmd); ret |= VM_FAULT_WRITE; @@ -1347,6 +1353,8 @@ int 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); + if (is_shstk_mapping(vma->vm_flags)) + entry = pmd_mkdirty_shstk(entry); 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); diff --git a/mm/memory.c b/mm/memory.c index a2695dbc0418..f7c46d61eaea 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4108,7 +4108,13 @@ static int __handle_mm_fault(struct vm_area_struct *vma, unsigned long address, if (pmd_protnone(orig_pmd) && vma_is_accessible(vma)) return do_huge_pmd_numa_page(&vmf, orig_pmd); - if (dirty && !pmd_write(orig_pmd)) { + /* + * Shadow stack trans huge PMDs are copy-on-access, + * so wp_huge_pmd() on them no mater if we have a + * write fault or not. + */ + if (is_shstk_mapping(vma->vm_flags) || + (dirty && !pmd_write(orig_pmd))) { ret = wp_huge_pmd(&vmf, orig_pmd); if (!(ret & VM_FAULT_FALLBACK)) return ret;