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=-5.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT 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 3B2CDC282E1 for ; Tue, 23 Apr 2019 07:36:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F256C20645 for ; Tue, 23 Apr 2019 07:36:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="YVSMCPmN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726400AbfDWHgc (ORCPT ); Tue, 23 Apr 2019 03:36:32 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:46587 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725939AbfDWHgb (ORCPT ); Tue, 23 Apr 2019 03:36:31 -0400 Received: by mail-ed1-f67.google.com with SMTP id d1so11655071edd.13 for ; Tue, 23 Apr 2019 00:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=bKYaajiak7Zq/jXYNZsg7tprgawT9ZLW0GYZ4u8T1/U=; b=YVSMCPmNBiDoDNpcTyNizSQpeFtdskx5nzotOQdI+PM4xCSjWZehbeKERXQ66dUsNf TXHm1tfsqbgr0menNDTyY6pXffkwQK1wj5A4gW69fvoOwQQDYM4lc/5v3tUnIgZJ5xdQ qbZCJtt8BK/ZddIoqnV348CMM9PeIofFwaJu4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=bKYaajiak7Zq/jXYNZsg7tprgawT9ZLW0GYZ4u8T1/U=; b=n14gbhMyKHxBsAHnXrOpE/thQ9ROR22tfABvLIAeZCil22ttKBUnRc20L6fuZmjQuE OGSoHnmZkg4fkRseSEKSpRbSk/gigyOE/2l6AeATScRiCcYcpMKnph1GDK5T96JT90f2 BsQTdZmazYzLKfRE5JtVvFGYph2q66IG+JUtGGS0MuqSQZZ6BCVfiSwMYx3HPOqWtSVI Sk5xoCmpxO5EFrJMnOTfKkmdVe81rXEFqc6yFFj72G8ze1Qm01X9R7qWPr4xxzbc10cV 30B4xI9WqJ07MRsIQiHzZWZBM8jro1D4o3hSheuCvGILfTKiwdCcLtp2Ria+SfKrgAz3 SHXw== X-Gm-Message-State: APjAAAVbK/AzktZVlr+vWBrCQsDyxqgHNAQANuycvbBXm9YWUp4T7sQE oPwnn7Dejh+kBPYIuDAKM11USg== X-Google-Smtp-Source: APXvYqyfiVOQGBzi0xFFlvW7+u0SliHoY3BhrSH7C0jNdR2HDDmW0RiEkJeC4fVSS0YpOwtF9jGgvA== X-Received: by 2002:a05:6402:6d9:: with SMTP id n25mr15163695edy.288.1556004989447; Tue, 23 Apr 2019 00:36:29 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id l18sm1712508edc.33.2019.04.23.00.36.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Apr 2019 00:36:28 -0700 (PDT) Date: Tue, 23 Apr 2019 09:36:25 +0200 From: Daniel Vetter To: Thomas Gleixner Cc: LKML , Josh Poimboeuf , x86@kernel.org, Andy Lutomirski , Steven Rostedt , Alexander Potapenko , intel-gfx@lists.freedesktop.org, Joonas Lahtinen , Maarten Lankhorst , dri-devel@lists.freedesktop.org, David Airlie , Jani Nikula , Daniel Vetter , Rodrigo Vivi , Alexey Dobriyan , Andrew Morton , Pekka Enberg , linux-mm@kvack.org, David Rientjes , Christoph Lameter , Catalin Marinas , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Mike Rapoport , Akinobu Mita , iommu@lists.linux-foundation.org, Robin Murphy , Christoph Hellwig , Marek Szyprowski , Johannes Thumshirn , David Sterba , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org, dm-devel@redhat.com, Mike Snitzer , Alasdair Kergon , linux-arch@vger.kernel.org Subject: Re: [patch V2 16/29] drm: Simplify stacktrace handling Message-ID: <20190423073625.GZ13337@phenom.ffwll.local> Mail-Followup-To: Thomas Gleixner , LKML , Josh Poimboeuf , x86@kernel.org, Andy Lutomirski , Steven Rostedt , Alexander Potapenko , intel-gfx@lists.freedesktop.org, Joonas Lahtinen , Maarten Lankhorst , dri-devel@lists.freedesktop.org, David Airlie , Jani Nikula , Rodrigo Vivi , Alexey Dobriyan , Andrew Morton , Pekka Enberg , linux-mm@kvack.org, David Rientjes , Christoph Lameter , Catalin Marinas , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Mike Rapoport , Akinobu Mita , iommu@lists.linux-foundation.org, Robin Murphy , Christoph Hellwig , Marek Szyprowski , Johannes Thumshirn , David Sterba , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org, dm-devel@redhat.com, Mike Snitzer , Alasdair Kergon , linux-arch@vger.kernel.org References: <20190418084119.056416939@linutronix.de> <20190418084254.549410214@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190418084254.549410214@linutronix.de> X-Operating-System: Linux phenom 4.19.0-1-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 18, 2019 at 10:41:35AM +0200, Thomas Gleixner wrote: > Replace the indirection through struct stack_trace by using the storage > array based interfaces. > > The original code in all printing functions is really wrong. It allocates a > storage array on stack which is unused because depot_fetch_stack() does not > store anything in it. It overwrites the entries pointer in the stack_trace > struct so it points to the depot storage. Thanks for cleaning this up for us! > Signed-off-by: Thomas Gleixner > Cc: intel-gfx@lists.freedesktop.org > Cc: Joonas Lahtinen > Cc: Maarten Lankhorst > Cc: dri-devel@lists.freedesktop.org > Cc: David Airlie > Cc: Jani Nikula > Cc: Daniel Vetter > Cc: Rodrigo Vivi Acked-by: Daniel Vetter for merging through whatever tree is convenient for you (or tell me I should pick it up into drm-next when the prep work landed). Cheers, Daniel > --- > drivers/gpu/drm/drm_mm.c | 22 +++++++--------------- > drivers/gpu/drm/i915/i915_vma.c | 11 ++++------- > drivers/gpu/drm/i915/intel_runtime_pm.c | 21 +++++++-------------- > 3 files changed, 18 insertions(+), 36 deletions(-) > > --- a/drivers/gpu/drm/drm_mm.c > +++ b/drivers/gpu/drm/drm_mm.c > @@ -106,22 +106,19 @@ > static noinline void save_stack(struct drm_mm_node *node) > { > unsigned long entries[STACKDEPTH]; > - struct stack_trace trace = { > - .entries = entries, > - .max_entries = STACKDEPTH, > - .skip = 1 > - }; > + unsigned int n; > > - save_stack_trace(&trace); > + n = stack_trace_save(entries, ARRAY_SIZE(entries), 1); > > /* May be called under spinlock, so avoid sleeping */ > - node->stack = depot_save_stack(&trace, GFP_NOWAIT); > + node->stack = stack_depot_save(entries, n, GFP_NOWAIT); > } > > static void show_leaks(struct drm_mm *mm) > { > struct drm_mm_node *node; > - unsigned long entries[STACKDEPTH]; > + unsigned long *entries; > + unsigned int nr_entries; > char *buf; > > buf = kmalloc(BUFSZ, GFP_KERNEL); > @@ -129,19 +126,14 @@ static void show_leaks(struct drm_mm *mm > return; > > list_for_each_entry(node, drm_mm_nodes(mm), node_list) { > - struct stack_trace trace = { > - .entries = entries, > - .max_entries = STACKDEPTH > - }; > - > if (!node->stack) { > DRM_ERROR("node [%08llx + %08llx]: unknown owner\n", > node->start, node->size); > continue; > } > > - depot_fetch_stack(node->stack, &trace); > - snprint_stack_trace(buf, BUFSZ, &trace, 0); > + nr_entries = stack_depot_fetch(node->stack, &entries); > + stack_trace_snprint(buf, BUFSZ, entries, nr_entries, 0); > DRM_ERROR("node [%08llx + %08llx]: inserted at\n%s", > node->start, node->size, buf); > } > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -36,11 +36,8 @@ > > static void vma_print_allocator(struct i915_vma *vma, const char *reason) > { > - unsigned long entries[12]; > - struct stack_trace trace = { > - .entries = entries, > - .max_entries = ARRAY_SIZE(entries), > - }; > + unsigned long *entries; > + unsigned int nr_entries; > char buf[512]; > > if (!vma->node.stack) { > @@ -49,8 +46,8 @@ static void vma_print_allocator(struct i > return; > } > > - depot_fetch_stack(vma->node.stack, &trace); > - snprint_stack_trace(buf, sizeof(buf), &trace, 0); > + nr_entries = stack_depot_fetch(vma->node.stack, &entries); > + stack_trace_snprint(buf, sizeof(buf), entries, nr_entries, 0); > DRM_DEBUG_DRIVER("vma.node [%08llx + %08llx] %s: inserted at %s\n", > vma->node.start, vma->node.size, reason, buf); > } > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -60,27 +60,20 @@ > static noinline depot_stack_handle_t __save_depot_stack(void) > { > unsigned long entries[STACKDEPTH]; > - struct stack_trace trace = { > - .entries = entries, > - .max_entries = ARRAY_SIZE(entries), > - .skip = 1, > - }; > + unsigned int n; > > - save_stack_trace(&trace); > - return depot_save_stack(&trace, GFP_NOWAIT | __GFP_NOWARN); > + n = stack_trace_save(entries, ARRAY_SIZE(entries), 1); > + return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN); > } > > static void __print_depot_stack(depot_stack_handle_t stack, > char *buf, int sz, int indent) > { > - unsigned long entries[STACKDEPTH]; > - struct stack_trace trace = { > - .entries = entries, > - .max_entries = ARRAY_SIZE(entries), > - }; > + unsigned long *entries; > + unsigned int nr_entries; > > - depot_fetch_stack(stack, &trace); > - snprint_stack_trace(buf, sz, &trace, indent); > + nr_entries = stack_depot_fetch(stack, &entries); > + stack_trace_snprint(buf, sz, entries, nr_entries, indent); > } > > static void init_intel_runtime_pm_wakeref(struct drm_i915_private *i915) > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch