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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DC71C433EF for ; Fri, 15 Oct 2021 09:57:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14D9960FC3 for ; Fri, 15 Oct 2021 09:57:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234733AbhJOJ7M (ORCPT ); Fri, 15 Oct 2021 05:59:12 -0400 Received: from mga02.intel.com ([134.134.136.20]:54697 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233716AbhJOJ7K (ORCPT ); Fri, 15 Oct 2021 05:59:10 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10137"; a="215049129" X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="215049129" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 02:57:04 -0700 X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="492394407" Received: from tzahur-mobl.ger.corp.intel.com (HELO localhost) ([10.251.211.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 02:57:01 -0700 From: Jani Nikula To: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the drm-misc tree In-Reply-To: <20211015202648.258445ef@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211015202648.258445ef@canb.auug.org.au> Date: Fri, 15 Oct 2021 12:56:58 +0300 Message-ID: <87h7divcet.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 15 Oct 2021, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save' > 111 | static depot_stack_handle_t __stack_depot_save(void) > | ^~~~~~~~~~~~~~~~~~ > In file included from include/linux/page_ext.h:7, > from include/linux/mm.h:25, > from include/linux/kallsyms.h:13, > from include/linux/bpf.h:20, > from include/linux/bpf-cgroup.h:5, > from include/linux/cgroup-defs.h:22, > from include/linux/cgroup.h:28, > from include/linux/memcontrol.h:13, > from include/linux/swap.h:9, > from include/linux/suspend.h:5, > from include/linux/regulator/consumer.h:35, > from include/linux/i2c.h:18, > from include/drm/drm_crtc.h:28, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/drm_modeset_lock.c:24: > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, > | ^~~~~~~~~~~~~~~~~~ > > Caused by commit > > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") > > This may only have been revealed because of another fix I have had to > apply today. > > I have applied the following patch for today. > > From: Stephen Rothwell > Date: Fri, 15 Oct 2021 20:17:52 +1100 > Subject: [PATCH] drm/locking: fix for name conflict > > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") > Signed-off-by: Stephen Rothwell My bad, what was I thinking using stack depot's "namespace". The fix looks good, but I'd rename __stack_depot_print too added in the same commit. Do you want to respin or shall I take it from here? Thanks, Jani. > --- > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c > index 4d32b61fa1fd..ee36dd20900d 100644 > --- a/drivers/gpu/drm/drm_modeset_lock.c > +++ b/drivers/gpu/drm/drm_modeset_lock.c > @@ -79,7 +79,7 @@ > static DEFINE_WW_CLASS(crtc_ww_class); > > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) > -static noinline depot_stack_handle_t __stack_depot_save(void) > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) > { > unsigned long entries[8]; > unsigned int n; > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot) > kfree(buf); > } > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ > -static depot_stack_handle_t __stack_depot_save(void) > +static depot_stack_handle_t __drm_stack_depot_save(void) > { > return 0; > } > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, > ret = 0; > } else if (ret == -EDEADLK) { > ctx->contended = lock; > - ctx->stack_depot = __stack_depot_save(); > + ctx->stack_depot = __drm_stack_depot_save(); > } > > return ret; > -- > 2.33.0 -- Jani Nikula, Intel Open Source Graphics Center 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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C540C433EF for ; Fri, 15 Oct 2021 09:57:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 1C44D60F23 for ; Fri, 15 Oct 2021 09:57:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1C44D60F23 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0DE56E252; Fri, 15 Oct 2021 09:57:06 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C75236E250; Fri, 15 Oct 2021 09:57:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10137"; a="227779251" X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="227779251" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 02:57:04 -0700 X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="492394407" Received: from tzahur-mobl.ger.corp.intel.com (HELO localhost) ([10.251.211.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 02:57:01 -0700 From: Jani Nikula To: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List In-Reply-To: <20211015202648.258445ef@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211015202648.258445ef@canb.auug.org.au> Date: Fri, 15 Oct 2021 12:56:58 +0300 Message-ID: <87h7divcet.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 15 Oct 2021, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save' > 111 | static depot_stack_handle_t __stack_depot_save(void) > | ^~~~~~~~~~~~~~~~~~ > In file included from include/linux/page_ext.h:7, > from include/linux/mm.h:25, > from include/linux/kallsyms.h:13, > from include/linux/bpf.h:20, > from include/linux/bpf-cgroup.h:5, > from include/linux/cgroup-defs.h:22, > from include/linux/cgroup.h:28, > from include/linux/memcontrol.h:13, > from include/linux/swap.h:9, > from include/linux/suspend.h:5, > from include/linux/regulator/consumer.h:35, > from include/linux/i2c.h:18, > from include/drm/drm_crtc.h:28, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/drm_modeset_lock.c:24: > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, > | ^~~~~~~~~~~~~~~~~~ > > Caused by commit > > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") > > This may only have been revealed because of another fix I have had to > apply today. > > I have applied the following patch for today. > > From: Stephen Rothwell > Date: Fri, 15 Oct 2021 20:17:52 +1100 > Subject: [PATCH] drm/locking: fix for name conflict > > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") > Signed-off-by: Stephen Rothwell My bad, what was I thinking using stack depot's "namespace". The fix looks good, but I'd rename __stack_depot_print too added in the same commit. Do you want to respin or shall I take it from here? Thanks, Jani. > --- > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c > index 4d32b61fa1fd..ee36dd20900d 100644 > --- a/drivers/gpu/drm/drm_modeset_lock.c > +++ b/drivers/gpu/drm/drm_modeset_lock.c > @@ -79,7 +79,7 @@ > static DEFINE_WW_CLASS(crtc_ww_class); > > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) > -static noinline depot_stack_handle_t __stack_depot_save(void) > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) > { > unsigned long entries[8]; > unsigned int n; > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot) > kfree(buf); > } > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ > -static depot_stack_handle_t __stack_depot_save(void) > +static depot_stack_handle_t __drm_stack_depot_save(void) > { > return 0; > } > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, > ret = 0; > } else if (ret == -EDEADLK) { > ctx->contended = lock; > - ctx->stack_depot = __stack_depot_save(); > + ctx->stack_depot = __drm_stack_depot_save(); > } > > return ret; > -- > 2.33.0 -- Jani Nikula, Intel Open Source Graphics Center