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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 224EBC433F5 for ; Tue, 4 Oct 2022 00:03:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EC756B0072; Mon, 3 Oct 2022 20:03:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 84EA76B0073; Mon, 3 Oct 2022 20:03:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69F806B0074; Mon, 3 Oct 2022 20:03:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 527426B0072 for ; Mon, 3 Oct 2022 20:03:49 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1D2C61602F7 for ; Tue, 4 Oct 2022 00:03:49 +0000 (UTC) X-FDA: 79981318578.30.37CFA59 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by imf07.hostedemail.com (Postfix) with ESMTP id 81A0240003 for ; Tue, 4 Oct 2022 00:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664841828; x=1696377828; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=Os63+EX8WH0KuFh3ggC0GBsbdgmNnf/a/c28uddDCRs=; b=V6IuI8d1x9JnkCwxzlEVSTk0v9cDYJQNNWGsdWDNj5B37Cu8ijS/BrC7 L3JXlwREFX3wzygNXLNtTU7okmbW4pJanb4Mml8q48nMeWxDq/I9KoEST bIGAB/oB9iWo4wqVpko9q9Sw/f3hOtJBcqh9+RUUZj+x68o8d/Xak4rkV duNup72EpZoxl+oEhnuFaos8Hcwm8bjeiZnAjT/+Xm4eGiNFXn3BZ0hyf bfhROjdGy1DI/EdGQfp0qNCXU+PgXvl8d4DfCOOUs7jKrby02NuRQLXwe KpLJsHyn1aJocC61r4Q7N+IG4inCMpu87HCDCEtkliMyIJZlCMr1PezdP g==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="364689856" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="364689856" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 17:03:46 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="656943083" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="656943083" Received: from bandrei-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.37.219]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 17:03:38 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 659E3104CE4; Tue, 4 Oct 2022 03:03:36 +0300 (+03) Date: Tue, 4 Oct 2022 03:03:36 +0300 From: "Kirill A . Shutemov" To: Rick Edgecombe 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" , Weijiang Yang , joao.moreira@intel.com, John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, Yu-cheng Yu Subject: Re: [PATCH v2 19/39] mm/mmap: Add shadow stack pages to memory accounting Message-ID: <20221004000336.cpuats6iamw5ob3h@box.shutemov.name> References: <20220929222936.14584-1-rick.p.edgecombe@intel.com> <20220929222936.14584-20-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220929222936.14584-20-rick.p.edgecombe@intel.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664841828; a=rsa-sha256; cv=none; b=uLiWAIUxSW+U33mHrJz1mrxbYNxG9x0vBrd7uMOooxNmB6RZ/FHfVtCsiyVTMEe9aBzkHP 0jrI02svwzkkP1Ad3n69gWM9IjbbRVgX8wruBvTw8T8Jg6tqZKfBKorrs44USleHVV6nx+ dwzpmQsIWbSiEsBZMfWSFL0us+1ecY8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=V6IuI8d1; dmarc=fail reason="No valid SPF" header.from=intel.com (policy=none); spf=none (imf07.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.31) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664841828; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=clbOVo6ui6rhZVYi6ypZyXSB2Q4+tqXLf5XrsaXYRJs=; b=D3pj/fBtckGPZhmK4LKzDvVZ/vc57IoRwdJrV6bgX15Dhkr83g/tJbIPzr3eeTS2i3B8Am rsq7fve6HjUQGF1zrY/ZRRXMm5JhrxPRTAEyjGQ5e9/5zmcXIPyMAh8o9KK7edZSSw0ubZ Hh0SxM07+TDMu6k2sdW72s7RhMyPNe8= X-Rspam-User: Authentication-Results: imf07.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=V6IuI8d1; dmarc=fail reason="No valid SPF" header.from=intel.com (policy=none); spf=none (imf07.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.31) smtp.mailfrom=kirill.shutemov@linux.intel.com X-Stat-Signature: dzrfpub4rsayjbyemiaoc3utsy9bwcmk X-Rspamd-Queue-Id: 81A0240003 X-Rspamd-Server: rspam09 X-HE-Tag: 1664841828-422356 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, Sep 29, 2022 at 03:29:16PM -0700, Rick Edgecombe wrote: > From: Yu-cheng Yu > > Account shadow stack pages to stack memory. > > Signed-off-by: Yu-cheng Yu > Co-developed-by: Rick Edgecombe > Signed-off-by: Rick Edgecombe > Cc: Kees Cook > > --- > > v2: > - Remove is_shadow_stack_mapping() and just change it to directly bitwise > and VM_SHADOW_STACK. > > Yu-cheng v26: > - Remove redundant #ifdef CONFIG_MMU. > > Yu-cheng v25: > - Remove #ifdef CONFIG_ARCH_HAS_SHADOW_STACK for is_shadow_stack_mapping(). > > mm/mmap.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/mm/mmap.c b/mm/mmap.c > index f0d2e9143bd0..8569ef09614c 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1682,6 +1682,9 @@ static inline int accountable_mapping(struct file *file, vm_flags_t vm_flags) > if (file && is_file_hugepages(file)) > return 0; > > + if (vm_flags & VM_SHADOW_STACK) > + return 1; > + > return (vm_flags & (VM_NORESERVE | VM_SHARED | VM_WRITE)) == VM_WRITE; Hm. Isn't the last check true for shadow stack too? IIUC, shadow stack has VM_WRITE set, so accountable_mapping() should work correctly as is. -- Kiryl Shutsemau / Kirill A. Shutemov