Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp6395267ybv; Tue, 18 Feb 2020 16:09:31 -0800 (PST) X-Google-Smtp-Source: APXvYqzzyKKMFa7UovHj38s9oMGWdNad874yzv2oCKzZePUXOnmCV8+epq85/kWA9GuadnDcBAe7 X-Received: by 2002:a9d:7852:: with SMTP id c18mr16924240otm.247.1582070971290; Tue, 18 Feb 2020 16:09:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582070971; cv=none; d=google.com; s=arc-20160816; b=G2vRzu+hIYFZ+4dga2Y1ZFujpoU3iTW1UP46NU37TlgSjKF8FFBoniONK85Q9hQmtV bDuy2o2jGAIdrqOPamul3pFEmkAeLo0Q0ZrLvzbGH60hu+VdqGIcaTWu3TT8gUOx435I ygbvXqexdkHHySxY6g7mmRzzaW/hnFLL4MhAJRBivH/xjjxzaA+eXTTnYhFkqm6JeCbD gvtQtdSiERXA45eE0hk0lPIGY/9XXsu0hnRcuK1Cwe672Y/gmhkh5B86txnk71NuWAdD vD52Xp2IXUwGCBRsY+OyvkcaX20sDq9tDCl6kwCygVw0B4jUTzzTN7f3MSuwvvS56tm+ anSA== 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=0f/RzoyEatytyatThC+F3eOfN2v+QCCQ4NfkPjtyieo=; b=j01ydB6Qhjvj6STjEwrM6mS+2+yExCW7PwnH2R++1IBy90Q6UemW/WldEAxL0OXDQS l7IYrQ5vOleL3WDv+ZgpvJ98Wyw698c0iAsJ9vKkSKqvxgGvZoQun/mmdPSOrpb5XuJ9 iEbYv9jl7rBMiizdYkYo/m48xdK+Su9Z8Efr7XsFAA0/MyKay0dZEmc+3aFz5zoxa1xy Ul0FgE9Ir/7pYV5FWLspiRtnxuYFFr8+8hQ+H92myTJApRCpbp1sXmKv+mNzmm7LaUqW FB0JHz1d6u8MUEfkahKFq7D8uQ43p8wdDkQh12Qto0HCXty9y4GKtNF/Lc4ic1iuMPE4 Ewgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="cu/THgoI"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id d6si8736996oic.190.2020.02.18.16.09.12; Tue, 18 Feb 2020 16:09:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="cu/THgoI"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1727680AbgBSAIi (ORCPT + 99 others); Tue, 18 Feb 2020 19:08:38 -0500 Received: from mail-qv1-f74.google.com ([209.85.219.74]:43835 "EHLO mail-qv1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726482AbgBSAIh (ORCPT ); Tue, 18 Feb 2020 19:08:37 -0500 Received: by mail-qv1-f74.google.com with SMTP id z9so13488318qvo.10 for ; Tue, 18 Feb 2020 16:08:36 -0800 (PST) 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=0f/RzoyEatytyatThC+F3eOfN2v+QCCQ4NfkPjtyieo=; b=cu/THgoI4tMw6Hv/cnWQTiNWXWXUr6AKTVvfgPfzSMLj0kWYcpifZKdSq6w1+DteE0 kXx8mLdQVe2X1IQWWOSR6Mh+Qa+NPbQfhsSgJqX39vvszx480CLksDEmmIFQd2vxoqY3 1dP0HJ2lDnH66hEZo0ZFi1oE3hkU0IZ8oCsB7mmk/3IFcSboHkCVWkxpT1HW+h7VC1n7 yOmJd+ZtmnwfszU5a6Kt86Lcv2GGAwqezGTfzkaF0JiBJgiasqm6vEx4C8j7oNaglBnU JfJ9UsRRTrbO7JD+RSG6YqwZQYiUQK+KI9Aw/1esMS/y9pSezRReN3CDnTr6Mdf4Z3gi lu3A== 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=0f/RzoyEatytyatThC+F3eOfN2v+QCCQ4NfkPjtyieo=; b=iw8tXt2eENStRnai0dhBC3O7oWIJy9Cjea69NiZx8sKPXgw1ptY1IgR/zezc9EWYy5 qLGCewqRBt4Mpi9utdBbFYNhpDSheZ+suEPBoFr12yWH22EGC0llEuqrAjkNoRrEoMva xTJXNM86+CSxiigpQveIbj6Gqi3xEBw44fy9iK3u8g74+z/+cH7exHCySNHpt7aszeyE nDXwZVjkbMk41vlY9k0QkfbbdsT8GIo5ohFZccQCx2Cbu1SIsdHEOVXL4SgmWgllrUIl XgLwJ0S36l6bPezj/SQkjxduRguKoJQS24WmHjw5pY/e08UZ213OX3UYN1Pz7zbSLJUn z7uA== X-Gm-Message-State: APjAAAVO31rnC9iz7Uaa5hco7qG6Oib6k4Do4XJOu+UjBZLdZ4GAQ7+e dIDrWWzEtodBVGR1jZpMsusrRzSBuGV47O/5dFE= X-Received: by 2002:a37:4e89:: with SMTP id c131mr22333834qkb.5.1582070915273; Tue, 18 Feb 2020 16:08:35 -0800 (PST) Date: Tue, 18 Feb 2020 16:08:08 -0800 In-Reply-To: <20200219000817.195049-1-samitolvanen@google.com> Message-Id: <20200219000817.195049-4-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20200219000817.195049-1-samitolvanen@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v8 03/12] scs: add support for stack usage debugging From: Sami Tolvanen To: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Mark Rutland , james.morse@arm.com Cc: Dave Martin , Kees Cook , Laura Abbott , Marc Zyngier , Nick Desaulniers , Jann Horn , Miguel Ojeda , Masahiro Yamada , 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.25.0.265.gbab2e86ba0-goog