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.7 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 28C4CC433B4 for ; Fri, 23 Apr 2021 10:19:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7C4461425 for ; Fri, 23 Apr 2021 10:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242071AbhDWKUF (ORCPT ); Fri, 23 Apr 2021 06:20:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242048AbhDWKUD (ORCPT ); Fri, 23 Apr 2021 06:20:03 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6D63C061756 for ; Fri, 23 Apr 2021 03:19:25 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id q22so14287045lfu.8 for ; Fri, 23 Apr 2021 03:19:25 -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=DfoarHN8kwAUXeJoV8igp0IS84dt9ibxv9mR8xJU6Xk=; b=N4gxmLjoyMwwBm8WYEh44Z64BgAVbj41cZbOESofj5OkvI9ZZNkBsWbN2EDbevRvIy SBclkE6NrLyeXaXxoCG7xRpEGTV3F80TvvhzcXx5GYtgOE3GRgNbTSOJQQJMQrGPLFQ3 7z+kyYkp8wabzPudml5JER5PLLJ9mZgoWXVDHULOcuxarasrGsceUwAPveDoNeShbunk WJO2YCDV3yZsQW0JoI9rNLcNuj877vaZ1qYvbVFsjhJDVB3AaNSzJn5zQYlZEQtxI6u0 uiMmSH80CAutXLRmfstPIss9Ukeru9YM3KuREfO3YgCNPokRpPmsUamLXSPupKY38QlE e2FA== 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=DfoarHN8kwAUXeJoV8igp0IS84dt9ibxv9mR8xJU6Xk=; b=HlqUCv5vq7OYgZYgC/W37WwSDksidmYapQzcONBEa4C/XR9mPO+GMAz4uMit6h94eN mrqjZJmMRKHU35F052TIfGZKFLzF0JRRzA/USq+lelcmokYcow/HWBiTspGX5jJcGcXY 03cnP6fyfZvqSkZMrIH4Zha5SeDWg088ac7mGs3bbkiSjDfjng+lBB2WYDH5JSKZgORT iekk+P+JOcUDJOb1pNoO+gv/4lRl7CEQ05PdidXKDN36EEGXrKWAFG01DUO4bhrCg6/k nuoZ5unPkWKq/BP9Joh91um4e6GgJokXtXJ+DjEj1k1NTKt0KgPRMr6P+WymU0/EF+in RqLA== X-Gm-Message-State: AOAM532T2q/nPVcuTTdE9QatvhLOAoY96kHTRZXhZ39jGBmQbHnL56uo X4I9vhD5SCG31kxKv6rw4I9SMg== X-Google-Smtp-Source: ABdhPJy+j0A4mCMCy6alk/6PYASiRWqO6EYd0pBeEvxN9kQ+2U6i0rK8HvK+JgE0lqpTegscpzOeVA== X-Received: by 2002:a19:f615:: with SMTP id x21mr2374637lfe.540.1619173164189; Fri, 23 Apr 2021 03:19:24 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id c15sm509104lfk.153.2021.04.23.03.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 03:19:23 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id 3260D10257F; Fri, 23 Apr 2021 13:19:25 +0300 (+03) Date: Fri, 23 Apr 2021 13:19:25 +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 , "Kirill A . Shutemov" Subject: Re: [PATCH v25 18/30] mm/mmap: Add shadow stack pages to memory accounting Message-ID: <20210423101925.u5srn6vpyxxgvpso@box.shutemov.name> References: <20210415221419.31835-1-yu-cheng.yu@intel.com> <20210415221419.31835-19-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210415221419.31835-19-yu-cheng.yu@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 15, 2021 at 03:14:07PM -0700, Yu-cheng Yu wrote: > Account shadow stack pages to stack memory. > > Signed-off-by: Yu-cheng Yu > Cc: Kees Cook > Cc: Kirill A. Shutemov > --- > v25: > - Remove #ifdef CONFIG_ARCH_HAS_SHADOW_STACK for is_shadow_stack_mapping(). > v24: > - Change arch_shadow_stack_mapping() to is_shadow_stack_mapping(). > - Change VM_SHSTK to VM_SHADOW_STACK. > > arch/x86/include/asm/pgtable.h | 3 +++ > arch/x86/mm/pgtable.c | 5 +++++ > include/linux/pgtable.h | 9 +++++++++ > mm/mmap.c | 5 +++++ > 4 files changed, 22 insertions(+) > > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index da5dea417663..7f324edaedfa 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -1692,6 +1692,9 @@ static inline bool arch_faults_on_old_pte(void) > #define maybe_mkwrite maybe_mkwrite > extern pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma); > > +#define is_shadow_stack_mapping is_shadow_stack_mapping > +extern bool is_shadow_stack_mapping(vm_flags_t vm_flags); > + > #endif /* __ASSEMBLY__ */ > > #endif /* _ASM_X86_PGTABLE_H */ > diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c > index e778dbbef3d8..69c0ef583c55 100644 > --- a/arch/x86/mm/pgtable.c > +++ b/arch/x86/mm/pgtable.c > @@ -897,3 +897,8 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) > > #endif /* CONFIG_X86_64 */ > #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ > + > +bool is_shadow_stack_mapping(vm_flags_t vm_flags) > +{ > + return (vm_flags & VM_SHADOW_STACK); Nit: parentheses are redundant. > +} > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index 5e772392a379..45b601fa1a1c 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -1446,6 +1446,15 @@ static inline bool arch_has_pfn_modify_check(void) > } > #endif /* !_HAVE_ARCH_PFN_MODIFY_ALLOWED */ > > +#ifdef CONFIG_MMU > +#ifndef is_shadow_stack_mapping > +static inline bool is_shadow_stack_mapping(vm_flags_t vm_flags) > +{ > + return false; > +} > +#endif > +#endif /* CONFIG_MMU */ What the purpose #ifdef CONFIG_MMU? Looks redundant. Otherwise: Reviewed-by: Kirill A. Shutemov > + > /* > * Architecture PAGE_KERNEL_* fallbacks > * > diff --git a/mm/mmap.c b/mm/mmap.c > index 3f287599a7a3..d77fb39b6ab5 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 (is_shadow_stack_mapping(vm_flags)) > + return 1; > + > 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 (is_shadow_stack_mapping(flags)) > + mm->stack_vm += npages; > } > > static vm_fault_t special_mapping_fault(struct vm_fault *vmf); > -- > 2.21.0 > > -- Kirill A. Shutemov