Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1443615ybz; Thu, 16 Apr 2020 09:15:02 -0700 (PDT) X-Google-Smtp-Source: APiQypKqCAHHma/TMXgYor37QflDb5Q3y0AScL08QLSKoB6ZPn0KupzRM19az/2lN3EbAnJED1ta X-Received: by 2002:a50:8e4b:: with SMTP id 11mr15994852edx.329.1587053702523; Thu, 16 Apr 2020 09:15:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587053702; cv=none; d=google.com; s=arc-20160816; b=U7a/3wHnNiftue5UbmT0QSKXSCwxppeu3Bf20UQ0tv0+vCw1DGrRh7UPzKA4F1qaBY 1uVVQvhbMNBNf8YcgxHLWXqM5ZyEnHwmpOd3eWPqXcWBwip6eCpmlybA0L2+2RUl5hx6 sC+rtblHrbD+8YNztSCrlNyzuptfA8/bp/102ETrCaCloY07yl4ta8r3liLZrhC6Rk1w p3AOdKP7WqSq1k0KFvmuTx9+yXAtYocnIp8KrSn/jPdQ4ACUx10vHoCVIjQe5GbLUEHQ ijaeEltirhcw1MaDID+sQjdN8rnIDncLdZ79RmVpdP2KKuMtYkZGkCLWwayKwbQ/lI1N Slqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=0zoCAxwf9k6lfoo3cxV3l2Ts8Ighj8ILmpKvjJbqwvo=; b=oZ/vVbXwnde49q5xUB6U3UtyCcbP4TMPT2ashTxyHfjfOwZ4uKY59QxrDw6yXuuAGt en8HmI4O8BibT+S8sM/qv9uUjI7Kkrh+3Cai/r/+pkgCG8PDqtXyqF7YanVRECfwBFnZ MKdl5++W5bdhW3w7rSH79Y8GtIDjtDJTg6HH028gplKyWYatnfDhfwYHhF+bRMjQuwZV rQStZlLLL7pQ2X2AiNFUS5xStEvyV5tNB/hQMAcqMkColtrgKM/4OObIO46ylFdsuc8X vTr31OUGaLsml4y+Bji46+WOpJU789uGjHDPAJxkT7CISFc/24kctFiHNv6wnIIlsyFF 2HBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=oaXHw4Oo; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x25si3666326eds.136.2020.04.16.09.14.38; Thu, 16 Apr 2020 09:15:02 -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=@google.com header.s=20161025 header.b=oaXHw4Oo; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2506865AbgDPQNF (ORCPT + 99 others); Thu, 16 Apr 2020 12:13:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2506832AbgDPQM5 (ORCPT ); Thu, 16 Apr 2020 12:12:57 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A14CDC061A0C for ; Thu, 16 Apr 2020 09:12:57 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id nk12so3348986pjb.0 for ; Thu, 16 Apr 2020 09:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0zoCAxwf9k6lfoo3cxV3l2Ts8Ighj8ILmpKvjJbqwvo=; b=oaXHw4OoNjSODYtqP+D86dNRDfH9pFvBIgL5AAghUBFYKnrbVWQbiCIYvMoV5G/92q eAijVWC8ga1IgT8f2InqqkXDfvnJOHAfEoJR4Tv3ygcBIFNB+3MRslx3FassUAy0Uatd KTgMwbBl3RKE4Te0j7hl6uSM+q2hHmXvTAE68O2Qqmw80ejmwBmIa/uQIk0Ea6awb4D/ kiUfpIC642BpdAmbbEnAoxCTXQxQ62KaUPmVGWnjnutLyFbIJjdlfDx/bJhA/U7yXFFD en3fX1+ixzUBoNEWIbC1MibOBSiJdNjGY0/wQFmuEOqMPTQHYahJnCQZvu4lXlhPO+Ut 3Uiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0zoCAxwf9k6lfoo3cxV3l2Ts8Ighj8ILmpKvjJbqwvo=; b=hcm3/VdLGQDfO/oCJ+EZYXbL6LwEAG0PJRUslspWAU7KsEkIAss27cfggX5+EQW3Lk dK1lMj1HPVRs3GaqOs90oj7w7IVf0c5ukNpDE7YKC+6VkOvPUKyVGLR5ztjiPZHre2I/ cleUkc/AJG5HQ+yH31J6d0KktgNs21fB0utOT3gdLE6CuZGtF0fm48eNOCMjY2ANGqOL dtMQvA59i2fnnXocF4C5Qk62KKPS1oTK9qOV+5DkBd2f856A9JQcD7QkjWskhRz760Gm WkrF7KIRW3niWGktrHxClnRHb2Ecs71fngt6SO5zlbPOME8JJ9k1QIp3TME9bFzypSU3 483Q== X-Gm-Message-State: AGi0PuZeyAMPoDoUVz8jBjaay5nCQAZYwXS3MHFfndU3Az/bQBPqOZiK tMcQrlLK5Hui84orxrS/bngq8lCG8Z70hn0JT3o= X-Received: by 2002:a63:d049:: with SMTP id s9mr30834027pgi.384.1587053577150; Thu, 16 Apr 2020 09:12:57 -0700 (PDT) Date: Thu, 16 Apr 2020 09:12:36 -0700 In-Reply-To: <20200416161245.148813-1-samitolvanen@google.com> Message-Id: <20200416161245.148813-4-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20200416161245.148813-1-samitolvanen@google.com> X-Mailer: git-send-email 2.26.1.301.g55bc3eb7cb9-goog Subject: [PATCH v11 03/12] scs: add support for stack usage debugging From: Sami Tolvanen To: Will Deacon , Catalin Marinas , James Morse , Steven Rostedt , Ard Biesheuvel , Mark Rutland , Masahiro Yamada , Michal Marek , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot Cc: 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, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implements CONFIG_DEBUG_STACK_USAGE for shadow stacks. When enabled, also prints out the highest shadow stack usage per process. Signed-off-by: Sami Tolvanen Reviewed-by: Kees Cook --- kernel/scs.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/kernel/scs.c b/kernel/scs.c index 5245e992c692..ad74d13f2c0f 100644 --- a/kernel/scs.c +++ b/kernel/scs.c @@ -184,6 +184,44 @@ int scs_prepare(struct task_struct *tsk, int node) return 0; } +#ifdef CONFIG_DEBUG_STACK_USAGE +static inline unsigned long scs_used(struct task_struct *tsk) +{ + unsigned long *p = __scs_base(tsk); + unsigned long *end = scs_magic(p); + unsigned long s = (unsigned long)p; + + while (p < end && READ_ONCE_NOCHECK(*p)) + p++; + + return (unsigned long)p - s; +} + +static void scs_check_usage(struct task_struct *tsk) +{ + static DEFINE_SPINLOCK(lock); + static unsigned long highest; + unsigned long used = scs_used(tsk); + + if (used <= highest) + return; + + spin_lock(&lock); + + if (used > highest) { + pr_info("%s (%d): highest shadow stack usage: %lu bytes\n", + tsk->comm, task_pid_nr(tsk), used); + highest = used; + } + + spin_unlock(&lock); +} +#else +static inline void scs_check_usage(struct task_struct *tsk) +{ +} +#endif + bool scs_corrupted(struct task_struct *tsk) { unsigned long *magic = scs_magic(__scs_base(tsk)); @@ -200,6 +238,7 @@ void scs_release(struct task_struct *tsk) return; WARN_ON(scs_corrupted(tsk)); + scs_check_usage(tsk); scs_account(tsk, -1); task_set_scs(tsk, NULL); -- 2.26.1.301.g55bc3eb7cb9-goog