drivers/gpu/drm/virtio/virtgpu_ioctl.c:633 virtio_gpu_resource_create_blob_ioctl() error: we previously assumed 'obj->pages' could be null (see line 624)
PATCH 200/207 drivers/gpu/drm/virtio/virtgpu_ioctl.c:633 virtio_gpu_resource_create_blob_ioctl() error: we previously assumed 'obj->pages' could be null (see line 624)
tree: https://chromium.googlesource.com/chromiumos/third_party/kernel chromeos-5.4 head: e6b720d857c5b6bc5df4fc875028a3d5de84d7a3 commit: 6a833fb194e3a8264017499ea679640372ef2292 [200/207] CHROMIUM: drm/virtio: rebase zero-copy patches to virgl/drm-misc-next config: i386-randconfig-m021-20200820 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
New smatch warnings:drivers/gpu/drm/virtio/virtgpu_ioctl.c:664 virtio_gpu_resource_create_blob_ioctl() error: we previously assumed 'vfpriv' could be null (see line 607)
Old smatch warnings:include/drm/ttm/ttm_bo_driver.h:677 __ttm_bo_reserve() warn: inconsistent returns '*bo->base.resv'.
git remote add chrome-os https://chromium.googlesource.com/chromiumos/third_party/kernel
git fetch --no-tags chrome-os chromeos-5.4
git checkout 6a833fb194e3a8264017499ea679640372ef2292
vim +633 drivers/gpu/drm/virtio/virtgpu_ioctl.c
6a833fb194e3a8 Gurchetan Singh 2020-01-21 585 static int virtio_gpu_resource_create_blob_ioctl(struct drm_device *dev,
ac1e8b584d386e Gurchetan Singh 2019-05-03 586 void *data, struct drm_file *file)
ac1e8b584d386e Gurchetan Singh 2019-05-03 587 {
c123af2cedefe0 Gurchetan Singh 2019-05-07 588 int ret, si, nents;
c123af2cedefe0 Gurchetan Singh 2019-05-07 589 uint32_t handle = 0;
c123af2cedefe0 Gurchetan Singh 2019-05-07 590 struct scatterlist *sg;
c123af2cedefe0 Gurchetan Singh 2019-05-07 591 struct virtio_gpu_object *obj;
c123af2cedefe0 Gurchetan Singh 2019-05-07 592 struct virtio_gpu_fence *fence;
c123af2cedefe0 Gurchetan Singh 2019-05-07 593 struct virtio_gpu_mem_entry *ents;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 594 struct drm_virtgpu_resource_create_blob *rc_blob = data;
c123af2cedefe0 Gurchetan Singh 2019-05-07 595 struct virtio_gpu_object_params params = { 0 };
c123af2cedefe0 Gurchetan Singh 2019-05-07 596 struct virtio_gpu_device *vgdev = dev->dev_private;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 597 struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
c123af2cedefe0 Gurchetan Singh 2019-05-07 598 bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 599 bool mappable = rc_blob->blob_flags & VIRTGPU_BLOB_FLAG_MAPPABLE;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 600 bool has_guest = (rc_blob->blob_mem == VIRTGPU_BLOB_MEM_GUEST ||
6a833fb194e3a8 Gurchetan Singh 2020-01-21 601 rc_blob->blob_mem == VIRTGPU_BLOB_MEM_HOST3D_GUEST);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 602
6a833fb194e3a8 Gurchetan Singh 2020-01-21 603 params.size = rc_blob->size;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 604 params.blob_mem = rc_blob->blob_mem;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 605 params.blob = true;
c123af2cedefe0 Gurchetan Singh 2019-05-07 606
6a833fb194e3a8 Gurchetan Singh 2020-01-21 @607 if (rc_blob->cmd_size && vfpriv) {
^^^^^^Check for NULL. Probably unnecessary?
6a833fb194e3a8 Gurchetan Singh 2020-01-21 608 void *buf;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 609 /* gets freed when the ring has consumed it */
6a833fb194e3a8 Gurchetan Singh 2020-01-21 610 buf = memdup_user(u64_to_user_ptr(rc_blob->cmd),
6a833fb194e3a8 Gurchetan Singh 2020-01-21 611 rc_blob->cmd_size);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 612
6a833fb194e3a8 Gurchetan Singh 2020-01-21 613 if (IS_ERR(buf))
6a833fb194e3a8 Gurchetan Singh 2020-01-21 614 return PTR_ERR(buf);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 615
6a833fb194e3a8 Gurchetan Singh 2020-01-21 616 virtio_gpu_cmd_submit(vgdev, buf, rc_blob->cmd_size,
6a833fb194e3a8 Gurchetan Singh 2020-01-21 617 vfpriv->ctx_id, NULL);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 618 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 619
c123af2cedefe0 Gurchetan Singh 2019-05-07 620 obj = virtio_gpu_alloc_object(dev, ¶ms, NULL);
c123af2cedefe0 Gurchetan Singh 2019-05-07 621 if (IS_ERR(obj))
c123af2cedefe0 Gurchetan Singh 2019-05-07 622 return PTR_ERR(obj);
c123af2cedefe0 Gurchetan Singh 2019-05-07 623
c123af2cedefe0 Gurchetan Singh 2019-05-07 624 if (!obj->pages) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 625 ret = virtio_gpu_object_get_sg_table(vgdev, obj);
c123af2cedefe0 Gurchetan Singh 2019-05-07 626 if (ret)
c123af2cedefe0 Gurchetan Singh 2019-05-07 627 goto err_free_obj;
c123af2cedefe0 Gurchetan Singh 2019-05-07 628 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 629
6a833fb194e3a8 Gurchetan Singh 2020-01-21 630 if (!has_guest) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 631 nents = 0;
c123af2cedefe0 Gurchetan Singh 2019-05-07 632 } else if (use_dma_api) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 633 obj->mapped = dma_map_sg(vgdev->vdev->dev.parent,
c123af2cedefe0 Gurchetan Singh 2019-05-07 634 obj->pages->sgl, obj->pages->nents,
c123af2cedefe0 Gurchetan Singh 2019-05-07 635 DMA_TO_DEVICE);
c123af2cedefe0 Gurchetan Singh 2019-05-07 636 nents = obj->mapped;
c123af2cedefe0 Gurchetan Singh 2019-05-07 637 } else {
c123af2cedefe0 Gurchetan Singh 2019-05-07 638 nents = obj->pages->nents;
c123af2cedefe0 Gurchetan Singh 2019-05-07 639 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 640
6a833fb194e3a8 Gurchetan Singh 2020-01-21 641 /* gets freed when the ring has consumed it */
6a833fb194e3a8 Gurchetan Singh 2020-01-21 642 ents = kzalloc(nents * sizeof(struct virtio_gpu_mem_entry), GFP_KERNEL);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 643 if (!ents) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 644 ret = -ENOMEM;
c123af2cedefe0 Gurchetan Singh 2019-05-07 645 goto err_free_obj;
c123af2cedefe0 Gurchetan Singh 2019-05-07 646 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 647
6a833fb194e3a8 Gurchetan Singh 2020-01-21 648 if (has_guest) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 649 for_each_sg(obj->pages->sgl, sg, nents, si) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 650 ents[si].addr = cpu_to_le64(use_dma_api
c123af2cedefe0 Gurchetan Singh 2019-05-07 651 ? sg_dma_address(sg)
c123af2cedefe0 Gurchetan Singh 2019-05-07 652 : sg_phys(sg));
c123af2cedefe0 Gurchetan Singh 2019-05-07 653 ents[si].length = cpu_to_le32(sg->length);
c123af2cedefe0 Gurchetan Singh 2019-05-07 654 ents[si].padding = 0;
c123af2cedefe0 Gurchetan Singh 2019-05-07 655 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 656 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 657
c123af2cedefe0 Gurchetan Singh 2019-05-07 658 fence = virtio_gpu_fence_alloc(vgdev);
c123af2cedefe0 Gurchetan Singh 2019-05-07 659 if (!fence) {
c123af2cedefe0 Gurchetan Singh 2019-05-07 660 ret = -ENOMEM;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 661 goto err_free_ents;
c123af2cedefe0 Gurchetan Singh 2019-05-07 662 }
c123af2cedefe0 Gurchetan Singh 2019-05-07 663
6a833fb194e3a8 Gurchetan Singh 2020-01-21 @664 virtio_gpu_cmd_resource_create_blob(vgdev, obj, vfpriv->ctx_id,
^^^^^^^^^^^^^^Unchecked dereference.
6a833fb194e3a8 Gurchetan Singh 2020-01-21 665 rc_blob->blob_mem, rc_blob->blob_flags,
6a833fb194e3a8 Gurchetan Singh 2020-01-21 666 rc_blob->blob_id, rc_blob->size, nents,
6a833fb194e3a8 Gurchetan Singh 2020-01-21 667 ents);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 668
c123af2cedefe0 Gurchetan Singh 2019-05-07 669 ret = drm_gem_handle_create(file, &obj->gem_base, &handle);
c123af2cedefe0 Gurchetan Singh 2019-05-07 670 if (ret)
c123af2cedefe0 Gurchetan Singh 2019-05-07 671 goto err_fence_put;
c123af2cedefe0 Gurchetan Singh 2019-05-07 672
6a833fb194e3a8 Gurchetan Singh 2020-01-21 673 if (!has_guest && mappable) {
6a833fb194e3a8 Gurchetan Singh 2020-01-21 674 virtio_gpu_cmd_map(vgdev, obj, obj->tbo.offset, fence);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 675 }
6a833fb194e3a8 Gurchetan Singh 2020-01-21 676
c123af2cedefe0 Gurchetan Singh 2019-05-07 677
c123af2cedefe0 Gurchetan Singh 2019-05-07 678 /*
c123af2cedefe0 Gurchetan Singh 2019-05-07 679 * No need to call virtio_gpu_object_reserve since the buffer is not
c123af2cedefe0 Gurchetan Singh 2019-05-07 680 * being used for ttm validation and no other processes can access
c123af2cedefe0 Gurchetan Singh 2019-05-07 681 * the reservation object at this point.
c123af2cedefe0 Gurchetan Singh 2019-05-07 682 */
c123af2cedefe0 Gurchetan Singh 2019-05-07 683 dma_resv_add_excl_fence(obj->tbo.base.resv, &fence->f);
c123af2cedefe0 Gurchetan Singh 2019-05-07 684
c123af2cedefe0 Gurchetan Singh 2019-05-07 685 dma_fence_put(&fence->f);
c123af2cedefe0 Gurchetan Singh 2019-05-07 686 drm_gem_object_put_unlocked(&obj->gem_base);
c123af2cedefe0 Gurchetan Singh 2019-05-07 687
6a833fb194e3a8 Gurchetan Singh 2020-01-21 688 rc_blob->res_handle = obj->hw_res_handle;
6a833fb194e3a8 Gurchetan Singh 2020-01-21 689 rc_blob->bo_handle = handle;
ac1e8b584d386e Gurchetan Singh 2019-05-03 690 return 0;
c123af2cedefe0 Gurchetan Singh 2019-05-07 691
c123af2cedefe0 Gurchetan Singh 2019-05-07 692 err_fence_put:
c123af2cedefe0 Gurchetan Singh 2019-05-07 693 dma_fence_put(&fence->f);
6a833fb194e3a8 Gurchetan Singh 2020-01-21 694 err_free_ents:
6a833fb194e3a8 Gurchetan Singh 2020-01-21 695 kfree(ents);
c123af2cedefe0 Gurchetan Singh 2019-05-07 696 err_free_obj:
c123af2cedefe0 Gurchetan Singh 2019-05-07 697 drm_gem_object_release(&obj->gem_base);
c123af2cedefe0 Gurchetan Singh 2019-05-07 698 return ret;
ac1e8b584d386e Gurchetan Singh 2019-05-03 699 }---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org