From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/fb-helper: Fix race between deferred_io worker and dirty updater Date: Thu, 20 Oct 2016 16:34:51 +0200 Message-ID: <20161020143451.GV20761@phenom.ffwll.local> References: <20161020132055.9646-1-tiwai@suse.de> <20161020132814.GT4329@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CA136EB79 for ; Thu, 20 Oct 2016 14:34:56 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id b75so569974lfg.3 for ; Thu, 20 Oct 2016 07:34:56 -0700 (PDT) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Takashi Iwai Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMjAsIDIwMTYgYXQgMDM6MzY6NTRQTSArMDIwMCwgVGFrYXNoaSBJd2FpIHdy b3RlOgo+IE9uIFRodSwgMjAgT2N0IDIwMTYgMTU6Mjg6MTQgKzAyMDAsCj4gVmlsbGUgU3lyasOk bMOkIHdyb3RlOgo+ID4gCj4gPiBPbiBUaHUsIE9jdCAyMCwgMjAxNiBhdCAwMzoyMDo1NVBNICsw MjAwLCBUYWthc2hpIEl3YWkgd3JvdGU6Cj4gPiA+IFNpbmNlIDQuNyBrZXJuZWwsIHdlJ3ZlIHNl ZW4gdGhlIGVycm9yIG1lc3NhZ2VzIGxpa2UKPiA+ID4gCj4gPiA+ICBrZXJuZWw6IFtUVE1dIEJ1 ZmZlciBldmljdGlvbiBmYWlsZWQKPiA+ID4gIGtlcm5lbDogcXhsIDAwMDA6MDA6MDIuMDogb2Jq ZWN0X2luaXQgZmFpbGVkIGZvciAoNDAyNjU0MDAzMiwgMHgwMDAwMDAwMSkKPiA+ID4gIGtlcm5l bDogW2RybTpxeGxfYWxsb2NfYm9fcmVzZXJ2ZWQgW3F4bF1dICpFUlJPUiogZmFpbGVkIHRvIGFs bG9jYXRlIFZSQU0gQk8KPiA+ID4gCj4gPiA+IG9uIFFYTCB3aGVuIHN3aXRjaGluZyBhbmQgYWNj ZXNzaW5nIG9uIFZULiAgVGhlIGN1bHByaXQgd2FzIHRoZSBnZW5lcmljCj4gPiA+IGRlZmVycmVk X2lvIGNvZGUgKHF4bCBkcml2ZXIgc3dpdGNoZWQgdG8gaXQgc2luY2UgNC43KS4gIFRoZXJlIGlz IGEKPiA+ID4gcmFjZSBiZXR3ZWVuIHRoZSBkaXJ0eSBjbGlwIHVwZGF0ZSBhbmQgdGhlIGNhbGwg b2YgY2FsbGJhY2suCj4gPiA+IAo+ID4gPiBJbiBkcm1fZmJfaGVscGVyX2RpcnR5KCksIHRoZSBk aXJ0eSBjbGlwIGlzIHVwZGF0ZWQgaW4gdGhlIHNwaW5sb2NrLAo+ID4gPiB3aGlsZSBpdCBraWNr cyBvZmYgdGhlIHVwZGF0ZSB3b3JrZXIgb3V0c2lkZSB0aGUgc3BpbmxvY2suICBNZWFud2hpbGUK PiA+ID4gdGhlIHVwZGF0ZSB3b3JrZXIgY2xlYXJzIHRoZSBkaXJ0eSBjbGlwIGluIHRoZSBzcGlu bG9jaywgdG9vLiAgVGh1cywKPiA+ID4gd2hlbiBkcm1fZmJfaGVscGVyX2RpcnR5KCkgaXMgY2Fs bGVkIGNvbmN1cnJlbnRseSwgc2NoZWR1bGVfd29yaygpIGlzCj4gPiA+IGNhbGxlZCBhZnRlciB0 aGUgY2xpcCBpcyBjbGVhcmVkIGluIHRoZSBmaXJzdCB3b3JrZXIgY2FsbC4KPiA+IAo+ID4gV2h5 IGRvZXMgdGhhdCBtYXR0ZXI/IFRoZSBmaXJzdCB3b3JrZXIgc2hvdWxkIGhhdmUgZG9uZSBhbGwg dGhlCj4gPiBuZWNlc3Nhcnkgd29yayBhbHJlYWR5LCBubz8KPiAKPiBCZWZvcmUgdGhlIGZpcnN0 IGNhbGwsIGl0IGNsZWFycyB0aGUgY2xpcCBhbmQgcGFzc2VzIHRoZSBjb3BpZWQgY2xpcAo+IHRv IHRoZSBjYWxsYmFjay4gIFRoZW4gdGhlIHNlY29uZCBjYWxsIHdpbGwgYmUgd2l0aCB0aGUgY2xl YXJlZCBhbmQKPiB1bnRvdWNoZWQgY2xpcCwgaS5lLiB3aXRoIHgxPX4wLiAgVGhpcyBjb25mdXNl cwo+IHF4bF9mcmFtZWJ1ZmZlcl9kaXJ0eSgpLgo+IAo+IE9mIGNvdXJzZSwgd2UgY2FuIGZpbHRl ciBvdXQgaW4gdGhlIGNhbGxiYWNrIHNpZGUgYnkgY2hlY2tpbmcgdGhlCj4gY2xpcC4gIEl0IHdh cyBhY3R1YWxseSBteSBmaXJzdCB2ZXJzaW9uLiAgQnV0IGJhc2ljYWxseSBpdCdzIGEgcmFjZQo+ IGFuZCBzaG91bGQgYmUgY292ZXJlZCBiZXR0ZXIgaW4gdGhlIGNhbGxlciBzaWRlLgoKSG0sIEkg dGhvdWdodCBzY2hlZHVsZV93b3JrIGFsc28gc2NoZWR1bGVzIHRoZSB3b3JrIHdoZW4gaXQncyBn ZXR0aW5nCnByb2Nlc3NlZCByaWdodCBub3cuIFdoaWNoIG1lYW5zIGlmIHlvdSdyZSBzdXBlciB1 bmx1Y2t5IHlvdSBjYW4gc3RpbGwgZW5kCnVwIHdpdGggdGhlIHdvcmsgaGl0dGluZyBhbiBlbXB0 eSByZWN0YW5nbGUuIEkgdGhpbmsgZmlsdGVyaW5nIGVtcHR5IHJlY3RzCmluIHRoZSB3b3JrZXIg aXMgd2hhdCB3ZSBuZWVkIHRvIGRvIGluc3RlYWQuCgpPciBpcyBjb2ZmZWUgbm90IHdvcmtpbmcg cmlnaHQgbm93PwotRGFuaWVsCj4gCj4gCj4gdGhhbmtzLAo+IAo+IFRha2FzaGkKPiAKPiA+IAo+ ID4gPiAKPiA+ID4gVGhlIGZpeCBpcyBzaW1wbHkgbW92aW5nIHNjaGVkdWxlX3dvcmsoKSBpbnNp ZGUgdGhlIHNwaW5sb2NrLgo+ID4gPiAKPiA+ID4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVl ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MzIyCj4gPiA+IEJ1Z3ppbGxhOiBodHRwczov L2J1Z3ppbGxhLnN1c2UuY29tL3Nob3dfYnVnLmNnaT9pZD0xMDAzMjk4Cj4gPiA+IEZpeGVzOiBl YWE0MzRkZWZhY2EgKCdkcm0vZmItaGVscGVyOiBBZGQgZmJfZGVmZXJyZWRfaW8gc3VwcG9ydCcp Cj4gPiA+IFNpZ25lZC1vZmYtYnk6IFRha2FzaGkgSXdhaSA8dGl3YWlAc3VzZS5kZT4KPiA+ID4g LS0tCj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIHwgMyArLS0KPiA+ID4g IDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMiBkZWxldGlvbnMoLSkKPiA+ID4gCj4g PiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwo+ID4gPiBpbmRleCAwMzQxNGJkZTFmMTUuLmJhZTM5 MmRlYTJjYyAxMDA2NDQKPiA+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIu Ywo+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCj4gPiA+IEBAIC04 NjEsOSArODYxLDggQEAgc3RhdGljIHZvaWQgZHJtX2ZiX2hlbHBlcl9kaXJ0eShzdHJ1Y3QgZmJf aW5mbyAqaW5mbywgdTMyIHgsIHUzMiB5LAo+ID4gPiAgCWNsaXAtPnkxID0gbWluX3QodTMyLCBj bGlwLT55MSwgeSk7Cj4gPiA+ICAJY2xpcC0+eDIgPSBtYXhfdCh1MzIsIGNsaXAtPngyLCB4ICsg d2lkdGgpOwo+ID4gPiAgCWNsaXAtPnkyID0gbWF4X3QodTMyLCBjbGlwLT55MiwgeSArIGhlaWdo dCk7Cj4gPiA+IC0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmaGVscGVyLT5kaXJ0eV9sb2NrLCBm bGFncyk7Cj4gPiA+IC0KPiA+ID4gIAlzY2hlZHVsZV93b3JrKCZoZWxwZXItPmRpcnR5X3dvcmsp Owo+ID4gPiArCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmhlbHBlci0+ZGlydHlfbG9jaywgZmxh Z3MpOwo+ID4gPiAgfQo+ID4gPiAgCj4gPiA+ICAvKioKPiA+ID4gLS0gCj4gPiA+IDIuMTAuMQo+ ID4gPiAKPiA+ID4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KPiA+ID4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+ID4gPiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gPiA+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCj4gPiAKPiA+IC0tIAo+ID4gVmlsbGUgU3lyasOkbMOkCj4gPiBJ bnRlbCBPVEMKPiA+IAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVs IENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935175AbcJTOe6 (ORCPT ); Thu, 20 Oct 2016 10:34:58 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34159 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753224AbcJTOe4 (ORCPT ); Thu, 20 Oct 2016 10:34:56 -0400 Date: Thu, 20 Oct 2016 16:34:51 +0200 From: Daniel Vetter To: Takashi Iwai Cc: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , dri-devel@lists.freedesktop.org, Daniel Vetter , linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/fb-helper: Fix race between deferred_io worker and dirty updater Message-ID: <20161020143451.GV20761@phenom.ffwll.local> Mail-Followup-To: Takashi Iwai , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20161020132055.9646-1-tiwai@suse.de> <20161020132814.GT4329@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 4.6.0-1-amd64 User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 20, 2016 at 03:36:54PM +0200, Takashi Iwai wrote: > On Thu, 20 Oct 2016 15:28:14 +0200, > Ville Syrjälä wrote: > > > > On Thu, Oct 20, 2016 at 03:20:55PM +0200, Takashi Iwai wrote: > > > Since 4.7 kernel, we've seen the error messages like > > > > > > kernel: [TTM] Buffer eviction failed > > > kernel: qxl 0000:00:02.0: object_init failed for (4026540032, 0x00000001) > > > kernel: [drm:qxl_alloc_bo_reserved [qxl]] *ERROR* failed to allocate VRAM BO > > > > > > on QXL when switching and accessing on VT. The culprit was the generic > > > deferred_io code (qxl driver switched to it since 4.7). There is a > > > race between the dirty clip update and the call of callback. > > > > > > In drm_fb_helper_dirty(), the dirty clip is updated in the spinlock, > > > while it kicks off the update worker outside the spinlock. Meanwhile > > > the update worker clears the dirty clip in the spinlock, too. Thus, > > > when drm_fb_helper_dirty() is called concurrently, schedule_work() is > > > called after the clip is cleared in the first worker call. > > > > Why does that matter? The first worker should have done all the > > necessary work already, no? > > Before the first call, it clears the clip and passes the copied clip > to the callback. Then the second call will be with the cleared and > untouched clip, i.e. with x1=~0. This confuses > qxl_framebuffer_dirty(). > > Of course, we can filter out in the callback side by checking the > clip. It was actually my first version. But basically it's a race > and should be covered better in the caller side. Hm, I thought schedule_work also schedules the work when it's getting processed right now. Which means if you're super unlucky you can still end up with the work hitting an empty rectangle. I think filtering empty rects in the worker is what we need to do instead. Or is coffee not working right now? -Daniel > > > thanks, > > Takashi > > > > > > > > > The fix is simply moving schedule_work() inside the spinlock. > > > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98322 > > > Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1003298 > > > Fixes: eaa434defaca ('drm/fb-helper: Add fb_deferred_io support') > > > Signed-off-by: Takashi Iwai > > > --- > > > drivers/gpu/drm/drm_fb_helper.c | 3 +-- > > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > > > index 03414bde1f15..bae392dea2cc 100644 > > > --- a/drivers/gpu/drm/drm_fb_helper.c > > > +++ b/drivers/gpu/drm/drm_fb_helper.c > > > @@ -861,9 +861,8 @@ static void drm_fb_helper_dirty(struct fb_info *info, u32 x, u32 y, > > > clip->y1 = min_t(u32, clip->y1, y); > > > clip->x2 = max_t(u32, clip->x2, x + width); > > > clip->y2 = max_t(u32, clip->y2, y + height); > > > - spin_unlock_irqrestore(&helper->dirty_lock, flags); > > > - > > > schedule_work(&helper->dirty_work); > > > + spin_unlock_irqrestore(&helper->dirty_lock, flags); > > > } > > > > > > /** > > > -- > > > 2.10.1 > > > > > > _______________________________________________ > > > dri-devel mailing list > > > dri-devel@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > -- > > Ville Syrjälä > > Intel OTC > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch