From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Paul E. McKenney" Subject: Re: linux-next: build failure after merge of the rcu tree Date: Wed, 8 Mar 2017 09:40:13 -0800 Message-ID: <20170308174013.GH30506@linux.vnet.ibm.com> References: <20170308121645.6160e711@canb.auug.org.au> <20170308101338.sp4yekncbext7qzf@phenom.ffwll.local> Reply-To: paulmck@linux.vnet.ibm.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170308101338.sp4yekncbext7qzf@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Stephen Rothwell , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson List-Id: linux-next.vger.kernel.org T24gV2VkLCBNYXIgMDgsIDIwMTcgYXQgMTE6MTM6MzhBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBXZWQsIE1hciAwOCwgMjAxNyBhdCAxMjoxNjo0NVBNICsxMTAwLCBTdGVwaGVu IFJvdGh3ZWxsIHdyb3RlOgo+ID4gSGkgUGF1bCwKPiA+IAo+ID4gQWZ0ZXIgbWVyZ2luZyB0aGUg cmN1IHRyZWUsIHRvZGF5J3MgbGludXgtbmV4dCBidWlsZCAoeDg2XzY0IGFsbG1vZGNvbmZpZykK PiA+IGZhaWxlZCBsaWtlIHRoaXM6Cj4gPiAKPiA+IEluIGZpbGUgaW5jbHVkZWQgZnJvbSBpbmNs dWRlL2xpbnV4L3Jlc291cmNlX2V4dC5oOjE5OjAsCj4gPiAgICAgICAgICAgICAgICAgIGZyb20g aW5jbHVkZS9saW51eC9wY2kuaDozMiwKPiA+ICAgICAgICAgICAgICAgICAgZnJvbSBpbmNsdWRl L2RybS9kcm1QLmg6NTAsCj4gPiAgICAgICAgICAgICAgICAgIGZyb20gZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYzoyODoKPiA+IGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9t b2NrX2dlbV9kZXZpY2UuYzogSW4gZnVuY3Rpb24gJ21vY2tfZ2VtX2RldmljZSc6Cj4gPiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19nZW1fZGV2aWNlLmM6MTc3Ojk6IGVycm9y OiAnU0xBQl9ERVNUUk9ZX0JZX1JDVScgdW5kZWNsYXJlZCAoZmlyc3QgdXNlIGluIHRoaXMgZnVu Y3Rpb24pCj4gPiAgICAgICAgICBTTEFCX0RFU1RST1lfQllfUkNVKTsKPiA+ICAgICAgICAgIF4K PiA+IGluY2x1ZGUvbGludXgvc2xhYi5oOjE0OTo0OiBub3RlOiBpbiBkZWZpbml0aW9uIG9mIG1h Y3JvICdLTUVNX0NBQ0hFJwo+ID4gICAgKF9fZmxhZ3MpLCBOVUxMKQo+ID4gICAgIF4KPiA+IGRy aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYzoxNzc6OTogbm90 ZTogZWFjaCB1bmRlY2xhcmVkIGlkZW50aWZpZXIgaXMgcmVwb3J0ZWQgb25seSBvbmNlIGZvciBl YWNoIGZ1bmN0aW9uIGl0IGFwcGVhcnMgaW4KPiA+ICAgICAgICAgIFNMQUJfREVTVFJPWV9CWV9S Q1UpOwo+ID4gICAgICAgICAgXgo+ID4gaW5jbHVkZS9saW51eC9zbGFiLmg6MTQ5OjQ6IG5vdGU6 IGluIGRlZmluaXRpb24gb2YgbWFjcm8gJ0tNRU1fQ0FDSEUnCj4gPiAgICAoX19mbGFncyksIE5V TEwpCj4gPiAgICAgXgo+ID4gLwo+ID4gCj4gPiBDYXVzZWQgYnkgY29tbWl0Cj4gPiAKPiA+ICAg MjRiN2NiMjViOGQxICgibW06IFJlbmFtZSBTTEFCX0RFU1RST1lfQllfUkNVIHRvIFNMQUJfVFlQ RVNBRkVfQllfUkNVIikKPiAKPiBBd2Vzb21lIHJlbmFtZS4gQ291bnQgdXMgaW4gYW1vbmcgdGhl IHBlb3BsZSB3aG8gZmlyc3QgdGhvdWdodCB0aGlzCj4gcHJvdmlkZXMgbW9yZSBndWFyYW50ZWVz IHRoYW4gaXQgZG9lcy4KCkdsYWQgeW91IGxpa2UgaXQhICA7LSkKCj4gPiBpbnRlcmFjdGluZyB3 aXRoIGNvbW1pdAo+ID4gCj4gPiAgIDBkYWYwMTEzY2ZmNiAoImRybS9pOTE1OiBNb2NrIGluZnJh c3RydWN0dXJlIGZvciByZXF1ZXN0IGVtaXNzaW9uIikKPiA+IAo+ID4gZnJvbSB0aGUgZHJtLWlu dGVsIHRyZWUuCj4gPiAKPiA+IEkgYWRkZWQgdGhlIGZvbGxvd2luZyBtZXJnZSBmaXggcGF0Y2g6 Cj4gPiAKPiA+IEZyb206IFN0ZXBoZW4gUm90aHdlbGwgPHNmckBjYW5iLmF1dWcub3JnLmF1Pgo+ ID4gRGF0ZTogV2VkLCA4IE1hciAyMDE3IDEyOjA5OjQ5ICsxMTAwCj4gPiBTdWJqZWN0OiBbUEFU Q0hdIGRybS9pOTE1OiBtZXJnZSBmaXggZm9yICJtbTogUmVuYW1lIFNMQUJfREVTVFJPWV9CWV9S Q1UgdG8KPiA+ICBTTEFCX1RZUEVTQUZFX0JZX1JDVSIKPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTog U3RlcGhlbiBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcuYXU+Cj4gCj4gU2hvdWxkIHdlIGhh bmRsZSB0aGlzIHdpdGggYSB0b3BpYyBicmFuY2g/IEl0J3MgdHJpdmlhbCB0byByZXNvbHZlLCBi dXQgSQo+IGZlYXIgdGhlIG5vdGUgdGhhdCB0aGlzIGNvbmZsaWN0IGV4aXN0cyBtaWdodCBnZXQg bG9zdCBzb21ld2hlcmUgYmV0d2Vlbgo+IG5vdyBhbmQgd2hlbiB0aGUgZHJtIHB1bGwgbGFuZHMg aW4gTGludXMnIGluYm94IGluIDIgbW9udGhzIC4uLgo+IAo+IE90b2ggaGUncyBwcm9iYWJseSBn b2luZyB0byBjb21waWxlIHRlc3QgZHJtIGV4dHJhIGNhcmVmdWxseSBhbmQgd2lsbAo+IG5vdGlj ZSA6LSkKCklmIGl0IGdldHMgdG9vIHVnbHksIEkgY2FuIGFsd2F5cyBhbGxvdyBib3RoIFNMQUJf VFlQRVNBRkVfQllfUkNVCmFuZCBTTEFCX0RFU1RST1lfQllfUkNVIGFzIHN5bm9ueW1zIGluIDQu MTIsIGFuZCB0aGVuIHJlbW92ZQpTTEFCX0RFU1RST1lfQllfUkNVIGluIDQuMTMuCgoJCQkJCQkJ VGhhbngsIFBhdWwKCj4gLURhbmllbAo+IAo+ID4gLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jIHwgMiArLQo+ID4gIDEgZmlsZSBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jCj4gPiBpbmRleCA2YTgyNThl YWNkY2IuLjlmMjRjNWRhM2Y4ZCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jCj4gPiBAQCAtMTc0LDcgKzE3NCw3IEBAIHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICptb2NrX2dlbV9kZXZpY2Uodm9pZCkKPiA+ICAJaTkxNS0+ cmVxdWVzdHMgPSBLTUVNX0NBQ0hFKG1vY2tfcmVxdWVzdCwKPiA+ICAJCQkJICAgIFNMQUJfSFdD QUNIRV9BTElHTiB8Cj4gPiAgCQkJCSAgICBTTEFCX1JFQ0xBSU1fQUNDT1VOVCB8Cj4gPiAtCQkJ CSAgICBTTEFCX0RFU1RST1lfQllfUkNVKTsKPiA+ICsJCQkJICAgIFNMQUJfVFlQRVNBRkVfQllf UkNVKTsKPiA+ICAJaWYgKCFpOTE1LT5yZXF1ZXN0cykKPiA+ICAJCWdvdG8gZXJyX3ZtYXM7Cj4g PiAgCj4gPiAtLSAKPiA+IDIuMTEuMAo+ID4gCj4gPiAtLSAKPiA+IENoZWVycywKPiA+IFN0ZXBo ZW4gUm90aHdlbGwKPiAKPiAtLSAKPiBEYW5pZWwgVmV0dGVyCj4gU29mdHdhcmUgRW5naW5lZXIs IEludGVsIENvcnBvcmF0aW9uCj4gaHR0cDovL2Jsb2cuZmZ3bGwuY2gKPiAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= 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 >