From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA7DAC432C0 for ; Wed, 27 Nov 2019 23:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFBE82070B for ; Wed, 27 Nov 2019 23:50:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XTj0qLai" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727547AbfK0Xue (ORCPT ); Wed, 27 Nov 2019 18:50:34 -0500 Received: from mail-qt1-f202.google.com ([209.85.160.202]:56775 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727126AbfK0Xud (ORCPT ); Wed, 27 Nov 2019 18:50:33 -0500 Received: by mail-qt1-f202.google.com with SMTP id b26so15844978qtr.23 for ; Wed, 27 Nov 2019 15:50:32 -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=K4LUBLgA9sviisQdtAyBRSaHeHi+ait99CAeemp5RxI=; b=XTj0qLaiH8pGJ7z/lvw9Ss/ch3BUx16Q6YJsmYYYJToKt3m1LHzzgvQZCnvMbvxpGZ uW6/7/qLxEnslqsZHLVYgFwUijr+XL3yEFABdDpVIAEfVZVyXo7AP/SYHA059gV4dyUF znVL4oOrrjmxwKj481ZnU0I2fxemssYWWHNlnwhvAigvxHnv6biMPAPy4++yd5jE4TcG opSazjEC99rzjkMN0uGb4SG4fVbXnQ9fzUxxO4fVrCVEBKI8OYlt2nPb5BkfN1fZQXfI n7DKzRkVb7imV0B2VAI9zbw9nDH+QnruxOZX6xVRzVA3WAI1zgbMOzVoqVTuvuoMfAqL dNZw== 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=K4LUBLgA9sviisQdtAyBRSaHeHi+ait99CAeemp5RxI=; b=fdSbE13GXbJxv/NMTREHPYOCkWnpziuOeZrJVylKGN5uDdhNafoMD6JtAEk3UtnJWY rha3GT4r1bamDHdm57nbW638VYDt3jxWGus7B3ozk0eSSYOjjqljHWwgXaQoP0UUkRSR O1zcvXjyDXFo2ZlIycW/dixfOgRg04BCIKxxC7fS8mgjMiiAn/rigQvxXKU6WCL35Zva Id2yt5Al5gvZotRsF3V/OXR7cFOfaHtv42oreqhQcjcTONCUtRoa4LApR/Xp9h0wKRPh 8aarRlfV8LJM6SMhUjP6Leijt57W6Ql7XY86HXj2fyFQ7RMQGzrvYN8A3CDB5I9FOsp6 39pA== X-Gm-Message-State: APjAAAU5VnrmSVEIelOtpt17cwhW4zEDbWGxiQKKngALklGA1zFXWvMq LCIDs9E7XfKSfs5wqfHMBBd/UKYy2A== X-Google-Smtp-Source: APXvYqyYZYN6fr2LCfw98yZeZUZhmVxR+PGICjGbKwZ9M6EHmNfhlIJQIdeLl20+YFMyJvdSNxLcqhaiDg== X-Received: by 2002:a05:620a:a1a:: with SMTP id i26mr4001256qka.383.1574898632384; Wed, 27 Nov 2019 15:50:32 -0800 (PST) Date: Thu, 28 Nov 2019 00:49:15 +0100 In-Reply-To: <20191127234916.31175-1-jannh@google.com> Message-Id: <20191127234916.31175-3-jannh@google.com> Mime-Version: 1.0 References: <20191127234916.31175-1-jannh@google.com> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog Subject: [PATCH v5 3/4] x86/dumpstack: Split out header line printing from __die() From: Jann Horn To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev@googlegroups.com, jannh@google.com Cc: linux-kernel@vger.kernel.org, Andrey Konovalov , Andy Lutomirski , Sean Christopherson 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 Split __die() into __die_header() and __die_body(). This allows callers to insert extra information below the header line that initiates the bug report. This can e.g. be used by __die() callers to allow KASAN to print additional information below the header line of the bug report. Signed-off-by: Jann Horn --- Notes: I think that it's nicer to have KASAN's notes about the bug below the first oops line from the kernel. This also means that tools that work with kernel oops reports can just trigger on the "general protection fault" line with the die counter and so on, and just include the text from on there, and the KASAN message will automatically be included. But if you think that the code looks too ugly, I'd be happy to change that back and drop this patch from the series. v3: new patch v4-v5: no changes arch/x86/include/asm/kdebug.h | 3 +++ arch/x86/kernel/dumpstack.c | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h index 75f1e35e7c15..a0050fabce42 100644 --- a/arch/x86/include/asm/kdebug.h +++ b/arch/x86/include/asm/kdebug.h @@ -33,6 +33,9 @@ enum show_regs_mode { }; extern void die(const char *, struct pt_regs *,long); +extern void __die_header(const char *str, struct pt_regs *regs, long err); +extern int __must_check __die_body(const char *str, struct pt_regs *regs, + long err); extern int __must_check __die(const char *, struct pt_regs *, long); extern void show_stack_regs(struct pt_regs *regs); extern void __show_regs(struct pt_regs *regs, enum show_regs_mode); diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index e07424e19274..6436f3f5f803 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -365,7 +365,7 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr) } NOKPROBE_SYMBOL(oops_end); -int __die(const char *str, struct pt_regs *regs, long err) +void __die_header(const char *str, struct pt_regs *regs, long err) { const char *pr = ""; @@ -384,7 +384,11 @@ int __die(const char *str, struct pt_regs *regs, long err) IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "", IS_ENABLED(CONFIG_PAGE_TABLE_ISOLATION) ? (boot_cpu_has(X86_FEATURE_PTI) ? " PTI" : " NOPTI") : ""); +} +NOKPROBE_SYMBOL(__die_header); +int __die_body(const char *str, struct pt_regs *regs, long err) +{ show_regs(regs); print_modules(); @@ -394,6 +398,13 @@ int __die(const char *str, struct pt_regs *regs, long err) return 0; } +NOKPROBE_SYMBOL(__die_body); + +int __die(const char *str, struct pt_regs *regs, long err) +{ + __die_header(str, regs, err); + return __die_body(str, regs, err); +} NOKPROBE_SYMBOL(__die); /* -- 2.24.0.432.g9d3f5f5b63-goog