Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp1417154ybx; Tue, 5 Nov 2019 15:59:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxMecedBRYqixI7QxzqJx6mGI63P3e5NOqUOKdjP8hAiFGg3QZ6w8PeJZu6rvnu8LkV3GCS X-Received: by 2002:a17:906:1da1:: with SMTP id u1mr33013335ejh.275.1572998343058; Tue, 05 Nov 2019 15:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572998343; cv=none; d=google.com; s=arc-20160816; b=sjoSsBzAGhZ7R5jBCwa6Ijtjf8WwxxkPpEM+GQN6AJNj/1T8Y8RYr+yeI6hfmhxe4L nddkDQR6DL2saWwnvDb0r1U2Gl0CPt2tpgxfJKhYoMztniLyUx7VGsQzM/uYmc4hA1QN QgKgWuy9UdM3gndFAHw8/9/faISh10Aj9Z5YQ85IZ4Y8xEzafRmLMkrpWwPWZYyTsQk1 aMHCa6G3hd2V8VqhMBNZ8olM9FZ8+pcWubjKgECit9SJqBpVZnaF0r3yeT2J643Jlm12 2HtECmLDJtdt+0I2a2Ij4d+2TTvi5AAxYpqGBcjWY8SypTTvIr3soTKgjphYifhbLD4Z cB8A== 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=rtGYhrlT+v4glRCgBr5KwA8OmlbDFJXwY4ztX1r8N4Y=; b=RzfF61uX1rA29fJ7D5pjNwbszaX4bR/IsbqHgCXvvti515FcnNg2VPJaIkVnnmjloU WzntfA1Q2OZynm88kXl7B7ofPM9/kjTANRcGBZ6q1molNTrcrKZSdosLTfhASuVg2vB3 ywWIXiaP+EnHFTbVhXjX906kowEQpuLR8vlzH+nqPabpSIq76Ck5qetI6r3OQj/21soQ z+AOfNJw628IFgd0tUfWsaF+8ilDvMFo48ioQX7xmgKMHLpss2tdKtM9Q2iub/3j2xk2 34LoC+0PyEzdKIYBvSpA7dfRXcodGQSOeuJEPQW9ZGHuhKmjCT4Nh2HsQgeWRdDNWipH SKcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=TKd2so4t; 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 c29si10752521edb.223.2019.11.05.15.58.40; Tue, 05 Nov 2019 15:59:03 -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=TKd2so4t; 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 S2387501AbfKEX4h (ORCPT + 99 others); Tue, 5 Nov 2019 18:56:37 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:48287 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387453AbfKEX4g (ORCPT ); Tue, 5 Nov 2019 18:56:36 -0500 Received: by mail-pl1-f201.google.com with SMTP id t5so12057883plz.15 for ; Tue, 05 Nov 2019 15:56:35 -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=rtGYhrlT+v4glRCgBr5KwA8OmlbDFJXwY4ztX1r8N4Y=; b=TKd2so4t7KdR/7IGrMM7dl1XICyaB7Ep2xb2K+L1YFpFhAdGCuA+QVKoOX+2nBhRS1 PbhJFwrDkZsuR4g7Ll5jibhYYSoSbj6Qsk2MbBrD3K/3RVFYn3Ze4sq2kV7P6t82dOWN zANq01dIUJjLIJAHUFq7xMVXaYxiN41idA7UoNEeJpkXFp/ZWlp+zSbMC4BIJqBb48KR 4Yz6i7rx8RTibsrTijP0CrOXXl43bw03Swi1hDDM7ENVWaU1ch5tyPwrarZdzghv3p22 6EIfdhBRrf+kmU4AHHY+5aG/aq0yLasD+4SyCQWE2lPdStxSTwo8liAyHr/FcLSygxFM ArVQ== 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=rtGYhrlT+v4glRCgBr5KwA8OmlbDFJXwY4ztX1r8N4Y=; b=VrjQ1NVEivxoHUvL3U2siRplFWC1kB7YOWRQkhk4bCQ+3tsdxSGwU70NbXyzW0GeD/ qtK1O4BZZwxMQjpmv3A7nj4Pqxs8mbTBI9PLvkkwc9laXxZD8r1CHRiMiEA1+j/IgFK9 ghzSTWfMwxMhlDCHPU67xU9Gt4ziz2sggKivBq7hneGORukKwVnKu0Os5tWZGKb2lqTF Bm8XFk/WMy6PJLEp1pPCAo0zhUP7r0uNEzzIlp9/ixBaGsNUF9CRPMNybxRv8OB/p6yN JsWkuOeI0Jrqdcg8i/PSe/H0IAcHDMi6SgaCkQY14RT8GCfOvri+/WbvfhGOhV2Hhuym UrhA== X-Gm-Message-State: APjAAAWR/9nYcEcgrk/szmnUlKMtL24nLxnYsP9bW4vNJucSH2gnCDEe hi8RNa6txZVd6sHMrz9nR6p/xEouVNvwnkAY1LM= X-Received: by 2002:a65:6149:: with SMTP id o9mr5335991pgv.228.1572998195111; Tue, 05 Nov 2019 15:56:35 -0800 (PST) Date: Tue, 5 Nov 2019 15:56:01 -0800 In-Reply-To: <20191105235608.107702-1-samitolvanen@google.com> Message-Id: <20191105235608.107702-8-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20191105235608.107702-1-samitolvanen@google.com> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog Subject: [PATCH v5 07/14] scs: add support for stack usage debugging From: Sami Tolvanen To: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel Cc: Dave Martin , Kees Cook , Laura Abbott , Mark Rutland , 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 4f5774b6f27d..a47fae33efdc 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.24.0.rc1.363.gb1bccd3e3d-goog