Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3837625ybz; Mon, 20 Apr 2020 10:20:01 -0700 (PDT) X-Google-Smtp-Source: APiQypIq6Tfm3vBAR7+HXrJVWmrwQGNz9VXJjB5iXXgDN1b0QZKw0+4eyBDolUFi/vUGAM6meSf2 X-Received: by 2002:aa7:c886:: with SMTP id p6mr3432030eds.97.1587403201452; Mon, 20 Apr 2020 10:20:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587403201; cv=none; d=google.com; s=arc-20160816; b=dM1pKjjKtQkMVXbaFtrFHmnkCaKiiEu/DZSpDDLgd7YV0f54ZyEXNWLCAz5dPeEUT7 73asDf9+JyBlraHYlPebMGchUIKt2NfuPBtjMKkuzTA4NkV0EtxGj4URyPrqZgVyXguE y12ucuGOjs9FWQGXKZpW0Eqt/J76iMgKMVnmtm1VgRILxXiUMw9I8Iejd6oGzP6pe6jI oOXOkdl9u4K5lzQfQ9Ly3Zui7E3HZsdnyTR4B7xwEINiLSyV8qKfMdHFRPt2x7Hwudv/ eT6eZAgPO7Iudy2QR4Bt740K3uX6W33rTZFkXBecsR58W/ahvmokKx54x3sekUNadAbY lUIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=iQ1dViAIzAeRKEiF1khh6ZpHRSzC0Ybgxz1h8kR5Xzs=; b=rp2RpEh1XFbYmLTVudyyN7a9HRkEwsFxdMWTxmBVqpgjshDvLoqLlbhlvGiShZw19H o+6fdyA6/s/Bdf8EmJxjtSOURGWRd+i5ubEfTLpMHa7dQnvFIfkx6FdQnM5jyNyeAkMM PXEcYo1vEMf/3VO6OXEwIVg4SmN8WqB4pwBQxrtU4duf5Zo1+7LAuPz25+iia55Cpl0r 178gY1fcXUhADuyWJM8gBuN2CwhbmOLhcxrjtcUi4AJwpEYIxxqUDN3ghZG51jkUYJo8 FjETocRscwx6C8zhalEkRMOUXFIOiK5qsj1Zd1IfT+9Djm0v2cWXq7tqamzc3lU799nQ Eh4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=n8kgySIF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g23si933744ejh.437.2020.04.20.10.19.37; Mon, 20 Apr 2020 10:20:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=n8kgySIF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726728AbgDTRSE (ORCPT + 99 others); Mon, 20 Apr 2020 13:18:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:44862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726724AbgDTRSC (ORCPT ); Mon, 20 Apr 2020 13:18:02 -0400 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EEDC02145D; Mon, 20 Apr 2020 17:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587403081; bh=8Cti+W7qcMTc3i7ivCfS06mEpTJP5zYv2iWrbD/RTtg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n8kgySIFfBQIcj6Ia2jB/kXabMFi8z3ZnfxRD6sXtUSU5WkP7GyhdFFnNX9oGyhnV mhWjwdOQ+04RDru0OIhK+bLIVHdU0fkAMOot1o2sNYiPhmoqv95P7YoCTgT0+QheZR P5uQTK0OZzAOJTiqi4PCUeQwAx7St1L9HyeIHsPI= Date: Mon, 20 Apr 2020 18:17:55 +0100 From: Will Deacon To: Sami Tolvanen Cc: Catalin Marinas , James Morse , Steven Rostedt , Ard Biesheuvel , Mark Rutland , Masahiro Yamada , Michal Marek , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dave Martin , Kees Cook , Laura Abbott , Marc Zyngier , Masami Hiramatsu , Nick Desaulniers , Jann Horn , Miguel Ojeda , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v11 02/12] scs: add accounting Message-ID: <20200420171753.GD24386@willie-the-truck> References: <20191018161033.261971-1-samitolvanen@google.com> <20200416161245.148813-1-samitolvanen@google.com> <20200416161245.148813-3-samitolvanen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200416161245.148813-3-samitolvanen@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 16, 2020 at 09:12:35AM -0700, Sami Tolvanen wrote: > This change adds accounting for the memory allocated for shadow stacks. > > Signed-off-by: Sami Tolvanen > Reviewed-by: Kees Cook > --- > drivers/base/node.c | 6 ++++++ > fs/proc/meminfo.c | 4 ++++ > include/linux/mmzone.h | 3 +++ > kernel/scs.c | 20 ++++++++++++++++++++ > mm/page_alloc.c | 6 ++++++ > mm/vmstat.c | 3 +++ > 6 files changed, 42 insertions(+) > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index 10d7e818e118..502ab5447c8d 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -415,6 +415,9 @@ static ssize_t node_read_meminfo(struct device *dev, > "Node %d AnonPages: %8lu kB\n" > "Node %d Shmem: %8lu kB\n" > "Node %d KernelStack: %8lu kB\n" > +#ifdef CONFIG_SHADOW_CALL_STACK > + "Node %d ShadowCallStack:%8lu kB\n" > +#endif > "Node %d PageTables: %8lu kB\n" > "Node %d NFS_Unstable: %8lu kB\n" > "Node %d Bounce: %8lu kB\n" > @@ -438,6 +441,9 @@ static ssize_t node_read_meminfo(struct device *dev, > nid, K(node_page_state(pgdat, NR_ANON_MAPPED)), > nid, K(i.sharedram), > nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK_KB), > +#ifdef CONFIG_SHADOW_CALL_STACK > + nid, sum_zone_node_page_state(nid, NR_KERNEL_SCS_BYTES) / 1024, > +#endif Why not just use KB everywhere instead of repeated division by 1024? Will