From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754085AbdCHRk1 (ORCPT ); Wed, 8 Mar 2017 12:40:27 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:49139 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752986AbdCHRkY (ORCPT ); Wed, 8 Mar 2017 12:40:24 -0500 Date: Wed, 8 Mar 2017 09:40:13 -0800 From: "Paul E. McKenney" To: Stephen Rothwell , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson Subject: Re: linux-next: build failure after merge of the rcu tree Reply-To: paulmck@linux.vnet.ibm.com References: <20170308121645.6160e711@canb.auug.org.au> <20170308101338.sp4yekncbext7qzf@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170308101338.sp4yekncbext7qzf@phenom.ffwll.local> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 x-cbid: 17030817-2213-0000-0000-0000014B1ADC X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006745; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000206; SDB=6.00831787; UDB=6.00408133; IPR=6.00609379; BA=6.00005201; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014562; XFM=3.00000013; UTC=2017-03-08 17:40:15 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030817-2214-0000-0000-00005478E765 Message-Id: <20170308174013.GH30506@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-08_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703080139 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 08, 2017 at 11:13:38AM +0100, Daniel Vetter wrote: > On Wed, Mar 08, 2017 at 12:16:45PM +1100, Stephen Rothwell wrote: > > Hi Paul, > > > > After merging the rcu tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: > > > > In file included from include/linux/resource_ext.h:19:0, > > from include/linux/pci.h:32, > > from include/drm/drmP.h:50, > > from drivers/gpu/drm/i915/i915_gem.c:28: > > drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function 'mock_gem_device': > > drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:9: error: 'SLAB_DESTROY_BY_RCU' undeclared (first use in this function) > > SLAB_DESTROY_BY_RCU); > > ^ > > include/linux/slab.h:149:4: note: in definition of macro 'KMEM_CACHE' > > (__flags), NULL) > > ^ > > drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:9: note: each undeclared identifier is reported only once for each function it appears in > > SLAB_DESTROY_BY_RCU); > > ^ > > include/linux/slab.h:149:4: note: in definition of macro 'KMEM_CACHE' > > (__flags), NULL) > > ^ > > / > > > > Caused by commit > > > > 24b7cb25b8d1 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU") > > Awesome rename. Count us in among the people who first thought this > provides more guarantees than it does. Glad you like it! ;-) > > interacting with commit > > > > 0daf0113cff6 ("drm/i915: Mock infrastructure for request emission") > > > > from the drm-intel tree. > > > > I added the following merge fix patch: > > > > From: Stephen Rothwell > > Date: Wed, 8 Mar 2017 12:09:49 +1100 > > Subject: [PATCH] drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to > > SLAB_TYPESAFE_BY_RCU" > > > > Signed-off-by: Stephen Rothwell > > Should we handle this with a topic branch? It's trivial to resolve, but I > fear the note that this conflict exists might get lost somewhere between > now and when the drm pull lands in Linus' inbox in 2 months ... > > Otoh he's probably going to compile test drm extra carefully and will > notice :-) If it gets too ugly, I can always allow both SLAB_TYPESAFE_BY_RCU and SLAB_DESTROY_BY_RCU as synonyms in 4.12, and then remove SLAB_DESTROY_BY_RCU in 4.13. Thanx, Paul > -Daniel > > > --- > > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > > index 6a8258eacdcb..9f24c5da3f8d 100644 > > --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c > > +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > > @@ -174,7 +174,7 @@ struct drm_i915_private *mock_gem_device(void) > > i915->requests = KMEM_CACHE(mock_request, > > SLAB_HWCACHE_ALIGN | > > SLAB_RECLAIM_ACCOUNT | > > - SLAB_DESTROY_BY_RCU); > > + SLAB_TYPESAFE_BY_RCU); > > if (!i915->requests) > > goto err_vmas; > > > > -- > > 2.11.0 > > > > -- > > Cheers, > > Stephen Rothwell > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch >