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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 48CCDC10F03 for ; Thu, 25 Apr 2019 10:00:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A4C1206BA for ; Thu, 25 Apr 2019 10:00:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729212AbfDYKAu (ORCPT ); Thu, 25 Apr 2019 06:00:50 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:58065 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729877AbfDYKAs (ORCPT ); Thu, 25 Apr 2019 06:00:48 -0400 Received: from localhost ([127.0.0.1] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hJbAI-0001yH-Jz; Thu, 25 Apr 2019 11:59:38 +0200 Message-Id: <20190425094803.340000461@linutronix.de> User-Agent: quilt/0.65 Date: Thu, 25 Apr 2019 11:45:17 +0200 From: Thomas Gleixner To: LKML Cc: Josh Poimboeuf , x86@kernel.org, Andy Lutomirski , Steven Rostedt , Alexander Potapenko , Alexey Dobriyan , Andrew Morton , Christoph Lameter , Pekka Enberg , linux-mm@kvack.org, David Rientjes , Catalin Marinas , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Mike Rapoport , Akinobu Mita , Christoph Hellwig , iommu@lists.linux-foundation.org, Robin Murphy , Marek Szyprowski , Johannes Thumshirn , David Sterba , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org, dm-devel@redhat.com, Mike Snitzer , Alasdair Kergon , Daniel Vetter , intel-gfx@lists.freedesktop.org, Joonas Lahtinen , Maarten Lankhorst , dri-devel@lists.freedesktop.org, David Airlie , Jani Nikula , Rodrigo Vivi , Tom Zanussi , Miroslav Benes , linux-arch@vger.kernel.org Subject: [patch V3 24/29] tracing: Remove the last struct stack_trace usage References: <20190425094453.875139013@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Simplify the stack retrieval code by using the storage array based interface. Signed-off-by: Thomas Gleixner Reviewed-by: Steven Rostedt (VMware) --- kernel/trace/trace_stack.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -23,11 +23,7 @@ static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES]; static unsigned stack_trace_index[STACK_TRACE_ENTRIES]; -struct stack_trace stack_trace_max = { - .max_entries = STACK_TRACE_ENTRIES, - .entries = &stack_dump_trace[0], -}; - +static unsigned int stack_trace_entries; static unsigned long stack_trace_max_size; static arch_spinlock_t stack_trace_max_lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED; @@ -44,10 +40,10 @@ static void print_max_stack(void) pr_emerg(" Depth Size Location (%d entries)\n" " ----- ---- --------\n", - stack_trace_max.nr_entries); + stack_trace_entries); - for (i = 0; i < stack_trace_max.nr_entries; i++) { - if (i + 1 == stack_trace_max.nr_entries) + for (i = 0; i < stack_trace_entries; i++) { + if (i + 1 == stack_trace_entries) size = stack_trace_index[i]; else size = stack_trace_index[i] - stack_trace_index[i+1]; @@ -93,13 +89,12 @@ static void check_stack(unsigned long ip stack_trace_max_size = this_size; - stack_trace_max.nr_entries = 0; - stack_trace_max.skip = 0; - - save_stack_trace(&stack_trace_max); + stack_trace_entries = stack_trace_save(stack_dump_trace, + ARRAY_SIZE(stack_dump_trace) - 1, + 0); /* Skip over the overhead of the stack tracer itself */ - for (i = 0; i < stack_trace_max.nr_entries; i++) { + for (i = 0; i < stack_trace_entries; i++) { if (stack_dump_trace[i] == ip) break; } @@ -108,7 +103,7 @@ static void check_stack(unsigned long ip * Some archs may not have the passed in ip in the dump. * If that happens, we need to show everything. */ - if (i == stack_trace_max.nr_entries) + if (i == stack_trace_entries) i = 0; /* @@ -126,13 +121,13 @@ static void check_stack(unsigned long ip * loop will only happen once. This code only takes place * on a new max, so it is far from a fast path. */ - while (i < stack_trace_max.nr_entries) { + while (i < stack_trace_entries) { int found = 0; stack_trace_index[x] = this_size; p = start; - for (; p < top && i < stack_trace_max.nr_entries; p++) { + for (; p < top && i < stack_trace_entries; p++) { /* * The READ_ONCE_NOCHECK is used to let KASAN know that * this is not a stack-out-of-bounds error. @@ -163,7 +158,7 @@ static void check_stack(unsigned long ip i++; } - stack_trace_max.nr_entries = x; + stack_trace_entries = x; if (task_stack_end_corrupted(current)) { print_max_stack(); @@ -265,7 +260,7 @@ static void * { long n = *pos - 1; - if (n >= stack_trace_max.nr_entries) + if (n >= stack_trace_entries) return NULL; m->private = (void *)n; @@ -329,7 +324,7 @@ static int t_show(struct seq_file *m, vo seq_printf(m, " Depth Size Location" " (%d entries)\n" " ----- ---- --------\n", - stack_trace_max.nr_entries); + stack_trace_entries); if (!stack_tracer_enabled && !stack_trace_max_size) print_disabled(m); @@ -339,10 +334,10 @@ static int t_show(struct seq_file *m, vo i = *(long *)v; - if (i >= stack_trace_max.nr_entries) + if (i >= stack_trace_entries) return 0; - if (i + 1 == stack_trace_max.nr_entries) + if (i + 1 == stack_trace_entries) size = stack_trace_index[i]; else size = stack_trace_index[i] - stack_trace_index[i+1]; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch V3 24/29] tracing: Remove the last struct stack_trace usage Date: Thu, 25 Apr 2019 11:45:17 +0200 Message-ID: <20190425094803.340000461@linutronix.de> References: <20190425094453.875139013@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: LKML Cc: Mike Snitzer , David Airlie , Catalin Marinas , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, dm-devel@redhat.com, Alexander Potapenko , Christoph Lameter , Miroslav Benes , Christoph Hellwig , Alasdair Kergon , Marek Szyprowski , linux-arch@vger.kernel.org, x86@kernel.org, kasan-dev@googlegroups.com, Johannes Thumshirn , Andrey Ryabinin , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, David Rientjes , Akinobu Mita , Steven Rostedt , Josef Bacik , Mike Rapoport , Andy Lutomirski , Josh Poimboeuf List-Id: linux-arch.vger.kernel.org U2ltcGxpZnkgdGhlIHN0YWNrIHJldHJpZXZhbCBjb2RlIGJ5IHVzaW5nIHRoZSBzdG9yYWdlIGFy cmF5IGJhc2VkCmludGVyZmFjZS4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGds eEBsaW51dHJvbml4LmRlPgpSZXZpZXdlZC1ieTogU3RldmVuIFJvc3RlZHQgKFZNd2FyZSkgPHJv c3RlZHRAZ29vZG1pcy5vcmc+Ci0tLQoga2VybmVsL3RyYWNlL3RyYWNlX3N0YWNrLmMgfCAgIDM3 ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NiBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCi0tLSBhL2tlcm5lbC90cmFjZS90cmFj ZV9zdGFjay5jCisrKyBiL2tlcm5lbC90cmFjZS90cmFjZV9zdGFjay5jCkBAIC0yMywxMSArMjMs NyBAQAogc3RhdGljIHVuc2lnbmVkIGxvbmcgc3RhY2tfZHVtcF90cmFjZVtTVEFDS19UUkFDRV9F TlRSSUVTXTsKIHN0YXRpYyB1bnNpZ25lZCBzdGFja190cmFjZV9pbmRleFtTVEFDS19UUkFDRV9F TlRSSUVTXTsKIAotc3RydWN0IHN0YWNrX3RyYWNlIHN0YWNrX3RyYWNlX21heCA9IHsKLQkubWF4 X2VudHJpZXMJCT0gU1RBQ0tfVFJBQ0VfRU5UUklFUywKLQkuZW50cmllcwkJPSAmc3RhY2tfZHVt cF90cmFjZVswXSwKLX07Ci0KK3N0YXRpYyB1bnNpZ25lZCBpbnQgc3RhY2tfdHJhY2VfZW50cmll czsKIHN0YXRpYyB1bnNpZ25lZCBsb25nIHN0YWNrX3RyYWNlX21heF9zaXplOwogc3RhdGljIGFy Y2hfc3BpbmxvY2tfdCBzdGFja190cmFjZV9tYXhfbG9jayA9CiAJKGFyY2hfc3BpbmxvY2tfdClf X0FSQ0hfU1BJTl9MT0NLX1VOTE9DS0VEOwpAQCAtNDQsMTAgKzQwLDEwIEBAIHN0YXRpYyB2b2lk IHByaW50X21heF9zdGFjayh2b2lkKQogCiAJcHJfZW1lcmcoIiAgICAgICAgRGVwdGggICAgU2l6 ZSAgIExvY2F0aW9uICAgICglZCBlbnRyaWVzKVxuIgogCQkJICAgIiAgICAgICAgLS0tLS0gICAg LS0tLSAgIC0tLS0tLS0tXG4iLAotCQkJICAgc3RhY2tfdHJhY2VfbWF4Lm5yX2VudHJpZXMpOwor CQkJICAgc3RhY2tfdHJhY2VfZW50cmllcyk7CiAKLQlmb3IgKGkgPSAwOyBpIDwgc3RhY2tfdHJh Y2VfbWF4Lm5yX2VudHJpZXM7IGkrKykgewotCQlpZiAoaSArIDEgPT0gc3RhY2tfdHJhY2VfbWF4 Lm5yX2VudHJpZXMpCisJZm9yIChpID0gMDsgaSA8IHN0YWNrX3RyYWNlX2VudHJpZXM7IGkrKykg eworCQlpZiAoaSArIDEgPT0gc3RhY2tfdHJhY2VfZW50cmllcykKIAkJCXNpemUgPSBzdGFja190 cmFjZV9pbmRleFtpXTsKIAkJZWxzZQogCQkJc2l6ZSA9IHN0YWNrX3RyYWNlX2luZGV4W2ldIC0g c3RhY2tfdHJhY2VfaW5kZXhbaSsxXTsKQEAgLTkzLDEzICs4OSwxMiBAQCBzdGF0aWMgdm9pZCBj aGVja19zdGFjayh1bnNpZ25lZCBsb25nIGlwCiAKIAlzdGFja190cmFjZV9tYXhfc2l6ZSA9IHRo aXNfc2l6ZTsKIAotCXN0YWNrX3RyYWNlX21heC5ucl9lbnRyaWVzID0gMDsKLQlzdGFja190cmFj ZV9tYXguc2tpcCA9IDA7Ci0KLQlzYXZlX3N0YWNrX3RyYWNlKCZzdGFja190cmFjZV9tYXgpOwor CXN0YWNrX3RyYWNlX2VudHJpZXMgPSBzdGFja190cmFjZV9zYXZlKHN0YWNrX2R1bXBfdHJhY2Us CisJCQkJCSAgICAgICBBUlJBWV9TSVpFKHN0YWNrX2R1bXBfdHJhY2UpIC0gMSwKKwkJCQkJICAg ICAgIDApOwogCiAJLyogU2tpcCBvdmVyIHRoZSBvdmVyaGVhZCBvZiB0aGUgc3RhY2sgdHJhY2Vy IGl0c2VsZiAqLwotCWZvciAoaSA9IDA7IGkgPCBzdGFja190cmFjZV9tYXgubnJfZW50cmllczsg aSsrKSB7CisJZm9yIChpID0gMDsgaSA8IHN0YWNrX3RyYWNlX2VudHJpZXM7IGkrKykgewogCQlp ZiAoc3RhY2tfZHVtcF90cmFjZVtpXSA9PSBpcCkKIAkJCWJyZWFrOwogCX0KQEAgLTEwOCw3ICsx MDMsNyBAQCBzdGF0aWMgdm9pZCBjaGVja19zdGFjayh1bnNpZ25lZCBsb25nIGlwCiAJICogU29t ZSBhcmNocyBtYXkgbm90IGhhdmUgdGhlIHBhc3NlZCBpbiBpcCBpbiB0aGUgZHVtcC4KIAkgKiBJ ZiB0aGF0IGhhcHBlbnMsIHdlIG5lZWQgdG8gc2hvdyBldmVyeXRoaW5nLgogCSAqLwotCWlmIChp ID09IHN0YWNrX3RyYWNlX21heC5ucl9lbnRyaWVzKQorCWlmIChpID09IHN0YWNrX3RyYWNlX2Vu dHJpZXMpCiAJCWkgPSAwOwogCiAJLyoKQEAgLTEyNiwxMyArMTIxLDEzIEBAIHN0YXRpYyB2b2lk IGNoZWNrX3N0YWNrKHVuc2lnbmVkIGxvbmcgaXAKIAkgKiBsb29wIHdpbGwgb25seSBoYXBwZW4g b25jZS4gVGhpcyBjb2RlIG9ubHkgdGFrZXMgcGxhY2UKIAkgKiBvbiBhIG5ldyBtYXgsIHNvIGl0 IGlzIGZhciBmcm9tIGEgZmFzdCBwYXRoLgogCSAqLwotCXdoaWxlIChpIDwgc3RhY2tfdHJhY2Vf bWF4Lm5yX2VudHJpZXMpIHsKKwl3aGlsZSAoaSA8IHN0YWNrX3RyYWNlX2VudHJpZXMpIHsKIAkJ aW50IGZvdW5kID0gMDsKIAogCQlzdGFja190cmFjZV9pbmRleFt4XSA9IHRoaXNfc2l6ZTsKIAkJ cCA9IHN0YXJ0OwogCi0JCWZvciAoOyBwIDwgdG9wICYmIGkgPCBzdGFja190cmFjZV9tYXgubnJf ZW50cmllczsgcCsrKSB7CisJCWZvciAoOyBwIDwgdG9wICYmIGkgPCBzdGFja190cmFjZV9lbnRy aWVzOyBwKyspIHsKIAkJCS8qCiAJCQkgKiBUaGUgUkVBRF9PTkNFX05PQ0hFQ0sgaXMgdXNlZCB0 byBsZXQgS0FTQU4ga25vdyB0aGF0CiAJCQkgKiB0aGlzIGlzIG5vdCBhIHN0YWNrLW91dC1vZi1i b3VuZHMgZXJyb3IuCkBAIC0xNjMsNyArMTU4LDcgQEAgc3RhdGljIHZvaWQgY2hlY2tfc3RhY2so dW5zaWduZWQgbG9uZyBpcAogCQkJaSsrOwogCX0KIAotCXN0YWNrX3RyYWNlX21heC5ucl9lbnRy aWVzID0geDsKKwlzdGFja190cmFjZV9lbnRyaWVzID0geDsKIAogCWlmICh0YXNrX3N0YWNrX2Vu ZF9jb3JydXB0ZWQoY3VycmVudCkpIHsKIAkJcHJpbnRfbWF4X3N0YWNrKCk7CkBAIC0yNjUsNyAr MjYwLDcgQEAgc3RhdGljIHZvaWQgKgogewogCWxvbmcgbiA9ICpwb3MgLSAxOwogCi0JaWYgKG4g Pj0gc3RhY2tfdHJhY2VfbWF4Lm5yX2VudHJpZXMpCisJaWYgKG4gPj0gc3RhY2tfdHJhY2VfZW50 cmllcykKIAkJcmV0dXJuIE5VTEw7CiAKIAltLT5wcml2YXRlID0gKHZvaWQgKiluOwpAQCAtMzI5 LDcgKzMyNCw3IEBAIHN0YXRpYyBpbnQgdF9zaG93KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm8KIAkJ c2VxX3ByaW50ZihtLCAiICAgICAgICBEZXB0aCAgICBTaXplICAgTG9jYXRpb24iCiAJCQkgICAi ICAgICglZCBlbnRyaWVzKVxuIgogCQkJICAgIiAgICAgICAgLS0tLS0gICAgLS0tLSAgIC0tLS0t LS0tXG4iLAotCQkJICAgc3RhY2tfdHJhY2VfbWF4Lm5yX2VudHJpZXMpOworCQkJICAgc3RhY2tf dHJhY2VfZW50cmllcyk7CiAKIAkJaWYgKCFzdGFja190cmFjZXJfZW5hYmxlZCAmJiAhc3RhY2tf dHJhY2VfbWF4X3NpemUpCiAJCQlwcmludF9kaXNhYmxlZChtKTsKQEAgLTMzOSwxMCArMzM0LDEw IEBAIHN0YXRpYyBpbnQgdF9zaG93KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm8KIAogCWkgPSAqKGxv bmcgKil2OwogCi0JaWYgKGkgPj0gc3RhY2tfdHJhY2VfbWF4Lm5yX2VudHJpZXMpCisJaWYgKGkg Pj0gc3RhY2tfdHJhY2VfZW50cmllcykKIAkJcmV0dXJuIDA7CiAKLQlpZiAoaSArIDEgPT0gc3Rh Y2tfdHJhY2VfbWF4Lm5yX2VudHJpZXMpCisJaWYgKGkgKyAxID09IHN0YWNrX3RyYWNlX2VudHJp ZXMpCiAJCXNpemUgPSBzdGFja190cmFjZV9pbmRleFtpXTsKIAllbHNlCiAJCXNpemUgPSBzdGFj a190cmFjZV9pbmRleFtpXSAtIHN0YWNrX3RyYWNlX2luZGV4W2krMV07CgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 268FEC282E1 for ; Thu, 25 Apr 2019 10:34:12 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F23F02084B for ; Thu, 25 Apr 2019 10:34:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F23F02084B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A1AF61D41; Thu, 25 Apr 2019 10:34:06 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E7C001D27 for ; Thu, 25 Apr 2019 10:33:24 +0000 (UTC) X-Greylist: greylisting inactive for cl@linux.com in SQLgrey-1.7.6 X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from Galois.linutronix.de (Galois.linutronix.de [146.0.238.70]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 66FF8854; Thu, 25 Apr 2019 10:33:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hJbAI-0001yH-Jz; Thu, 25 Apr 2019 11:59:38 +0200 Message-Id: <20190425094803.340000461@linutronix.de> User-Agent: quilt/0.65 Date: Thu, 25 Apr 2019 11:45:17 +0200 From: Thomas Gleixner To: LKML Subject: [patch V3 24/29] tracing: Remove the last struct stack_trace usage References: <20190425094453.875139013@linutronix.de> MIME-Version: 1.0 Cc: Mike Snitzer , David Airlie , Catalin Marinas , Joonas Lahtinen , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, dm-devel@redhat.com, Alexander Potapenko , Christoph Lameter , Miroslav Benes , Christoph Hellwig , Alasdair Kergon , linux-arch@vger.kernel.org, x86@kernel.org, kasan-dev@googlegroups.com, Johannes Thumshirn , Andrey Ryabinin , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, David Rientjes , Maarten Lankhorst , Akinobu Mita , Steven Rostedt , Josef Bacik , Rodrigo Vivi , Mike Rapoport , Jani Nikula , Andy Lutomirski , Josh Poimboeuf , David Sterba , Dmitry Vyukov , Tom Zanussi , Chris Mason , Pekka Enberg , iommu@lists.linux-foundation.org, Daniel Vetter , Andrew Morton , Robin Murphy , linux-btrfs@vger.kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Message-ID: <20190425094517.KOutepIkdkUXIqXR07Lz4g1_Ei4CTbICPcVPGOj2-sw@z> Simplify the stack retrieval code by using the storage array based interface. Signed-off-by: Thomas Gleixner Reviewed-by: Steven Rostedt (VMware) --- kernel/trace/trace_stack.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -23,11 +23,7 @@ static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES]; static unsigned stack_trace_index[STACK_TRACE_ENTRIES]; -struct stack_trace stack_trace_max = { - .max_entries = STACK_TRACE_ENTRIES, - .entries = &stack_dump_trace[0], -}; - +static unsigned int stack_trace_entries; static unsigned long stack_trace_max_size; static arch_spinlock_t stack_trace_max_lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED; @@ -44,10 +40,10 @@ static void print_max_stack(void) pr_emerg(" Depth Size Location (%d entries)\n" " ----- ---- --------\n", - stack_trace_max.nr_entries); + stack_trace_entries); - for (i = 0; i < stack_trace_max.nr_entries; i++) { - if (i + 1 == stack_trace_max.nr_entries) + for (i = 0; i < stack_trace_entries; i++) { + if (i + 1 == stack_trace_entries) size = stack_trace_index[i]; else size = stack_trace_index[i] - stack_trace_index[i+1]; @@ -93,13 +89,12 @@ static void check_stack(unsigned long ip stack_trace_max_size = this_size; - stack_trace_max.nr_entries = 0; - stack_trace_max.skip = 0; - - save_stack_trace(&stack_trace_max); + stack_trace_entries = stack_trace_save(stack_dump_trace, + ARRAY_SIZE(stack_dump_trace) - 1, + 0); /* Skip over the overhead of the stack tracer itself */ - for (i = 0; i < stack_trace_max.nr_entries; i++) { + for (i = 0; i < stack_trace_entries; i++) { if (stack_dump_trace[i] == ip) break; } @@ -108,7 +103,7 @@ static void check_stack(unsigned long ip * Some archs may not have the passed in ip in the dump. * If that happens, we need to show everything. */ - if (i == stack_trace_max.nr_entries) + if (i == stack_trace_entries) i = 0; /* @@ -126,13 +121,13 @@ static void check_stack(unsigned long ip * loop will only happen once. This code only takes place * on a new max, so it is far from a fast path. */ - while (i < stack_trace_max.nr_entries) { + while (i < stack_trace_entries) { int found = 0; stack_trace_index[x] = this_size; p = start; - for (; p < top && i < stack_trace_max.nr_entries; p++) { + for (; p < top && i < stack_trace_entries; p++) { /* * The READ_ONCE_NOCHECK is used to let KASAN know that * this is not a stack-out-of-bounds error. @@ -163,7 +158,7 @@ static void check_stack(unsigned long ip i++; } - stack_trace_max.nr_entries = x; + stack_trace_entries = x; if (task_stack_end_corrupted(current)) { print_max_stack(); @@ -265,7 +260,7 @@ static void * { long n = *pos - 1; - if (n >= stack_trace_max.nr_entries) + if (n >= stack_trace_entries) return NULL; m->private = (void *)n; @@ -329,7 +324,7 @@ static int t_show(struct seq_file *m, vo seq_printf(m, " Depth Size Location" " (%d entries)\n" " ----- ---- --------\n", - stack_trace_max.nr_entries); + stack_trace_entries); if (!stack_tracer_enabled && !stack_trace_max_size) print_disabled(m); @@ -339,10 +334,10 @@ static int t_show(struct seq_file *m, vo i = *(long *)v; - if (i >= stack_trace_max.nr_entries) + if (i >= stack_trace_entries) return 0; - if (i + 1 == stack_trace_max.nr_entries) + if (i + 1 == stack_trace_entries) size = stack_trace_index[i]; else size = stack_trace_index[i] - stack_trace_index[i+1]; _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu