Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp722664ybl; Tue, 28 Jan 2020 10:50:57 -0800 (PST) X-Google-Smtp-Source: APXvYqzCV4JDcAfwxzpOPJOBoAHCeTLRsOYoyB7iv/U6jE/2aFjFeno/ZZKEV2dqyqDVMeS6oeag X-Received: by 2002:aca:1108:: with SMTP id 8mr3839688oir.127.1580237457694; Tue, 28 Jan 2020 10:50:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580237457; cv=none; d=google.com; s=arc-20160816; b=c30KKhB6YiSSW6QuZP5SzPD0anlR7FPpf98xaXa4YcYnahn5ck93lwe2bGE/4mWTAP PVdppg4BAPo/S7IVHboizMV7/j8yqRw9LZUjrSmcPMNe+wVFG7tWDrqMv2ZOtq+1iA7N 4O25AmWKu076D7is5/xqkw/WGusHCBOF6GbwDLNNwzWvmy+BioYqf9gQ6PRuI62hqhaD cdrom22LmtlFD0PFYNXvCGpVbIVuwmSmuvXUKUdb3W+VLIh+ij3gdXvpA1meByWJ7sVs F9A/g07QBtZOkVUDDkra6Rhs9b0j65WdVMZldd9qxsj81jxNtbG4Q956MbK/zy07qpDq WaAQ== 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=FRYMM1qoPJhfGiG5OWEbx13i+2jzqMbf4H5LKO69CQU=; b=UcjNAU8edj8gm1tmasvopTfYY9MbxjJ7FcleGlAiieCWGpxqbF+QSCaava8P1SKz45 N6/QLw5V0a6acCXA95xH8+oi5NL2jCw3NJcyAdio6ShsPSyI9lUTuxq5cDZv2NA9/GGE YVXvpeLYo9r9tYgsTQUaMGFpiPKzQaA0H+jPEnJcvWyEHl/JZOw7+PGa6sspeSsM0y1H H174VaHJkHomm648fYyaFSU5H2LhD8zlyRZGwqmwuySe+F0h001cMARQoEc7IlwR0c+4 TPTYgZ4b2Qcblh4e700O4iD2OSUvjaG+cCWk/vOZO/y0yozSZ7/mCh2FG0hWj2DilKMB akoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=bFhtOIbc; 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 u12si5479985oiv.13.2020.01.28.10.50.45; Tue, 28 Jan 2020 10:50:57 -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=bFhtOIbc; 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 S1726683AbgA1Stt (ORCPT + 99 others); Tue, 28 Jan 2020 13:49:49 -0500 Received: from mail-qv1-f73.google.com ([209.85.219.73]:43491 "EHLO mail-qv1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbgA1Str (ORCPT ); Tue, 28 Jan 2020 13:49:47 -0500 Received: by mail-qv1-f73.google.com with SMTP id z9so9258831qvo.10 for ; Tue, 28 Jan 2020 10:49:46 -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=FRYMM1qoPJhfGiG5OWEbx13i+2jzqMbf4H5LKO69CQU=; b=bFhtOIbcQrF6W7S50FwloXQv+gTL5Dc0/6XP56oKBenHYm98Yng2U+I5p+qfHPMNP7 mXKjOy2wZeSKsZJWMowesjW4wlTddLLx2SWrJGP1ociyoc0epkZJ195SG9At2F1opp+V URf8CAqfz0aQ5kqzv3bn8idQIQzoYDL09b3SPw8hvTei18qiFg8BWL2mg+W23NxWD4Dn BM/ESuqDVdaUzuu5N78ZRANcwg3lkwkudz/DtF5we2gTsj2TLlVF6wIGzuFOmBhEVKFz OYg50S5qLuXvI5upqlHvIYXnxRCpTwSCa4SRI1VNfKjWKA80nVrA1G8NvIVhrLHLfAOP y+KQ== 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=FRYMM1qoPJhfGiG5OWEbx13i+2jzqMbf4H5LKO69CQU=; b=Vq6Sim0sZvr1Syx5RxqcMZKUIo906lQ5dQ+PDkiW7A2cGnL99q0gP6anvr86jmuV2K EuT5pelWPM+DN849OSGVFQMf4PUAVZzpo3cZDUVbdKHbenrizQUAK+ivx2kmH+zZeQXt w5klUYFjKcYgwkhqkkMCLxCA5PNkiuE/ECW+MhwIVQXxiiSzP3wi2kHneiMiUpMPk2Zi fAgnSlYkN3PnmccXJypu7GX0kpG8CuVODQow+qmP4JM6TV2VYxJyQVuh+D5GP4UT4LQ0 8eYMNFL6kisCqgi8UDBh1lZhlktZ/HGWWNWsz5JniuENf8yg5pMPV4B5cvLS369WqToN 0Dvg== X-Gm-Message-State: APjAAAWT2rldfhRFzDSg8NxogPcueqZvlNX5UUuNlXhECxxDpRw8IJhU VQ5jS72xJ0kRLnjyi5PTbNsJoQKvRiIsf9uwGzc= X-Received: by 2002:a0c:fac1:: with SMTP id p1mr24192377qvo.231.1580237386265; Tue, 28 Jan 2020 10:49:46 -0800 (PST) Date: Tue, 28 Jan 2020 10:49:26 -0800 In-Reply-To: <20200128184934.77625-1-samitolvanen@google.com> Message-Id: <20200128184934.77625-4-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20200128184934.77625-1-samitolvanen@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v7 03/11] 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.341.g760bfbb309-goog