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=ham 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 378F8C43460 for ; Fri, 9 Apr 2021 15:25:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BF0B8610CF for ; Fri, 9 Apr 2021 15:25:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF0B8610CF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 28E506B006E; Fri, 9 Apr 2021 11:25:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 23E626B0071; Fri, 9 Apr 2021 11:25:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0920C6B0072; Fri, 9 Apr 2021 11:25:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id DDD316B006E for ; Fri, 9 Apr 2021 11:25:50 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 983DB8248047 for ; Fri, 9 Apr 2021 15:25:50 +0000 (UTC) X-FDA: 78013203660.25.D7AC58D Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by imf11.hostedemail.com (Postfix) with ESMTP id F17B9200024C for ; Fri, 9 Apr 2021 15:25:43 +0000 (UTC) Received: by mail-lf1-f48.google.com with SMTP id b14so10299407lfv.8 for ; Fri, 09 Apr 2021 08:25:49 -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=ce6m/UIYgJRrvW7RSWTVG0DWr0xVOqVU43L3DVJ9fRM=; b=yjbbIWyxQB6ZNUWgWfXJj3TAnOTe4JM6fJUMA5SEQGFwbrcyHgQFh7RRX3fMjsJ/xx oyp07+etBQnRQM/45znSt5gvJUkKaV/U8P16uBLY5/5q2Ox/X1QE8iHhmrogr857yYND y6+yyooKI4LUiqOlnFAqI6Y/g0e4hrZtP2vIpCvyeXtba+XlKfyQ/cQN1+u56KPvAJsh WZT11/5zIkeJ5jAiwNriUs9WFOSvs/96XRhwFVKfF2IYmUea2Ht83hRyv99gYlnAspzl +rPgQdI4fCf0Lj1rH0HVobtyCnaLofrLFNi3F2KG6RO8RetuxutaZEP9TAP9K7EpTjwx fLBQ== 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=ce6m/UIYgJRrvW7RSWTVG0DWr0xVOqVU43L3DVJ9fRM=; b=Nft+vKBw/kXQLL5Uc1j2fBnR9L9Kocff4ByW/4x3l+tbfnXkSbpgZCB9UCQkn0w2vJ 7Y/Qjw5GAfxESdYOW+FdHujlccqxGCaCqhEkBc3gfILgBiDou8T3KIXfmWfflNRQa0b3 9eUMg4QCi5w62cNUXqVyKCDWiaQOHR00HcVcXDwPeMxZPThpU1egcnpXIIaJxzwM9Eh7 2jp3MxASmy5RAVnE9SSaqSTQ2tuCk68aV3dd5yH4xnqvrX65uiiMnAMYZ3jtiKm5mDJe LzuJMov4GE7V4CPnUtXTzUfBoYF7i8g+wFG1areUDWaGO9Slsod2xw+p2bkPeH4JpBq2 fr6w== X-Gm-Message-State: AOAM5331BcdxMf3kFSK17WXq1rR0tevQMmvkSjI+Gh0ztirPpIUou2Nd w9MIkj++QxcAXaLJGM6CJsMleQ== X-Google-Smtp-Source: ABdhPJxFBsu79jPxCQidLtLR6o7KuhwUDppH8nwIit73lLNAUMKcEtfajg/yu084AD0cUS8KP90s1A== X-Received: by 2002:ac2:51de:: with SMTP id u30mr10804713lfm.550.1617981948362; Fri, 09 Apr 2021 08:25:48 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id m19sm307113lfl.170.2021.04.09.08.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Apr 2021 08:25:47 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id 58AB3102498; Fri, 9 Apr 2021 18:25:47 +0300 (+03) Date: Fri, 9 Apr 2021 18:25:47 +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 v24 18/30] mm/mmap: Add shadow stack pages to memory accounting Message-ID: <20210409152547.ljbcoqrqyej7ojxs@box.shutemov.name> References: <20210401221104.31584-1-yu-cheng.yu@intel.com> <20210401221104.31584-19-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210401221104.31584-19-yu-cheng.yu@intel.com> X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: F17B9200024C X-Stat-Signature: 4fqpuk8mc34yzwi3iyezg985cbknyqiw Received-SPF: none (shutemov.name>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=mail-lf1-f48.google.com; client-ip=209.85.167.48 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617981943-404024 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: On Thu, Apr 01, 2021 at 03:10:52PM -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 > --- > v24: > - Change arch_shadow_stack_mapping() to is_shadow_stack_mapping(). > - Change VM_SHSTK to VM_SHADOW_STACK. > > 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 e778dbbef3d8..212a8c1fe5ba 100644 > --- a/arch/x86/mm/pgtable.c > +++ b/arch/x86/mm/pgtable.c > @@ -897,3 +897,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 is_shadow_stack_mapping(vm_flags_t vm_flags) > +{ > + return (vm_flags & VM_SHADOW_STACK); > +} No, just define it as you have here in linux/mm.h. It will always be false for !CONFIG_ARCH_HAS_SHADOW_STACK as VM_SHADOW_STACK is 0 there. This maze of #ifdefs are unneeded. -- Kirill A. Shutemov