Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp650590ybv; Wed, 5 Feb 2020 12:00:09 -0800 (PST) X-Google-Smtp-Source: APXvYqw18yEagNOwdwi71Z1esMJCZBPj4likJ8BuVmurgZqaNeI6doyEtViQWcuViYlPbrb8O9ej X-Received: by 2002:a9d:7410:: with SMTP id n16mr28378788otk.23.1580932809351; Wed, 05 Feb 2020 12:00:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580932809; cv=none; d=google.com; s=arc-20160816; b=zXLkfNX53Q0qFwoK49tYLRqVbyS/nuH7pfInIzqvwJD99er5RQ9DqPn66VjewdfH+r 5JsLW8tEwJ00S169BiCNImv4qHtUBM7z36A3wmTPtX4FpDqPVx3jIIGuKYLRyWmxxrzK wg0HnboV9Fe+Zlo3/pjoxTCfaKyXWwpYK+7ASI/37M0N4poTR+ThvZkhD+nQgY0zSY5m yH2p0BL/6AmxM5L560FwLYSazKz6OQRgT+1tkcT8Aw+zVY2C68VloBphWqbgdv2bdduG 05Z1xRVOCDBaml5YoBYl2QZRzO4XBD8/xrcKMXnx660FLk82cyTnjk5BCbEe0WwjWdbN HxCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=E8DT/JDkCyTz3eJT+UFCcTHz+yBESFEOpQDShsbicZo=; b=x65jaCyR5s/JiVAUiy8Gwd1KfaCcOv9a3wzwOHIiSY5r8wAhrTP8Mt1FUSqXiLFKOZ MiQWfb6za/pA4gm6zLuZIHPbropv7raGk/n4F/4jnJbxRAt0TNbFF0mockVV+2GgZgSF ZnZZzmJxhz7ye9wXpE4YUg8MdxgCPjpsyF0VmhGDzJIQybmg+K2MfMn8Iv7PsPNhNJkl WiXRUzxAf0RIegxZTr6BjrFjt64s4/1WbWiU7dC7WcYvZrY1OKwuRVWg5YreyLzOwJ7U Z2q8ohgV/lkc1dni7DhVuBt9XN0ctM137P9oBlO+kv4MIom1syqQa3LPW57NxevdHpZi oE2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=WUu4aa27; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p23si378436otk.119.2020.02.05.11.59.55; Wed, 05 Feb 2020 12:00:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=WUu4aa27; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727499AbgBET5P (ORCPT + 99 others); Wed, 5 Feb 2020 14:57:15 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:40464 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727361AbgBET5P (ORCPT ); Wed, 5 Feb 2020 14:57:15 -0500 Received: by mail-io1-f66.google.com with SMTP id x1so3571318iop.7 for ; Wed, 05 Feb 2020 11:57:14 -0800 (PST) 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=E8DT/JDkCyTz3eJT+UFCcTHz+yBESFEOpQDShsbicZo=; b=WUu4aa27JwL7uv2P/L4c3Ok+FyuKnqJGHLzGZYjJt9q/DSazi89aSuNF5QF2wicVsv ebLtKMEBEsZTeJWcdtGUvwZRlzQ6lkH9tS6lvboxehjdvt+GgWZOI0X3pYDwY5fbUwlk 66EQ3KGTsAybDLyF43WaeikkWK6NTpmVU9U5LF4og2RqArCzJtLfT9K6EN7ncauORJV3 viR4bsYex8C8aof2HDO8Bn+/YKScoZj0PNhkb249dkiQ/jhxzlJQ0woYy1wUNij+nC3p ddfQqM4Yu9A2zOMqInce5lbterdjRi4WoVxM6b1kcH5v/XULCALRXlK6AJmKiK5hABpP 2K6g== 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=E8DT/JDkCyTz3eJT+UFCcTHz+yBESFEOpQDShsbicZo=; b=cFpgtHPj0fyzsMVLLabd+elWmX3gzG049hWq4bQ4lGZD+A2maGOiCbH/vbTmnSGukC BtAN4FLCeCD+0oODMOBz6ST2ITLezCTD+NqKdWV8l2O5/K6QYErEYP/UYRsxXrlUf0eO J16DUmCRhsvxDQ9V6rj6Uuul1tjx9i9I9o2BcFhLmGVmj50yY3Hpt479/9hPORqO4fEL xlxsxVHfJc/5U70iv9vikIwN8DsNOeZEA7XN7267XzE8+TkTI79fT6aN+8NCW+lgCIop 5Z82M4rbqk1kp5cZbJuHoYjo1WaGYf3FQgbq/wrW6SB7k+NtAEzxIXbhN83Hc6qSqnB6 idVw== X-Gm-Message-State: APjAAAWH+9hBzd5AQuEpOtARA3IqvqNdILtQGTIGm8dMUd3r9+bBt6zM dbt/1AsX+EeBlaeyPd1E3c+uz4t1GclKY7Vs0eI= X-Received: by 2002:a6b:e705:: with SMTP id b5mr31341286ioh.139.1580932634363; Wed, 05 Feb 2020 11:57:14 -0800 (PST) MIME-Version: 1.0 References: <20200205105955.28143-1-kraxel@redhat.com> <20200205105955.28143-5-kraxel@redhat.com> In-Reply-To: <20200205105955.28143-5-kraxel@redhat.com> From: Chia-I Wu Date: Wed, 5 Feb 2020 11:57:03 -0800 Message-ID: Subject: Re: [PATCH 4/4] drm/virtio: move virtio_gpu_mem_entry initialization to new function To: Gerd Hoffmann Cc: ML dri-devel , Gurchetan Singh , 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, Feb 5, 2020 at 3:00 AM Gerd Hoffmann wrote: > > Introduce new virtio_gpu_object_shmem_init() helper function which will > create the virtio_gpu_mem_entry array, containing the backing storage > information for the host. For the most path this just moves code from > virtio_gpu_object_attach(). > > Signed-off-by: Gerd Hoffmann > --- > drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++ > drivers/gpu/drm/virtio/virtgpu_object.c | 49 +++++++++++++++++++++++++ > drivers/gpu/drm/virtio/virtgpu_vq.c | 49 ++----------------------- > 3 files changed, 56 insertions(+), 46 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index 15fb3c12f22f..be62a7469b04 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -71,6 +71,10 @@ struct virtio_gpu_object { > > struct sg_table *pages; > uint32_t mapped; > + > + struct virtio_gpu_mem_entry *ents; > + unsigned int nents; > + > bool dumb; > bool created; > }; > diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c > index bce2b3d843fe..4e82e269a1f4 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_object.c > +++ b/drivers/gpu/drm/virtio/virtgpu_object.c > @@ -121,6 +121,49 @@ struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev, > return &bo->base.base; > } > > +static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo) > +{ > + bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev); > + struct scatterlist *sg; > + int si, ret; > + > + ret = drm_gem_shmem_pin(&bo->base.base); > + if (ret < 0) > + return -EINVAL; > + > + bo->pages = drm_gem_shmem_get_sg_table(&bo->base.base); > + if (bo->pages == NULL) { > + drm_gem_shmem_unpin(&bo->base.base); > + return -EINVAL; > + } > + > + if (use_dma_api) { > + bo->mapped = dma_map_sg(vgdev->vdev->dev.parent, > + bo->pages->sgl, bo->pages->nents, > + DMA_TO_DEVICE); > + bo->nents = bo->mapped; > + } else { > + bo->nents = bo->pages->nents; > + } > + > + bo->ents = kmalloc_array(bo->nents, sizeof(struct virtio_gpu_mem_entry), > + GFP_KERNEL); > + if (!bo->ents) { > + DRM_ERROR("failed to allocate ent list\n"); > + return -ENOMEM; > + } > + > + for_each_sg(bo->pages->sgl, sg, bo->nents, si) { > + bo->ents[si].addr = cpu_to_le64(use_dma_api > + ? sg_dma_address(sg) > + : sg_phys(sg)); > + bo->ents[si].length = cpu_to_le32(sg->length); > + bo->ents[si].padding = 0; > + } > + return 0; > +} > + > int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object_params *params, > struct virtio_gpu_object **bo_ptr, > @@ -165,6 +208,12 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, > objs, fence); > } > > + ret = virtio_gpu_object_shmem_init(vgdev, bo); > + if (ret != 0) { > + virtio_gpu_free_object(&shmem_obj->base); > + return ret; > + } > + > ret = virtio_gpu_object_attach(vgdev, bo, NULL); > if (ret != 0) { > virtio_gpu_free_object(&shmem_obj->base); > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > index e258186bedb2..7db91376f2f2 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -1081,54 +1081,11 @@ int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object *obj, > struct virtio_gpu_fence *fence) > { > - bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev); > - struct virtio_gpu_mem_entry *ents; > - struct scatterlist *sg; > - int si, nents, ret; > - > - if (WARN_ON_ONCE(!obj->created)) > - return -EINVAL; > - if (WARN_ON_ONCE(obj->pages)) > - return -EINVAL; > - > - ret = drm_gem_shmem_pin(&obj->base.base); > - if (ret < 0) > - return -EINVAL; > - > - obj->pages = drm_gem_shmem_get_sg_table(&obj->base.base); > - if (obj->pages == NULL) { > - drm_gem_shmem_unpin(&obj->base.base); > - return -EINVAL; > - } > - > - if (use_dma_api) { > - obj->mapped = dma_map_sg(vgdev->vdev->dev.parent, > - obj->pages->sgl, obj->pages->nents, > - DMA_TO_DEVICE); > - nents = obj->mapped; > - } else { > - nents = obj->pages->nents; > - } > - > - /* gets freed when the ring has consumed it */ > - ents = kmalloc_array(nents, sizeof(struct virtio_gpu_mem_entry), > - GFP_KERNEL); > - if (!ents) { > - DRM_ERROR("failed to allocate ent list\n"); > - return -ENOMEM; > - } > - > - for_each_sg(obj->pages->sgl, sg, nents, si) { > - ents[si].addr = cpu_to_le64(use_dma_api > - ? sg_dma_address(sg) > - : sg_phys(sg)); > - ents[si].length = cpu_to_le32(sg->length); > - ents[si].padding = 0; > - } > - > virtio_gpu_cmd_resource_attach_backing(vgdev, obj->hw_res_handle, > - ents, nents, > + obj->ents, obj->nents, > fence); > + obj->ents = NULL; > + obj->nents = 0; Hm, if the entries are temporary, can we allocate and initialize them in this function? virtio_gpu_object_shmem_init will just pin and map pages. Maybe rename it to virtio_gpu_object_pin_pages (and add a helper virtio_gpu_object_unpin_pages for use by virtio_gpu_cleanup_object). Because we pin pages on object creation, virtio_gpu_gem_funcs does not need to provide the optional pin/unpin hooks. > return 0; > } > > -- > 2.18.1 >