From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752856AbdCHMOG (ORCPT ); Wed, 8 Mar 2017 07:14:06 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35606 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752642AbdCHMOC (ORCPT ); Wed, 8 Mar 2017 07:14:02 -0500 Date: Wed, 8 Mar 2017 11:13:38 +0100 From: Daniel Vetter To: Stephen Rothwell Cc: "Paul E. McKenney" , Daniel Vetter , 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 Message-ID: <20170308101338.sp4yekncbext7qzf@phenom.ffwll.local> Mail-Followup-To: Stephen Rothwell , "Paul E. McKenney" , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson References: <20170308121645.6160e711@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170308121645.6160e711@canb.auug.org.au> X-Operating-System: Linux phenom 4.8.0-1-amd64 User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > 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 :-) -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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: linux-next: build failure after merge of the rcu tree Date: Wed, 8 Mar 2017 11:13:38 +0100 Message-ID: <20170308101338.sp4yekncbext7qzf@phenom.ffwll.local> References: <20170308121645.6160e711@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170308121645.6160e711@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , linux-kernel@vger.kernel.org, DRI , linux-next@vger.kernel.org, "Paul E. McKenney" List-Id: linux-next.vger.kernel.org T24gV2VkLCBNYXIgMDgsIDIwMTcgYXQgMTI6MTY6NDVQTSArMTEwMCwgU3RlcGhlbiBSb3Rod2Vs bCB3cm90ZToKPiBIaSBQYXVsLAo+IAo+IEFmdGVyIG1lcmdpbmcgdGhlIHJjdSB0cmVlLCB0b2Rh eSdzIGxpbnV4LW5leHQgYnVpbGQgKHg4Nl82NCBhbGxtb2Rjb25maWcpCj4gZmFpbGVkIGxpa2Ug dGhpczoKPiAKPiBJbiBmaWxlIGluY2x1ZGVkIGZyb20gaW5jbHVkZS9saW51eC9yZXNvdXJjZV9l eHQuaDoxOTowLAo+ICAgICAgICAgICAgICAgICAgZnJvbSBpbmNsdWRlL2xpbnV4L3BjaS5oOjMy LAo+ICAgICAgICAgICAgICAgICAgZnJvbSBpbmNsdWRlL2RybS9kcm1QLmg6NTAsCj4gICAgICAg ICAgICAgICAgICBmcm9tIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmM6Mjg6Cj4gZHJp dmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jOiBJbiBmdW5jdGlv biAnbW9ja19nZW1fZGV2aWNlJzoKPiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9j a19nZW1fZGV2aWNlLmM6MTc3Ojk6IGVycm9yOiAnU0xBQl9ERVNUUk9ZX0JZX1JDVScgdW5kZWNs YXJlZCAoZmlyc3QgdXNlIGluIHRoaXMgZnVuY3Rpb24pCj4gICAgICAgICAgU0xBQl9ERVNUUk9Z X0JZX1JDVSk7Cj4gICAgICAgICAgXgo+IGluY2x1ZGUvbGludXgvc2xhYi5oOjE0OTo0OiBub3Rl OiBpbiBkZWZpbml0aW9uIG9mIG1hY3JvICdLTUVNX0NBQ0hFJwo+ICAgIChfX2ZsYWdzKSwgTlVM TCkKPiAgICAgXgo+IGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZp Y2UuYzoxNzc6OTogbm90ZTogZWFjaCB1bmRlY2xhcmVkIGlkZW50aWZpZXIgaXMgcmVwb3J0ZWQg b25seSBvbmNlIGZvciBlYWNoIGZ1bmN0aW9uIGl0IGFwcGVhcnMgaW4KPiAgICAgICAgICBTTEFC X0RFU1RST1lfQllfUkNVKTsKPiAgICAgICAgICBeCj4gaW5jbHVkZS9saW51eC9zbGFiLmg6MTQ5 OjQ6IG5vdGU6IGluIGRlZmluaXRpb24gb2YgbWFjcm8gJ0tNRU1fQ0FDSEUnCj4gICAgKF9fZmxh Z3MpLCBOVUxMKQo+ICAgICBeCj4gLwo+IAo+IENhdXNlZCBieSBjb21taXQKPiAKPiAgIDI0Yjdj YjI1YjhkMSAoIm1tOiBSZW5hbWUgU0xBQl9ERVNUUk9ZX0JZX1JDVSB0byBTTEFCX1RZUEVTQUZF X0JZX1JDVSIpCgpBd2Vzb21lIHJlbmFtZS4gQ291bnQgdXMgaW4gYW1vbmcgdGhlIHBlb3BsZSB3 aG8gZmlyc3QgdGhvdWdodCB0aGlzCnByb3ZpZGVzIG1vcmUgZ3VhcmFudGVlcyB0aGFuIGl0IGRv ZXMuCgo+IGludGVyYWN0aW5nIHdpdGggY29tbWl0Cj4gCj4gICAwZGFmMDExM2NmZjYgKCJkcm0v aTkxNTogTW9jayBpbmZyYXN0cnVjdHVyZSBmb3IgcmVxdWVzdCBlbWlzc2lvbiIpCj4gCj4gZnJv bSB0aGUgZHJtLWludGVsIHRyZWUuCj4gCj4gSSBhZGRlZCB0aGUgZm9sbG93aW5nIG1lcmdlIGZp eCBwYXRjaDoKPiAKPiBGcm9tOiBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5h dT4KPiBEYXRlOiBXZWQsIDggTWFyIDIwMTcgMTI6MDk6NDkgKzExMDAKPiBTdWJqZWN0OiBbUEFU Q0hdIGRybS9pOTE1OiBtZXJnZSBmaXggZm9yICJtbTogUmVuYW1lIFNMQUJfREVTVFJPWV9CWV9S Q1UgdG8KPiAgU0xBQl9UWVBFU0FGRV9CWV9SQ1UiCj4gCj4gU2lnbmVkLW9mZi1ieTogU3RlcGhl biBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcuYXU+CgpTaG91bGQgd2UgaGFuZGxlIHRoaXMg d2l0aCBhIHRvcGljIGJyYW5jaD8gSXQncyB0cml2aWFsIHRvIHJlc29sdmUsIGJ1dCBJCmZlYXIg dGhlIG5vdGUgdGhhdCB0aGlzIGNvbmZsaWN0IGV4aXN0cyBtaWdodCBnZXQgbG9zdCBzb21ld2hl cmUgYmV0d2Vlbgpub3cgYW5kIHdoZW4gdGhlIGRybSBwdWxsIGxhbmRzIGluIExpbnVzJyBpbmJv eCBpbiAyIG1vbnRocyAuLi4KCk90b2ggaGUncyBwcm9iYWJseSBnb2luZyB0byBjb21waWxlIHRl c3QgZHJtIGV4dHJhIGNhcmVmdWxseSBhbmQgd2lsbApub3RpY2UgOi0pCi1EYW5pZWwKCj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYyB8IDIg Ky0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCj4gCj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZp Y2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYwo+ IGluZGV4IDZhODI1OGVhY2RjYi4uOWYyNGM1ZGEzZjhkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYwo+IEBAIC0xNzQsNyArMTc0 LDcgQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKm1vY2tfZ2VtX2RldmljZSh2b2lkKQo+ICAJ aTkxNS0+cmVxdWVzdHMgPSBLTUVNX0NBQ0hFKG1vY2tfcmVxdWVzdCwKPiAgCQkJCSAgICBTTEFC X0hXQ0FDSEVfQUxJR04gfAo+ICAJCQkJICAgIFNMQUJfUkVDTEFJTV9BQ0NPVU5UIHwKPiAtCQkJ CSAgICBTTEFCX0RFU1RST1lfQllfUkNVKTsKPiArCQkJCSAgICBTTEFCX1RZUEVTQUZFX0JZX1JD VSk7Cj4gIAlpZiAoIWk5MTUtPnJlcXVlc3RzKQo+ICAJCWdvdG8gZXJyX3ZtYXM7Cj4gIAo+IC0t IAo+IDIuMTEuMAo+IAo+IC0tIAo+IENoZWVycywKPiBTdGVwaGVuIFJvdGh3ZWxsCgotLSAKRGFu aWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Js b2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==