Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp3928984ybv; Tue, 25 Feb 2020 09:50:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxz6uupxdJ0piZ7NVIIgUNgUbhzLUnZ8MyWIWc/7cNW/jwABqn8dHml8/R46lmidRqTPImu X-Received: by 2002:a9d:170a:: with SMTP id i10mr45315054ota.284.1582653028596; Tue, 25 Feb 2020 09:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582653028; cv=none; d=google.com; s=arc-20160816; b=C7VrR8F2Rl/r95LA/5vqQHJa6gmZeAZzjU3VAj6B7ypQfzHZDWrmjuJWZ07iTWWGCk sE2n8huyMEgyPZ4ohhl4UMnEIjIF/oM5yHjTs5YQ5IdgyZohT0Zzo1vVZdwneZuwsYsH nybMlRXiE3T73EchKbnlQXxKSbDhrkS7JfOHgtqrVZKmuphxZybYAJgJi1PmSxFynM0H Nx5jFcpKdHgdalx0fj2QXZo8tsEU36kv3jkvXEmJazjPa964QiYGAGnfhxAwhiNukj7I K7ZMH4lK/x6tGY5aPYjl3uF7A+NKs87VnWY2/qKfMY3cbVHhZaZ87bEEVlsCTqGMlerL thSg== 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=v5A4nhMzhrglSWKhDslo4P9BqUUmRAZMeQr2iqlO6typkwSLGHpWcKXZDmoA2NCb6F 1hZcCqHKzJOyTG508WqD0o2K3RxUEGx+IneTOo72iK/IQGWV871U0x7+36zKBGKN+D9P GS2JTuBkztKyPeZl6rPuxSLjZifazkQlmHZrJ1QyTHYgisR4bcUE9lDFBJSHq/DJXCgn OgdnNtXj2vXcSbae9aVjHH2iOM+BAAaYLFh7YRbOfGbPujtdHiW2UneToVApa8siNLXH 7CGHmBT1fMpqvo/gRVJuDPl5k7O62r4H6TqASYqA9aIcoZWSvr7sLuAMZn0Tfi5XBNi4 F4tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=EyPcT46l; 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 x9si7345695oia.238.2020.02.25.09.50.16; Tue, 25 Feb 2020 09:50:28 -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=EyPcT46l; 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 S1730958AbgBYRj4 (ORCPT + 99 others); Tue, 25 Feb 2020 12:39:56 -0500 Received: from mail-qt1-f201.google.com ([209.85.160.201]:41514 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730704AbgBYRjz (ORCPT ); Tue, 25 Feb 2020 12:39:55 -0500 Received: by mail-qt1-f201.google.com with SMTP id z25so263245qto.8 for ; Tue, 25 Feb 2020 09:39:53 -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=EyPcT46lQh9aSHtmCQLytlqbk6ZyOPPLjYX5wx5scKW+7DdNTGkOrtr8WuC5C5A+kK M2BFBAAJx6JVs3WDRKsHQLLRO9BpOo3t8S+EeXvYD98qVLGaIk4n8lhxVg48BDxFZjs5 Nc6k34FDhn5xt3oOYDagP97Jkr+plBtRe7++kD55djqzKodwN+PGU4IxKwvZGNmFBXDd 8QcN5Mdz8zndha20IVl5BB1PTfJZ9LIAOFGvbOHNSUOX3dDBBKVjDDteDI9+2tlyB8v+ Ocw5Df3CWfNU1rJlsPH4eLU/NoQ8/uHEpJR3GieaNAhgxd6/Vv7NFoxf5lF0teYb4qv/ fWJQ== 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=NYNbNnHpWfB0w1tySigTC3wkoU2TDVFeUTh4CgnYUkDbxM0HM+YBoxYDL6Q1OOdVrd LGoV3h8D8Zzo4yMN4MfHA1oQPOuRZ8CLLG6HpDXNOVD83WkGSl6weyK7wPTOLo/4NWbB wv4Uxejwnqcjdy6w/8QI89j7f2c1VKlZEiekjBIEIdkh3Q/OXZEfnVE8oxEyeOj5yOvK 8UuJZyyodZfTUxQeGsMxTSMTrx4HgNRBJuNTo69CrGeLzrienmkMt2GLiH5ZNu++b/q+ S+gFZVwMJZjZm0ORgfjNd6Se5hog1paOatwVuIq+I4l7TTlaxoj1H98wvJYAxPVS8Cl+ 8zmQ== X-Gm-Message-State: APjAAAXTauzEqHcwW4lXqYEgonRmLtFbTQVF17k81OL4XnB18rMDzvh6 T1ukLgZZt+Z8OCu5UErDeWtVUn23LE0LZan/2J8= X-Received: by 2002:a05:6214:1874:: with SMTP id eh20mr53245231qvb.122.1582652393129; Tue, 25 Feb 2020 09:39:53 -0800 (PST) Date: Tue, 25 Feb 2020 09:39:24 -0800 In-Reply-To: <20200225173933.74818-1-samitolvanen@google.com> Message-Id: <20200225173933.74818-4-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20200225173933.74818-1-samitolvanen@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v9 03/12] scs: add support for stack usage debugging From: Sami Tolvanen To: Will Deacon , Catalin Marinas , James Morse , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Mark Rutland 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