From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE7F6C433E1 for ; Mon, 22 Mar 2021 10:58:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C119C6199E for ; Mon, 22 Mar 2021 10:58:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230452AbhCVK5j (ORCPT ); Mon, 22 Mar 2021 06:57:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230292AbhCVK5Y (ORCPT ); Mon, 22 Mar 2021 06:57:24 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 792FBC061574 for ; Mon, 22 Mar 2021 03:57:23 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id b83so20520034lfd.11 for ; Mon, 22 Mar 2021 03:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=cVr1sX6u9OvOpr4j5MVGPdeMSVsRDw26Oh3Yu5epGx0=; b=ow55ypOvBq7E09U12yfhRBcRicdeKkGdFg8cXxMbuaLfv5/KuKTp6sw6xiZAyAaqd8 Jo7YZ+mzz7iPBNJWzffewsliAV9XY1EnmLgyyNRkIrXWlOz0d1z/iXI5POBSPu83hNEu mgVBs2wOYrssur4t2FpRZKnaiLpCNaI9drlSZlPZcN+k7muGp7jIe/qx4n07o/qMR3bs uj2fpJ6vHTvAJYOHwOK7yM+q56Ifz89dKALXekBVxkV74irPrXhpe6mXkAP3yfSpmtbD 1Fbw8b3Khqu4HNPVGB14/JbGLb6gneHV4LZEm+qiRgD7stgdaeqg1p4D/+Cvp6abiVWC D8kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=cVr1sX6u9OvOpr4j5MVGPdeMSVsRDw26Oh3Yu5epGx0=; b=JdQdWSAdaGgiaywrcfMH8vgaLySPS57bcVOx6GT6zQoiO0orX1e6/m38caG/YqTDOx 3mKAcEtYyl1cP6mwS5PAMLVgTdh952fR5yCIGU6IysdV5JQDMUGVfLzsFkY1m5++PdhU +rH9Hr3Z7CqdqOrVNMjmkBtsJFQTuS90UxBslrqf4vmiIbzci+oC0rX8oUe/SADZPE3+ 5aExVUd7H/Gn4SajQAwyTMlK6UlEu3nUm9GSxBwuvYZbWdl/H9kNQEEbN5JfTOaa0mJS HjhgK18h9rTSgj8WifxN6/1osq1Ui5v0cgeCBT5ugT57Z1cXExI0j6wzA2x1MLY1H7+k YX5g== X-Gm-Message-State: AOAM530kwDt1THGmh/c6eO/460G8WEu7IBabImkCfNF+ehNnUJB2b+Mx FJF8OIcPFfoACDF+KMy244CFpQ== X-Google-Smtp-Source: ABdhPJzmQMsz7WtlL2kKU9WbwE31eqU1Nt4u/UUp1SHPGJjOfkOYnfU7tZTIeNg6TnAa9jMh5ZQnYQ== X-Received: by 2002:ac2:5974:: with SMTP id h20mr8866285lfp.554.1616410642003; Mon, 22 Mar 2021 03:57:22 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id n5sm1539209lfh.173.2021.03.22.03.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 03:57:21 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id 19A76101DEB; Mon, 22 Mar 2021 13:57:29 +0300 (+03) Date: Mon, 22 Mar 2021 13:57:29 +0300 From: "Kirill A. Shutemov" To: Yu-cheng Yu Cc: 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 , Borislav Petkov , 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 , Dave Martin , Weijiang Yang , Pengfei Xu , Haitao Huang Subject: Re: [PATCH v23 18/28] mm/mmap: Add shadow stack pages to memory accounting Message-ID: <20210322105729.24rt4nwc3blipxsr@box> References: <20210316151054.5405-1-yu-cheng.yu@intel.com> <20210316151054.5405-19-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210316151054.5405-19-yu-cheng.yu@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 16, 2021 at 08:10:44AM -0700, Yu-cheng Yu wrote: > Account shadow stack pages to stack memory. > > Signed-off-by: Yu-cheng Yu > Reviewed-by: Kees Cook > --- > arch/x86/mm/pgtable.c | 7 +++++++ > include/linux/pgtable.h | 11 +++++++++++ > mm/mmap.c | 5 +++++ > 3 files changed, 23 insertions(+) > > diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c > index 0f4fbf51a9fc..948d28c29964 100644 > --- a/arch/x86/mm/pgtable.c > +++ b/arch/x86/mm/pgtable.c > @@ -895,3 +895,10 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) > > #endif /* CONFIG_X86_64 */ > #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ > + > +#ifdef CONFIG_ARCH_HAS_SHADOW_STACK > +bool arch_shadow_stack_mapping(vm_flags_t vm_flags) > +{ > + return (vm_flags & VM_SHSTK); > +} > +#endif > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index cbd98484c4f1..487c08df4365 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -1470,6 +1470,17 @@ static inline pmd_t arch_maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma > #endif /* CONFIG_ARCH_MAYBE_MKWRITE */ > #endif /* CONFIG_MMU */ > > +#ifdef CONFIG_MMU > +#ifdef CONFIG_ARCH_HAS_SHADOW_STACK > +bool arch_shadow_stack_mapping(vm_flags_t vm_flags); > +#else > +static inline bool arch_shadow_stack_mapping(vm_flags_t vm_flags) > +{ > + return false; > +} > +#endif /* CONFIG_ARCH_HAS_SHADOW_STACK */ > +#endif /* CONFIG_MMU */ > + > /* > * Architecture PAGE_KERNEL_* fallbacks > * > diff --git a/mm/mmap.c b/mm/mmap.c > index 3f287599a7a3..2ac67882ace2 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1718,6 +1718,9 @@ static inline int accountable_mapping(struct file *file, vm_flags_t vm_flags) > if (file && is_file_hugepages(file)) > return 0; > > + if (arch_shadow_stack_mapping(vm_flags)) > + return 1; > + What's wrong with testing (vm_flags & VM_SHSTK) here? VM_SHSTK is 0 on non-x86. > return (vm_flags & (VM_NORESERVE | VM_SHARED | VM_WRITE)) == VM_WRITE; > } > > @@ -3387,6 +3390,8 @@ void vm_stat_account(struct mm_struct *mm, vm_flags_t flags, long npages) > mm->stack_vm += npages; > else if (is_data_mapping(flags)) > mm->data_vm += npages; > + else if (arch_shadow_stack_mapping(flags)) > + mm->stack_vm += npages; Ditto. > } > > static vm_fault_t special_mapping_fault(struct vm_fault *vmf); > -- > 2.21.0 > -- Kirill A. Shutemov