From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28404C43331 for ; Thu, 5 Sep 2019 17:14:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEE0920828 for ; Thu, 5 Sep 2019 17:14:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pMRdQRIl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388443AbfIEROd (ORCPT ); Thu, 5 Sep 2019 13:14:33 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:36500 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729945AbfIEROd (ORCPT ); Thu, 5 Sep 2019 13:14:33 -0400 Received: by mail-io1-f65.google.com with SMTP id b136so6539246iof.3 for ; Thu, 05 Sep 2019 10:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TTCctpkX00mowbNYgM0kIWU2mkTavgxoTs3XunObL/I=; b=pMRdQRIl9vuOA+nHETjwUCF9udSp5PW7cTCK4Jh+bPhGYJNF0N3bjjDk7LCt4Uwplm iy2tuWxdiYyRLTvt6r4GgT+p9RJMOnyKA+umCVnfV2wiSfDkQlKt/OSAc4Va1sy2/Qqz TbDiflxrsy/pVLoa5JUtgrCaOQ5PYAiwrTnu7+WQrZbvVtJuyHmeyJFPjf7E0jyPahOM ohpQ5Xqm2Ir1EF+98Iq5lnJBcOE146CeJz4xe6yylI16QWb/Aopse67u3uh3HEqrZuQJ IlwiJZNxoKbrn7dGm7qE6sYZrY6deHg0OaeBBJcjs2/p9Q3v8nplXkocXnLvQkGnGeq7 BOcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TTCctpkX00mowbNYgM0kIWU2mkTavgxoTs3XunObL/I=; b=JYCY8OAuJP+jGTYacafnJees8KosydCUTqlBR1RFzy9WQUnZ30gXMOu4SCkP72eJrm lMNu9Yt8xLqId6bfFWZcq8mcQinMR3oc63K8mztywsylo9W5+oA/vcbYn+bl79S0hCw+ HsyH/iaLVprR7R0cIWpNBR86j10pm575/qUjKT/ljFTD3ElKQ7brEIKT9FpJUp+7+pG/ 87jeK+gu5kMgL4Zj8OvwPfYEfpsJw57bxc27e/1rdZ0AImPOM9RQ287t+45NG/uIe7DI wgnpUEL7Nj54UdK5/rWSUXALX0KbTU5jY7Ugf1C/8SwdmBNPQV/ErRfeCFBIpsfTRxLd gZog== X-Gm-Message-State: APjAAAVszgiFWw2qBYVA5zUaawJhuaUc9UFuTKj9JPTMztLhH7EeJgb4 8PtuwiF8lq3hupwTWo/lvSeyYjrRnf7fWXPRcCE= X-Google-Smtp-Source: APXvYqyFRrcEUYAzNKAMqPVORab2OGeAkhhkQx1fB9YTAhkq6c0qW9HmWRMVc4oWCScMVD4hVjvX8XxINlOEm6TsfVc= X-Received: by 2002:a6b:e903:: with SMTP id u3mr5289382iof.241.1567703671793; Thu, 05 Sep 2019 10:14:31 -0700 (PDT) MIME-Version: 1.0 References: <20190904074828.32502-1-kraxel@redhat.com> <20190905052340.gfwmzkqwcpxtvzvu@sirius.home.kraxel.org> In-Reply-To: <20190905052340.gfwmzkqwcpxtvzvu@sirius.home.kraxel.org> From: Chia-I Wu Date: Thu, 5 Sep 2019 10:14:20 -0700 Message-ID: Subject: Re: [PATCH] drm/virtio: fix command submission with objects but without fence. To: Gerd Hoffmann Cc: ML dri-devel , David Airlie , Daniel Vetter , "open list:VIRTIO GPU DRIVER" , open list Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 4, 2019 at 10:23 PM Gerd Hoffmann wrote: > > On Wed, Sep 04, 2019 at 04:10:30PM -0700, Chia-I Wu wrote: > > On Wed, Sep 4, 2019 at 12:48 AM Gerd Hoffmann wrote: > > > > > > Only call virtio_gpu_array_add_fence if we actually have a fence. > > > > > > Fixes: da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing") > > > Signed-off-by: Gerd Hoffmann > > > --- > > > drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- > > > 1 file changed, 5 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > > > index 595fa6ec2d58..7fd2851f7b97 100644 > > > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > > > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > > > @@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, > > > goto again; > > > } > > > > > > - if (fence) > > > + if (fence) { > > > virtio_gpu_fence_emit(vgdev, hdr, fence); > > > - if (vbuf->objs) { > > > - virtio_gpu_array_add_fence(vbuf->objs, &fence->f); > > > - virtio_gpu_array_unlock_resv(vbuf->objs); > > > + if (vbuf->objs) { > > > + virtio_gpu_array_add_fence(vbuf->objs, &fence->f); > > > + virtio_gpu_array_unlock_resv(vbuf->objs); > > > + } > > This leaks when fence == NULL and vbuf->objs != NULL (which can really > > happen IIRC... not at my desk to check). > > Yes, it can happen, for example when flushing dumb buffers. > > But I don't think we leak in this case. The code paths which don't need > a fence also do not call virtio_gpu_array_lock_resv(), so things are > balanced. The actual release of the objs happens in > virtio_gpu_dequeue_ctrl_func() via virtio_gpu_array_put_free_delayed(). I misread and thought this was in virtio_gpu_dequeue_ctrl_func. Sorry :( Reviewed-by: Chia-I Wu > > cheers, > Gerd > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chia-I Wu Subject: Re: [PATCH] drm/virtio: fix command submission with objects but without fence. Date: Thu, 5 Sep 2019 10:14:20 -0700 Message-ID: References: <20190904074828.32502-1-kraxel@redhat.com> <20190905052340.gfwmzkqwcpxtvzvu@sirius.home.kraxel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFE206E048 for ; Thu, 5 Sep 2019 17:14:32 +0000 (UTC) Received: by mail-io1-xd44.google.com with SMTP id r4so6522642iop.4 for ; Thu, 05 Sep 2019 10:14:32 -0700 (PDT) In-Reply-To: <20190905052340.gfwmzkqwcpxtvzvu@sirius.home.kraxel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gerd Hoffmann Cc: David Airlie , open list , ML dri-devel , "open list:VIRTIO GPU DRIVER" List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBTZXAgNCwgMjAxOSBhdCAxMDoyMyBQTSBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxAcmVk aGF0LmNvbT4gd3JvdGU6Cj4KPiBPbiBXZWQsIFNlcCAwNCwgMjAxOSBhdCAwNDoxMDozMFBNIC0w NzAwLCBDaGlhLUkgV3Ugd3JvdGU6Cj4gPiBPbiBXZWQsIFNlcCA0LCAyMDE5IGF0IDEyOjQ4IEFN IEdlcmQgSG9mZm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPiB3cm90ZToKPiA+ID4KPiA+ID4gT25s eSBjYWxsIHZpcnRpb19ncHVfYXJyYXlfYWRkX2ZlbmNlIGlmIHdlIGFjdHVhbGx5IGhhdmUgYSBm ZW5jZS4KPiA+ID4KPiA+ID4gRml4ZXM6IGRhNzU4ZDUxOTY4YSAoImRybS92aXJ0aW86IHJld29y ayB2aXJ0aW9fZ3B1X2V4ZWNidWZmZXJfaW9jdGwgZmVuY2luZyIpCj4gPiA+IFNpZ25lZC1vZmYt Ynk6IEdlcmQgSG9mZm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPgo+ID4gPiAtLS0KPiA+ID4gIGRy aXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV92cS5jIHwgOSArKysrKy0tLS0KPiA+ID4gIDEg ZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4gPiA+Cj4gPiA+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEuYyBiL2RyaXZl cnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV92cS5jCj4gPiA+IGluZGV4IDU5NWZhNmVjMmQ1OC4u N2ZkMjg1MWY3Yjk3IDEwMDY0NAo+ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3Zp cnRncHVfdnEuYwo+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEu Ywo+ID4gPiBAQCAtMzM5LDExICszMzksMTIgQEAgc3RhdGljIHZvaWQgdmlydGlvX2dwdV9xdWV1 ZV9mZW5jZWRfY3RybF9idWZmZXIoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICp2Z2RldiwKPiA+ ID4gICAgICAgICAgICAgICAgIGdvdG8gYWdhaW47Cj4gPiA+ICAgICAgICAgfQo+ID4gPgo+ID4g PiAtICAgICAgIGlmIChmZW5jZSkKPiA+ID4gKyAgICAgICBpZiAoZmVuY2UpIHsKPiA+ID4gICAg ICAgICAgICAgICAgIHZpcnRpb19ncHVfZmVuY2VfZW1pdCh2Z2RldiwgaGRyLCBmZW5jZSk7Cj4g PiA+IC0gICAgICAgaWYgKHZidWYtPm9ianMpIHsKPiA+ID4gLSAgICAgICAgICAgICAgIHZpcnRp b19ncHVfYXJyYXlfYWRkX2ZlbmNlKHZidWYtPm9ianMsICZmZW5jZS0+Zik7Cj4gPiA+IC0gICAg ICAgICAgICAgICB2aXJ0aW9fZ3B1X2FycmF5X3VubG9ja19yZXN2KHZidWYtPm9ianMpOwo+ID4g PiArICAgICAgICAgICAgICAgaWYgKHZidWYtPm9ianMpIHsKPiA+ID4gKyAgICAgICAgICAgICAg ICAgICAgICAgdmlydGlvX2dwdV9hcnJheV9hZGRfZmVuY2UodmJ1Zi0+b2JqcywgJmZlbmNlLT5m KTsKPiA+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgdmlydGlvX2dwdV9hcnJheV91bmxvY2tf cmVzdih2YnVmLT5vYmpzKTsKPiA+ID4gKyAgICAgICAgICAgICAgIH0KPiA+IFRoaXMgbGVha3Mg d2hlbiBmZW5jZSA9PSBOVUxMIGFuZCB2YnVmLT5vYmpzICE9IE5VTEwgKHdoaWNoIGNhbiByZWFs bHkKPiA+IGhhcHBlbiBJSVJDLi4uIG5vdCBhdCBteSBkZXNrIHRvIGNoZWNrKS4KPgo+IFllcywg aXQgY2FuIGhhcHBlbiwgZm9yIGV4YW1wbGUgd2hlbiBmbHVzaGluZyBkdW1iIGJ1ZmZlcnMuCj4K PiBCdXQgSSBkb24ndCB0aGluayB3ZSBsZWFrIGluIHRoaXMgY2FzZS4gIFRoZSBjb2RlIHBhdGhz IHdoaWNoIGRvbid0IG5lZWQKPiBhIGZlbmNlIGFsc28gZG8gbm90IGNhbGwgdmlydGlvX2dwdV9h cnJheV9sb2NrX3Jlc3YoKSwgc28gdGhpbmdzIGFyZQo+IGJhbGFuY2VkLiAgVGhlIGFjdHVhbCBy ZWxlYXNlIG9mIHRoZSBvYmpzIGhhcHBlbnMgaW4KPiB2aXJ0aW9fZ3B1X2RlcXVldWVfY3RybF9m dW5jKCkgdmlhIHZpcnRpb19ncHVfYXJyYXlfcHV0X2ZyZWVfZGVsYXllZCgpLgpJIG1pc3JlYWQg YW5kIHRob3VnaHQgdGhpcyB3YXMgaW4gdmlydGlvX2dwdV9kZXF1ZXVlX2N0cmxfZnVuYy4gIFNv cnJ5IDooCgpSZXZpZXdlZC1ieTogQ2hpYS1JIFd1IDxvbHZhZmZlQGdtYWlsLmNvbT4KCgoKPgo+ IGNoZWVycywKPiAgIEdlcmQKPgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWw=