From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-f195.google.com ([209.85.219.195]:45266 "EHLO mail-yb1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727159AbeIZVIc (ORCPT ); Wed, 26 Sep 2018 17:08:32 -0400 Received: by mail-yb1-f195.google.com with SMTP id d9-v6so11411658ybr.12 for ; Wed, 26 Sep 2018 07:55:12 -0700 (PDT) Date: Wed, 26 Sep 2018 10:55:11 -0400 From: Sean Paul To: Jason Ekstrand Cc: dri-devel@lists.freedesktop.org, Jason Ekstrand , stable@vger.kernel.org Subject: Re: [PATCH] drm/syncobj: Don't leak fences when WAIT_FOR_SUBMIT is set Message-ID: <20180926145511.GS72545@art_vandelay> References: <20180926071703.15257-1-jason.ekstrand@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180926071703.15257-1-jason.ekstrand@intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Sep 26, 2018 at 02:17:03AM -0500, Jason Ekstrand wrote: > We attempt to get fences earlier in the hopes that everything will > already have fences and no callbacks will be needed. If we do succeed > in getting a fence, getting one a second time will result in a duplicate > ref with no unref. This is causing memory leaks in Vulkan applications > that create a lot of fences; playing for a few hours can, apparently, > bring down the system. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107899 > Signed-off-by: Jason Ekstrand Pushed to drm-misc-fixes, thanks! Sean > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/drm_syncobj.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c > index adb3cb27d31e..759278fef35a 100644 > --- a/drivers/gpu/drm/drm_syncobj.c > +++ b/drivers/gpu/drm/drm_syncobj.c > @@ -97,6 +97,8 @@ static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, > { > int ret; > > + WARN_ON(*fence); > + > *fence = drm_syncobj_fence_get(syncobj); > if (*fence) > return 1; > @@ -743,6 +745,9 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, > > if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) { > for (i = 0; i < count; ++i) { > + if (entries[i].fence) > + continue; > + > drm_syncobj_fence_get_or_add_callback(syncobjs[i], > &entries[i].fence, > &entries[i].syncobj_cb, > -- > 2.17.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS