* [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem
@ 2021-06-03 16:41 Daniel Vetter
2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 1/4] dma-buf: Require VM_PFNMAP vma for mmap Daniel Vetter
` (7 more replies)
0 siblings, 8 replies; 12+ messages in thread
From: Daniel Vetter @ 2021-06-03 16:41 UTC (permalink / raw
To: Intel Graphics Development; +Cc: Daniel Vetter, DRI Development
Hi all,
Another small iteration, lost another patch, so another full resend.
Thomas Zimmermann pointed out how to get at drm_gem_shmem_funcs without
getting at drm_gem_shmem_funcs directly.
Test-with: 20210527140732.5762-1-daniel.vetter@ffwll.ch
Cheers, Daniel
Daniel Vetter (4):
dma-buf: Require VM_PFNMAP vma for mmap
drm/shmem-helper: Switch to vmf_insert_pfn
drm/shmem-helper: Align to page size in dumb_create
drm/vgem: use shmem helpers
drivers/dma-buf/dma-buf.c | 15 +-
drivers/gpu/drm/Kconfig | 3 +-
drivers/gpu/drm/drm_gem_shmem_helper.c | 8 +-
drivers/gpu/drm/vgem/vgem_drv.c | 342 +------------------------
4 files changed, 32 insertions(+), 336 deletions(-)
--
2.31.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* [Intel-gfx] [PATCH v3 1/4] dma-buf: Require VM_PFNMAP vma for mmap 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter @ 2021-06-03 16:41 ` Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 2/4] drm/shmem-helper: Switch to vmf_insert_pfn Daniel Vetter ` (6 subsequent siblings) 7 siblings, 0 replies; 12+ messages in thread From: Daniel Vetter @ 2021-06-03 16:41 UTC (permalink / raw To: Intel Graphics Development Cc: Daniel Vetter, Matthew Wilcox, Sumit Semwal, linaro-mm-sig, Jason Gunthorpe, John Stultz, DRI Development, Daniel Vetter, Suren Baghdasaryan, Christian König, linux-media tldr; DMA buffers aren't normal memory, expecting that you can use them like that (like calling get_user_pages works, or that they're accounting like any other normal memory) cannot be guaranteed. Since some userspace only runs on integrated devices, where all buffers are actually all resident system memory, there's a huge temptation to assume that a struct page is always present and useable like for any more pagecache backed mmap. This has the potential to result in a uapi nightmare. To stop this gap require that DMA buffer mmaps are VM_PFNMAP, which blocks get_user_pages and all the other struct page based infrastructure for everyone. In spirit this is the uapi counterpart to the kernel-internal CONFIG_DMABUF_DEBUG. Motivated by a recent patch which wanted to swich the system dma-buf heap to vm_insert_page instead of vm_insert_pfn. v2: Jason brought up that we also want to guarantee that all ptes have the pte_special flag set, to catch fast get_user_pages (on architectures that support this). Allowing VM_MIXEDMAP (like VM_SPECIAL does) would still allow vm_insert_page, but limiting to VM_PFNMAP will catch that. From auditing the various functions to insert pfn pte entires (vm_insert_pfn_prot, remap_pfn_range and all it's callers like dma_mmap_wc) it looks like VM_PFNMAP is already required anyway, so this should be the correct flag to check for. References: https://lore.kernel.org/lkml/CAKMK7uHi+mG0z0HUmNt13QCCvutuRVjpcR0NjRL12k-WbWzkRg@mail.gmail.com/ Acked-by: Christian König <christian.koenig@amd.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: "Christian König" <christian.koenig@amd.com> Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org -- Resending this so I can test the next two patches for vgem/shmem in intel-gfx-ci. Last round failed somehow, but I can't repro that at all locally here. No immediate plans to merge this patch here since ttm isn't addressed yet (and there we have the hugepte issue, for which I don't think we have a clear consensus yet). -Daniel --- drivers/dma-buf/dma-buf.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index eadd1eaa2fb5..dda583fb1f03 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -127,6 +127,7 @@ static struct file_system_type dma_buf_fs_type = { static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) { struct dma_buf *dmabuf; + int ret; if (!is_dma_buf_file(file)) return -EINVAL; @@ -142,7 +143,11 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) dmabuf->size >> PAGE_SHIFT) return -EINVAL; - return dmabuf->ops->mmap(dmabuf, vma); + ret = dmabuf->ops->mmap(dmabuf, vma); + + WARN_ON(!(vma->vm_flags & VM_PFNMAP)); + + return ret; } static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) @@ -1244,6 +1249,8 @@ EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access); int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, unsigned long pgoff) { + int ret; + if (WARN_ON(!dmabuf || !vma)) return -EINVAL; @@ -1264,7 +1271,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, vma_set_file(vma, dmabuf->file); vma->vm_pgoff = pgoff; - return dmabuf->ops->mmap(dmabuf, vma); + ret = dmabuf->ops->mmap(dmabuf, vma); + + WARN_ON(!(vma->vm_flags & VM_PFNMAP)); + + return ret; } EXPORT_SYMBOL_GPL(dma_buf_mmap); -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH v3 2/4] drm/shmem-helper: Switch to vmf_insert_pfn 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 1/4] dma-buf: Require VM_PFNMAP vma for mmap Daniel Vetter @ 2021-06-03 16:41 ` Daniel Vetter 2021-06-03 21:08 ` [Intel-gfx] [PATCH] " Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 3/4] drm/shmem-helper: Align to page size in dumb_create Daniel Vetter ` (5 subsequent siblings) 7 siblings, 1 reply; 12+ messages in thread From: Daniel Vetter @ 2021-06-03 16:41 UTC (permalink / raw To: Intel Graphics Development Cc: David Airlie, Daniel Vetter, Maxime Ripard, DRI Development, Thomas Zimmermann, Daniel Vetter We want to stop gup, which isn't the case if we use vmf_insert_page and VM_MIXEDMAP, because that does not set pte_special. v2: With this shmem gem helpers now definitely need CONFIG_MMU (0day) Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> --- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 56a55a6e6239..9c21527b791f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -206,7 +206,7 @@ config DRM_KMS_CMA_HELPER config DRM_GEM_SHMEM_HELPER bool - depends on DRM + depends on DRM && MMU help Choose this if you need the GEM shmem helper functions diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 6d625cee7a6a..11edd54f0580 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -542,7 +542,7 @@ static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) } else { page = shmem->pages[page_offset]; - ret = vmf_insert_page(vma, vmf->address, page); + ret = vmf_insert_pfn(vma, vmf->address, page_to_pfn(page)); } mutex_unlock(&shmem->pages_lock); @@ -612,7 +612,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) return ret; } - vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND; + vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); if (shmem->map_wc) vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH] drm/shmem-helper: Switch to vmf_insert_pfn 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 2/4] drm/shmem-helper: Switch to vmf_insert_pfn Daniel Vetter @ 2021-06-03 21:08 ` Daniel Vetter 2021-07-13 13:44 ` Daniel Vetter 0 siblings, 1 reply; 12+ messages in thread From: Daniel Vetter @ 2021-06-03 21:08 UTC (permalink / raw To: DRI Development Cc: David Airlie, Daniel Vetter, Intel Graphics Development, Maxime Ripard, Thomas Zimmermann, Daniel Vetter We want to stop gup, which isn't the case if we use vmf_insert_page and VM_MIXEDMAP, because that does not set pte_special. v2: With this shmem gem helpers now definitely need CONFIG_MMU (0day) v3: add more depends on MMU. For usb drivers this is a bit awkward, but really it's correct: To be able to provide a contig mapping of buffers to userspace on !MMU platforms we'd need to use the cma helpers for these drivers on those platforms. As-is this wont work. Also not exactly sure why vm_insert_page doesn't go boom, because that definitely wont fly in practice since the pages are non-contig to begin with. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> --- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- drivers/gpu/drm/gud/Kconfig | 2 +- drivers/gpu/drm/tiny/Kconfig | 4 ++-- drivers/gpu/drm/udl/Kconfig | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 56a55a6e6239..9c21527b791f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -206,7 +206,7 @@ config DRM_KMS_CMA_HELPER config DRM_GEM_SHMEM_HELPER bool - depends on DRM + depends on DRM && MMU help Choose this if you need the GEM shmem helper functions diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 6d625cee7a6a..11edd54f0580 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -542,7 +542,7 @@ static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) } else { page = shmem->pages[page_offset]; - ret = vmf_insert_page(vma, vmf->address, page); + ret = vmf_insert_pfn(vma, vmf->address, page_to_pfn(page)); } mutex_unlock(&shmem->pages_lock); @@ -612,7 +612,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) return ret; } - vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND; + vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); if (shmem->map_wc) vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); diff --git a/drivers/gpu/drm/gud/Kconfig b/drivers/gpu/drm/gud/Kconfig index 1c8601bf4d91..9c1e61f9eec3 100644 --- a/drivers/gpu/drm/gud/Kconfig +++ b/drivers/gpu/drm/gud/Kconfig @@ -2,7 +2,7 @@ config DRM_GUD tristate "GUD USB Display" - depends on DRM && USB + depends on DRM && USB && MMU select LZ4_COMPRESS select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index d46f95d9196d..a15f57ace9e7 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -31,7 +31,7 @@ config DRM_CIRRUS_QEMU config DRM_GM12U320 tristate "GM12U320 driver for USB projectors" - depends on DRM && USB + depends on DRM && USB && MMU select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER help @@ -40,7 +40,7 @@ config DRM_GM12U320 config DRM_SIMPLEDRM tristate "Simple framebuffer driver" - depends on DRM + depends on DRM && MMU select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER help diff --git a/drivers/gpu/drm/udl/Kconfig b/drivers/gpu/drm/udl/Kconfig index 1f497d8f1ae5..c744175c6992 100644 --- a/drivers/gpu/drm/udl/Kconfig +++ b/drivers/gpu/drm/udl/Kconfig @@ -4,6 +4,7 @@ config DRM_UDL depends on DRM depends on USB depends on USB_ARCH_HAS_HCD + depends on MMU select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER help -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/shmem-helper: Switch to vmf_insert_pfn 2021-06-03 21:08 ` [Intel-gfx] [PATCH] " Daniel Vetter @ 2021-07-13 13:44 ` Daniel Vetter 0 siblings, 0 replies; 12+ messages in thread From: Daniel Vetter @ 2021-07-13 13:44 UTC (permalink / raw To: DRI Development Cc: David Airlie, Daniel Vetter, Intel Graphics Development, Maxime Ripard, Thomas Zimmermann, Daniel Vetter On Thu, Jun 03, 2021 at 11:08:31PM +0200, Daniel Vetter wrote: > We want to stop gup, which isn't the case if we use vmf_insert_page > and VM_MIXEDMAP, because that does not set pte_special. > > v2: With this shmem gem helpers now definitely need CONFIG_MMU (0day) > > v3: add more depends on MMU. For usb drivers this is a bit awkward, > but really it's correct: To be able to provide a contig mapping of > buffers to userspace on !MMU platforms we'd need to use the cma > helpers for these drivers on those platforms. As-is this wont work. > > Also not exactly sure why vm_insert_page doesn't go boom, because that > definitely wont fly in practice since the pages are non-contig to > begin with. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> Merged to drm-misc-next. Aside, anyone feel like a review on the previous patch? Still not ready to switch vgem over, but I think I've found the next bug that needs fixing in shmem helpers. -Daniel > --- > drivers/gpu/drm/Kconfig | 2 +- > drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- > drivers/gpu/drm/gud/Kconfig | 2 +- > drivers/gpu/drm/tiny/Kconfig | 4 ++-- > drivers/gpu/drm/udl/Kconfig | 1 + > 5 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 56a55a6e6239..9c21527b791f 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -206,7 +206,7 @@ config DRM_KMS_CMA_HELPER > > config DRM_GEM_SHMEM_HELPER > bool > - depends on DRM > + depends on DRM && MMU > help > Choose this if you need the GEM shmem helper functions > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 6d625cee7a6a..11edd54f0580 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -542,7 +542,7 @@ static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) > } else { > page = shmem->pages[page_offset]; > > - ret = vmf_insert_page(vma, vmf->address, page); > + ret = vmf_insert_pfn(vma, vmf->address, page_to_pfn(page)); > } > > mutex_unlock(&shmem->pages_lock); > @@ -612,7 +612,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) > return ret; > } > > - vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND; > + vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND; > vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); > if (shmem->map_wc) > vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > diff --git a/drivers/gpu/drm/gud/Kconfig b/drivers/gpu/drm/gud/Kconfig > index 1c8601bf4d91..9c1e61f9eec3 100644 > --- a/drivers/gpu/drm/gud/Kconfig > +++ b/drivers/gpu/drm/gud/Kconfig > @@ -2,7 +2,7 @@ > > config DRM_GUD > tristate "GUD USB Display" > - depends on DRM && USB > + depends on DRM && USB && MMU > select LZ4_COMPRESS > select DRM_KMS_HELPER > select DRM_GEM_SHMEM_HELPER > diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig > index d46f95d9196d..a15f57ace9e7 100644 > --- a/drivers/gpu/drm/tiny/Kconfig > +++ b/drivers/gpu/drm/tiny/Kconfig > @@ -31,7 +31,7 @@ config DRM_CIRRUS_QEMU > > config DRM_GM12U320 > tristate "GM12U320 driver for USB projectors" > - depends on DRM && USB > + depends on DRM && USB && MMU > select DRM_KMS_HELPER > select DRM_GEM_SHMEM_HELPER > help > @@ -40,7 +40,7 @@ config DRM_GM12U320 > > config DRM_SIMPLEDRM > tristate "Simple framebuffer driver" > - depends on DRM > + depends on DRM && MMU > select DRM_GEM_SHMEM_HELPER > select DRM_KMS_HELPER > help > diff --git a/drivers/gpu/drm/udl/Kconfig b/drivers/gpu/drm/udl/Kconfig > index 1f497d8f1ae5..c744175c6992 100644 > --- a/drivers/gpu/drm/udl/Kconfig > +++ b/drivers/gpu/drm/udl/Kconfig > @@ -4,6 +4,7 @@ config DRM_UDL > depends on DRM > depends on USB > depends on USB_ARCH_HAS_HCD > + depends on MMU > select DRM_GEM_SHMEM_HELPER > select DRM_KMS_HELPER > help > -- > 2.31.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH v3 3/4] drm/shmem-helper: Align to page size in dumb_create 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 1/4] dma-buf: Require VM_PFNMAP vma for mmap Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 2/4] drm/shmem-helper: Switch to vmf_insert_pfn Daniel Vetter @ 2021-06-03 16:41 ` Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 4/4] drm/vgem: use shmem helpers Daniel Vetter ` (4 subsequent siblings) 7 siblings, 0 replies; 12+ messages in thread From: Daniel Vetter @ 2021-06-03 16:41 UTC (permalink / raw To: Intel Graphics Development Cc: David Airlie, Daniel Vetter, Maxime Ripard, DRI Development, Thomas Zimmermann, Daniel Vetter shmem helpers seem a bit sloppy here by automatically rounding up when actually creating the buffer, which results in under-reporting of what we actually have. Caught by igt/vgem_basic tests. Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 11edd54f0580..296ab1b7c07f 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -505,13 +505,13 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, if (!args->pitch || !args->size) { args->pitch = min_pitch; - args->size = args->pitch * args->height; + args->size = PAGE_ALIGN(args->pitch * args->height); } else { /* ensure sane minimum values */ if (args->pitch < min_pitch) args->pitch = min_pitch; if (args->size < args->pitch * args->height) - args->size = args->pitch * args->height; + args->size = PAGE_ALIGN(args->pitch * args->height); } shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle); -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH v3 4/4] drm/vgem: use shmem helpers 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter ` (2 preceding siblings ...) 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 3/4] drm/shmem-helper: Align to page size in dumb_create Daniel Vetter @ 2021-06-03 16:41 ` Daniel Vetter 2021-06-03 21:09 ` [Intel-gfx] [PATCH] " Daniel Vetter 2021-06-03 19:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev3) Patchwork ` (3 subsequent siblings) 7 siblings, 1 reply; 12+ messages in thread From: Daniel Vetter @ 2021-06-03 16:41 UTC (permalink / raw To: Intel Graphics Development Cc: Daniel Vetter, DRI Development, Sumit Semwal, Melissa Wen, John Stultz, Thomas Zimmermann, Daniel Vetter, Chris Wilson, Christian König Aside from deleting lots of code the real motivation here is to switch the mmap over to VM_PFNMAP, to be more consistent with what real gpu drivers do. They're all VM_PFNMP, which means get_user_pages doesn't work, and even if you try and there's a struct page behind that, touching it and mucking around with its refcount can upset drivers real bad. v2: Review from Thomas: - sort #include - drop more dead code that I didn't spot somehow v3: select DRM_GEM_SHMEM_HELPER to make it build (intel-gfx-ci) v4: I got tricked by 0cf2ef46c6c0 ("drm/shmem-helper: Use cached mappings by default"), and we need WC in vgem because vgem doesn't have explicit begin/end cpu access ioctls. Also add a comment why exactly vgem has to use wc. v5: Don't set obj->base.funcs, it will default to drm_gem_shmem_funcs (Thomas) Cc: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: "Christian König" <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Melissa Wen <melissa.srw@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/vgem/vgem_drv.c | 342 ++------------------------------ 2 files changed, 14 insertions(+), 329 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 9c21527b791f..fb38ef7b3206 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -268,6 +268,7 @@ source "drivers/gpu/drm/kmb/Kconfig" config DRM_VGEM tristate "Virtual GEM provider" depends on DRM + select DRM_GEM_SHMEM_HELPER help Choose this option to get a virtual graphics memory manager, as used by Mesa's software renderer for enhanced performance. diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index bf38a7e319d1..a87eafa89e9f 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -38,6 +38,7 @@ #include <drm/drm_drv.h> #include <drm/drm_file.h> +#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_managed.h> #include <drm/drm_prime.h> @@ -50,87 +51,11 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -static const struct drm_gem_object_funcs vgem_gem_object_funcs; - static struct vgem_device { struct drm_device drm; struct platform_device *platform; } *vgem_device; -static void vgem_gem_free_object(struct drm_gem_object *obj) -{ - struct drm_vgem_gem_object *vgem_obj = to_vgem_bo(obj); - - kvfree(vgem_obj->pages); - mutex_destroy(&vgem_obj->pages_lock); - - if (obj->import_attach) - drm_prime_gem_destroy(obj, vgem_obj->table); - - drm_gem_object_release(obj); - kfree(vgem_obj); -} - -static vm_fault_t vgem_gem_fault(struct vm_fault *vmf) -{ - struct vm_area_struct *vma = vmf->vma; - struct drm_vgem_gem_object *obj = vma->vm_private_data; - /* We don't use vmf->pgoff since that has the fake offset */ - unsigned long vaddr = vmf->address; - vm_fault_t ret = VM_FAULT_SIGBUS; - loff_t num_pages; - pgoff_t page_offset; - page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT; - - num_pages = DIV_ROUND_UP(obj->base.size, PAGE_SIZE); - - if (page_offset >= num_pages) - return VM_FAULT_SIGBUS; - - mutex_lock(&obj->pages_lock); - if (obj->pages) { - get_page(obj->pages[page_offset]); - vmf->page = obj->pages[page_offset]; - ret = 0; - } - mutex_unlock(&obj->pages_lock); - if (ret) { - struct page *page; - - page = shmem_read_mapping_page( - file_inode(obj->base.filp)->i_mapping, - page_offset); - if (!IS_ERR(page)) { - vmf->page = page; - ret = 0; - } else switch (PTR_ERR(page)) { - case -ENOSPC: - case -ENOMEM: - ret = VM_FAULT_OOM; - break; - case -EBUSY: - ret = VM_FAULT_RETRY; - break; - case -EFAULT: - case -EINVAL: - ret = VM_FAULT_SIGBUS; - break; - default: - WARN_ON(PTR_ERR(page)); - ret = VM_FAULT_SIGBUS; - break; - } - - } - return ret; -} - -static const struct vm_operations_struct vgem_gem_vm_ops = { - .fault = vgem_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; - static int vgem_open(struct drm_device *dev, struct drm_file *file) { struct vgem_file *vfile; @@ -159,266 +84,30 @@ static void vgem_postclose(struct drm_device *dev, struct drm_file *file) kfree(vfile); } -static struct drm_vgem_gem_object *__vgem_gem_create(struct drm_device *dev, - unsigned long size) -{ - struct drm_vgem_gem_object *obj; - int ret; - - obj = kzalloc(sizeof(*obj), GFP_KERNEL); - if (!obj) - return ERR_PTR(-ENOMEM); - - obj->base.funcs = &vgem_gem_object_funcs; - - ret = drm_gem_object_init(dev, &obj->base, roundup(size, PAGE_SIZE)); - if (ret) { - kfree(obj); - return ERR_PTR(ret); - } - - mutex_init(&obj->pages_lock); - - return obj; -} - -static void __vgem_gem_destroy(struct drm_vgem_gem_object *obj) -{ - drm_gem_object_release(&obj->base); - kfree(obj); -} - -static struct drm_gem_object *vgem_gem_create(struct drm_device *dev, - struct drm_file *file, - unsigned int *handle, - unsigned long size) -{ - struct drm_vgem_gem_object *obj; - int ret; - - obj = __vgem_gem_create(dev, size); - if (IS_ERR(obj)) - return ERR_CAST(obj); - - ret = drm_gem_handle_create(file, &obj->base, handle); - if (ret) { - drm_gem_object_put(&obj->base); - return ERR_PTR(ret); - } - - return &obj->base; -} - -static int vgem_gem_dumb_create(struct drm_file *file, struct drm_device *dev, - struct drm_mode_create_dumb *args) -{ - struct drm_gem_object *gem_object; - u64 pitch, size; - - pitch = args->width * DIV_ROUND_UP(args->bpp, 8); - size = args->height * pitch; - if (size == 0) - return -EINVAL; - - gem_object = vgem_gem_create(dev, file, &args->handle, size); - if (IS_ERR(gem_object)) - return PTR_ERR(gem_object); - - args->size = gem_object->size; - args->pitch = pitch; - - drm_gem_object_put(gem_object); - - DRM_DEBUG("Created object of size %llu\n", args->size); - - return 0; -} - static struct drm_ioctl_desc vgem_ioctls[] = { DRM_IOCTL_DEF_DRV(VGEM_FENCE_ATTACH, vgem_fence_attach_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(VGEM_FENCE_SIGNAL, vgem_fence_signal_ioctl, DRM_RENDER_ALLOW), }; -static int vgem_mmap(struct file *filp, struct vm_area_struct *vma) -{ - unsigned long flags = vma->vm_flags; - int ret; - - ret = drm_gem_mmap(filp, vma); - if (ret) - return ret; - - /* Keep the WC mmaping set by drm_gem_mmap() but our pages - * are ordinary and not special. - */ - vma->vm_flags = flags | VM_DONTEXPAND | VM_DONTDUMP; - return 0; -} +DEFINE_DRM_GEM_FOPS(vgem_driver_fops); -static const struct file_operations vgem_driver_fops = { - .owner = THIS_MODULE, - .open = drm_open, - .mmap = vgem_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .release = drm_release, -}; - -static struct page **vgem_pin_pages(struct drm_vgem_gem_object *bo) -{ - mutex_lock(&bo->pages_lock); - if (bo->pages_pin_count++ == 0) { - struct page **pages; - - pages = drm_gem_get_pages(&bo->base); - if (IS_ERR(pages)) { - bo->pages_pin_count--; - mutex_unlock(&bo->pages_lock); - return pages; - } - - bo->pages = pages; - } - mutex_unlock(&bo->pages_lock); - - return bo->pages; -} - -static void vgem_unpin_pages(struct drm_vgem_gem_object *bo) -{ - mutex_lock(&bo->pages_lock); - if (--bo->pages_pin_count == 0) { - drm_gem_put_pages(&bo->base, bo->pages, true, true); - bo->pages = NULL; - } - mutex_unlock(&bo->pages_lock); -} - -static int vgem_prime_pin(struct drm_gem_object *obj) +static struct drm_gem_object *vgem_gem_create_object(struct drm_device *dev, size_t size) { - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - long n_pages = obj->size >> PAGE_SHIFT; - struct page **pages; + struct drm_gem_shmem_object *obj; - pages = vgem_pin_pages(bo); - if (IS_ERR(pages)) - return PTR_ERR(pages); + obj = kzalloc(sizeof(*obj), GFP_KERNEL); + if (!obj) + return NULL; - /* Flush the object from the CPU cache so that importers can rely - * on coherent indirect access via the exported dma-address. + /* + * vgem doesn't have any begin/end cpu access ioctls, therefore must use + * coherent memory or dma-buf sharing just wont work. */ - drm_clflush_pages(pages, n_pages); - - return 0; -} - -static void vgem_prime_unpin(struct drm_gem_object *obj) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - - vgem_unpin_pages(bo); -} - -static struct sg_table *vgem_prime_get_sg_table(struct drm_gem_object *obj) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - - return drm_prime_pages_to_sg(obj->dev, bo->pages, bo->base.size >> PAGE_SHIFT); -} - -static struct drm_gem_object* vgem_prime_import(struct drm_device *dev, - struct dma_buf *dma_buf) -{ - struct vgem_device *vgem = container_of(dev, typeof(*vgem), drm); - - return drm_gem_prime_import_dev(dev, dma_buf, &vgem->platform->dev); -} - -static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf_attachment *attach, struct sg_table *sg) -{ - struct drm_vgem_gem_object *obj; - int npages; - - obj = __vgem_gem_create(dev, attach->dmabuf->size); - if (IS_ERR(obj)) - return ERR_CAST(obj); + obj->map_wc = true; - npages = PAGE_ALIGN(attach->dmabuf->size) / PAGE_SIZE; - - obj->table = sg; - obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL); - if (!obj->pages) { - __vgem_gem_destroy(obj); - return ERR_PTR(-ENOMEM); - } - - obj->pages_pin_count++; /* perma-pinned */ - drm_prime_sg_to_page_array(obj->table, obj->pages, npages); return &obj->base; } -static int vgem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - long n_pages = obj->size >> PAGE_SHIFT; - struct page **pages; - void *vaddr; - - pages = vgem_pin_pages(bo); - if (IS_ERR(pages)) - return PTR_ERR(pages); - - vaddr = vmap(pages, n_pages, 0, pgprot_writecombine(PAGE_KERNEL)); - if (!vaddr) - return -ENOMEM; - dma_buf_map_set_vaddr(map, vaddr); - - return 0; -} - -static void vgem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - - vunmap(map->vaddr); - vgem_unpin_pages(bo); -} - -static int vgem_prime_mmap(struct drm_gem_object *obj, - struct vm_area_struct *vma) -{ - int ret; - - if (obj->size < vma->vm_end - vma->vm_start) - return -EINVAL; - - if (!obj->filp) - return -ENODEV; - - ret = call_mmap(obj->filp, vma); - if (ret) - return ret; - - vma_set_file(vma, obj->filp); - vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); - - return 0; -} - -static const struct drm_gem_object_funcs vgem_gem_object_funcs = { - .free = vgem_gem_free_object, - .pin = vgem_prime_pin, - .unpin = vgem_prime_unpin, - .get_sg_table = vgem_prime_get_sg_table, - .vmap = vgem_prime_vmap, - .vunmap = vgem_prime_vunmap, - .vm_ops = &vgem_gem_vm_ops, -}; - static const struct drm_driver vgem_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = vgem_open, @@ -427,13 +116,8 @@ static const struct drm_driver vgem_driver = { .num_ioctls = ARRAY_SIZE(vgem_ioctls), .fops = &vgem_driver_fops, - .dumb_create = vgem_gem_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import = vgem_prime_import, - .gem_prime_import_sg_table = vgem_prime_import_sg_table, - .gem_prime_mmap = vgem_prime_mmap, + DRM_GEM_SHMEM_DRIVER_OPS, + .gem_create_object = vgem_gem_create_object, .name = DRIVER_NAME, .desc = DRIVER_DESC, -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH] drm/vgem: use shmem helpers 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 4/4] drm/vgem: use shmem helpers Daniel Vetter @ 2021-06-03 21:09 ` Daniel Vetter 0 siblings, 0 replies; 12+ messages in thread From: Daniel Vetter @ 2021-06-03 21:09 UTC (permalink / raw To: DRI Development Cc: Daniel Vetter, Intel Graphics Development, Christian König, Melissa Wen, John Stultz, Thomas Zimmermann, Daniel Vetter, Chris Wilson, Sumit Semwal Aside from deleting lots of code the real motivation here is to switch the mmap over to VM_PFNMAP, to be more consistent with what real gpu drivers do. They're all VM_PFNMP, which means get_user_pages doesn't work, and even if you try and there's a struct page behind that, touching it and mucking around with its refcount can upset drivers real bad. v2: Review from Thomas: - sort #include - drop more dead code that I didn't spot somehow v3: select DRM_GEM_SHMEM_HELPER to make it build (intel-gfx-ci) v4: I got tricked by 0cf2ef46c6c0 ("drm/shmem-helper: Use cached mappings by default"), and we need WC in vgem because vgem doesn't have explicit begin/end cpu access ioctls. Also add a comment why exactly vgem has to use wc. v5: Don't set obj->base.funcs, it will default to drm_gem_shmem_funcs (Thomas) v6: vgem also needs an MMU for remapping Cc: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: "Christian König" <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Melissa Wen <melissa.srw@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/Kconfig | 5 +- drivers/gpu/drm/vgem/vgem_drv.c | 342 ++------------------------------ 2 files changed, 16 insertions(+), 331 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 9c21527b791f..1b785ec4b80a 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -267,7 +267,8 @@ source "drivers/gpu/drm/kmb/Kconfig" config DRM_VGEM tristate "Virtual GEM provider" - depends on DRM + depends on DRM && MMU + select DRM_GEM_SHMEM_HELPER help Choose this option to get a virtual graphics memory manager, as used by Mesa's software renderer for enhanced performance. @@ -275,7 +276,7 @@ config DRM_VGEM config DRM_VKMS tristate "Virtual KMS (EXPERIMENTAL)" - depends on DRM + depends on DRM && MMU select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER select CRC32 diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index bf38a7e319d1..a87eafa89e9f 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -38,6 +38,7 @@ #include <drm/drm_drv.h> #include <drm/drm_file.h> +#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_managed.h> #include <drm/drm_prime.h> @@ -50,87 +51,11 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -static const struct drm_gem_object_funcs vgem_gem_object_funcs; - static struct vgem_device { struct drm_device drm; struct platform_device *platform; } *vgem_device; -static void vgem_gem_free_object(struct drm_gem_object *obj) -{ - struct drm_vgem_gem_object *vgem_obj = to_vgem_bo(obj); - - kvfree(vgem_obj->pages); - mutex_destroy(&vgem_obj->pages_lock); - - if (obj->import_attach) - drm_prime_gem_destroy(obj, vgem_obj->table); - - drm_gem_object_release(obj); - kfree(vgem_obj); -} - -static vm_fault_t vgem_gem_fault(struct vm_fault *vmf) -{ - struct vm_area_struct *vma = vmf->vma; - struct drm_vgem_gem_object *obj = vma->vm_private_data; - /* We don't use vmf->pgoff since that has the fake offset */ - unsigned long vaddr = vmf->address; - vm_fault_t ret = VM_FAULT_SIGBUS; - loff_t num_pages; - pgoff_t page_offset; - page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT; - - num_pages = DIV_ROUND_UP(obj->base.size, PAGE_SIZE); - - if (page_offset >= num_pages) - return VM_FAULT_SIGBUS; - - mutex_lock(&obj->pages_lock); - if (obj->pages) { - get_page(obj->pages[page_offset]); - vmf->page = obj->pages[page_offset]; - ret = 0; - } - mutex_unlock(&obj->pages_lock); - if (ret) { - struct page *page; - - page = shmem_read_mapping_page( - file_inode(obj->base.filp)->i_mapping, - page_offset); - if (!IS_ERR(page)) { - vmf->page = page; - ret = 0; - } else switch (PTR_ERR(page)) { - case -ENOSPC: - case -ENOMEM: - ret = VM_FAULT_OOM; - break; - case -EBUSY: - ret = VM_FAULT_RETRY; - break; - case -EFAULT: - case -EINVAL: - ret = VM_FAULT_SIGBUS; - break; - default: - WARN_ON(PTR_ERR(page)); - ret = VM_FAULT_SIGBUS; - break; - } - - } - return ret; -} - -static const struct vm_operations_struct vgem_gem_vm_ops = { - .fault = vgem_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; - static int vgem_open(struct drm_device *dev, struct drm_file *file) { struct vgem_file *vfile; @@ -159,266 +84,30 @@ static void vgem_postclose(struct drm_device *dev, struct drm_file *file) kfree(vfile); } -static struct drm_vgem_gem_object *__vgem_gem_create(struct drm_device *dev, - unsigned long size) -{ - struct drm_vgem_gem_object *obj; - int ret; - - obj = kzalloc(sizeof(*obj), GFP_KERNEL); - if (!obj) - return ERR_PTR(-ENOMEM); - - obj->base.funcs = &vgem_gem_object_funcs; - - ret = drm_gem_object_init(dev, &obj->base, roundup(size, PAGE_SIZE)); - if (ret) { - kfree(obj); - return ERR_PTR(ret); - } - - mutex_init(&obj->pages_lock); - - return obj; -} - -static void __vgem_gem_destroy(struct drm_vgem_gem_object *obj) -{ - drm_gem_object_release(&obj->base); - kfree(obj); -} - -static struct drm_gem_object *vgem_gem_create(struct drm_device *dev, - struct drm_file *file, - unsigned int *handle, - unsigned long size) -{ - struct drm_vgem_gem_object *obj; - int ret; - - obj = __vgem_gem_create(dev, size); - if (IS_ERR(obj)) - return ERR_CAST(obj); - - ret = drm_gem_handle_create(file, &obj->base, handle); - if (ret) { - drm_gem_object_put(&obj->base); - return ERR_PTR(ret); - } - - return &obj->base; -} - -static int vgem_gem_dumb_create(struct drm_file *file, struct drm_device *dev, - struct drm_mode_create_dumb *args) -{ - struct drm_gem_object *gem_object; - u64 pitch, size; - - pitch = args->width * DIV_ROUND_UP(args->bpp, 8); - size = args->height * pitch; - if (size == 0) - return -EINVAL; - - gem_object = vgem_gem_create(dev, file, &args->handle, size); - if (IS_ERR(gem_object)) - return PTR_ERR(gem_object); - - args->size = gem_object->size; - args->pitch = pitch; - - drm_gem_object_put(gem_object); - - DRM_DEBUG("Created object of size %llu\n", args->size); - - return 0; -} - static struct drm_ioctl_desc vgem_ioctls[] = { DRM_IOCTL_DEF_DRV(VGEM_FENCE_ATTACH, vgem_fence_attach_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(VGEM_FENCE_SIGNAL, vgem_fence_signal_ioctl, DRM_RENDER_ALLOW), }; -static int vgem_mmap(struct file *filp, struct vm_area_struct *vma) -{ - unsigned long flags = vma->vm_flags; - int ret; - - ret = drm_gem_mmap(filp, vma); - if (ret) - return ret; - - /* Keep the WC mmaping set by drm_gem_mmap() but our pages - * are ordinary and not special. - */ - vma->vm_flags = flags | VM_DONTEXPAND | VM_DONTDUMP; - return 0; -} +DEFINE_DRM_GEM_FOPS(vgem_driver_fops); -static const struct file_operations vgem_driver_fops = { - .owner = THIS_MODULE, - .open = drm_open, - .mmap = vgem_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .release = drm_release, -}; - -static struct page **vgem_pin_pages(struct drm_vgem_gem_object *bo) -{ - mutex_lock(&bo->pages_lock); - if (bo->pages_pin_count++ == 0) { - struct page **pages; - - pages = drm_gem_get_pages(&bo->base); - if (IS_ERR(pages)) { - bo->pages_pin_count--; - mutex_unlock(&bo->pages_lock); - return pages; - } - - bo->pages = pages; - } - mutex_unlock(&bo->pages_lock); - - return bo->pages; -} - -static void vgem_unpin_pages(struct drm_vgem_gem_object *bo) -{ - mutex_lock(&bo->pages_lock); - if (--bo->pages_pin_count == 0) { - drm_gem_put_pages(&bo->base, bo->pages, true, true); - bo->pages = NULL; - } - mutex_unlock(&bo->pages_lock); -} - -static int vgem_prime_pin(struct drm_gem_object *obj) +static struct drm_gem_object *vgem_gem_create_object(struct drm_device *dev, size_t size) { - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - long n_pages = obj->size >> PAGE_SHIFT; - struct page **pages; + struct drm_gem_shmem_object *obj; - pages = vgem_pin_pages(bo); - if (IS_ERR(pages)) - return PTR_ERR(pages); + obj = kzalloc(sizeof(*obj), GFP_KERNEL); + if (!obj) + return NULL; - /* Flush the object from the CPU cache so that importers can rely - * on coherent indirect access via the exported dma-address. + /* + * vgem doesn't have any begin/end cpu access ioctls, therefore must use + * coherent memory or dma-buf sharing just wont work. */ - drm_clflush_pages(pages, n_pages); - - return 0; -} - -static void vgem_prime_unpin(struct drm_gem_object *obj) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - - vgem_unpin_pages(bo); -} - -static struct sg_table *vgem_prime_get_sg_table(struct drm_gem_object *obj) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - - return drm_prime_pages_to_sg(obj->dev, bo->pages, bo->base.size >> PAGE_SHIFT); -} - -static struct drm_gem_object* vgem_prime_import(struct drm_device *dev, - struct dma_buf *dma_buf) -{ - struct vgem_device *vgem = container_of(dev, typeof(*vgem), drm); - - return drm_gem_prime_import_dev(dev, dma_buf, &vgem->platform->dev); -} - -static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf_attachment *attach, struct sg_table *sg) -{ - struct drm_vgem_gem_object *obj; - int npages; - - obj = __vgem_gem_create(dev, attach->dmabuf->size); - if (IS_ERR(obj)) - return ERR_CAST(obj); + obj->map_wc = true; - npages = PAGE_ALIGN(attach->dmabuf->size) / PAGE_SIZE; - - obj->table = sg; - obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL); - if (!obj->pages) { - __vgem_gem_destroy(obj); - return ERR_PTR(-ENOMEM); - } - - obj->pages_pin_count++; /* perma-pinned */ - drm_prime_sg_to_page_array(obj->table, obj->pages, npages); return &obj->base; } -static int vgem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - long n_pages = obj->size >> PAGE_SHIFT; - struct page **pages; - void *vaddr; - - pages = vgem_pin_pages(bo); - if (IS_ERR(pages)) - return PTR_ERR(pages); - - vaddr = vmap(pages, n_pages, 0, pgprot_writecombine(PAGE_KERNEL)); - if (!vaddr) - return -ENOMEM; - dma_buf_map_set_vaddr(map, vaddr); - - return 0; -} - -static void vgem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map) -{ - struct drm_vgem_gem_object *bo = to_vgem_bo(obj); - - vunmap(map->vaddr); - vgem_unpin_pages(bo); -} - -static int vgem_prime_mmap(struct drm_gem_object *obj, - struct vm_area_struct *vma) -{ - int ret; - - if (obj->size < vma->vm_end - vma->vm_start) - return -EINVAL; - - if (!obj->filp) - return -ENODEV; - - ret = call_mmap(obj->filp, vma); - if (ret) - return ret; - - vma_set_file(vma, obj->filp); - vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); - - return 0; -} - -static const struct drm_gem_object_funcs vgem_gem_object_funcs = { - .free = vgem_gem_free_object, - .pin = vgem_prime_pin, - .unpin = vgem_prime_unpin, - .get_sg_table = vgem_prime_get_sg_table, - .vmap = vgem_prime_vmap, - .vunmap = vgem_prime_vunmap, - .vm_ops = &vgem_gem_vm_ops, -}; - static const struct drm_driver vgem_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = vgem_open, @@ -427,13 +116,8 @@ static const struct drm_driver vgem_driver = { .num_ioctls = ARRAY_SIZE(vgem_ioctls), .fops = &vgem_driver_fops, - .dumb_create = vgem_gem_dumb_create, - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_import = vgem_prime_import, - .gem_prime_import_sg_table = vgem_prime_import_sg_table, - .gem_prime_mmap = vgem_prime_mmap, + DRM_GEM_SHMEM_DRIVER_OPS, + .gem_create_object = vgem_gem_create_object, .name = DRIVER_NAME, .desc = DRIVER_DESC, -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev3) 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter ` (3 preceding siblings ...) 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 4/4] drm/vgem: use shmem helpers Daniel Vetter @ 2021-06-03 19:18 ` Patchwork 2021-06-03 19:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork ` (2 subsequent siblings) 7 siblings, 0 replies; 12+ messages in thread From: Patchwork @ 2021-06-03 19:18 UTC (permalink / raw To: Daniel Vetter; +Cc: intel-gfx == Series Details == Series: shmem helpers for vgem (rev3) URL : https://patchwork.freedesktop.org/series/90670/ State : warning == Summary == $ dim checkpatch origin/drm-tip c0a84d0fb311 dma-buf: Require VM_PFNMAP vma for mmap -:34: WARNING:TYPO_SPELLING: 'entires' may be misspelled - perhaps 'entries'? #34: From auditing the various functions to insert pfn pte entires ^^^^^^^ -:39: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #39: References: https://lore.kernel.org/lkml/CAKMK7uHi+mG0z0HUmNt13QCCvutuRVjpcR0NjRL12k-WbWzkRg@mail.gmail.com/ -:97: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 0 errors, 3 warnings, 0 checks, 39 lines checked d1d5656bffd9 drm/shmem-helper: Switch to vmf_insert_pfn -:52: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 0 errors, 1 warnings, 0 checks, 24 lines checked 97e33fae0aa0 drm/shmem-helper: Align to page size in dumb_create -:37: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 0 errors, 1 warnings, 0 checks, 15 lines checked a813167b42cc drm/vgem: use shmem helpers -:22: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 0cf2ef46c6c0 ("drm/shmem-helper: Use cached mappings by default")' #22: v4: I got tricked by 0cf2ef46c6c0 ("drm/shmem-helper: Use cached -:313: WARNING:TYPO_SPELLING: 'wont' may be misspelled - perhaps 'won't'? #313: FILE: drivers/gpu/drm/vgem/vgem_drv.c:104: + * coherent memory or dma-buf sharing just wont work. ^^^^ -:444: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 1 errors, 2 warnings, 0 checks, 392 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for shmem helpers for vgem (rev3) 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter ` (4 preceding siblings ...) 2021-06-03 19:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev3) Patchwork @ 2021-06-03 19:50 ` Patchwork 2021-06-03 21:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev5) Patchwork 2021-06-03 21:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 7 siblings, 0 replies; 12+ messages in thread From: Patchwork @ 2021-06-03 19:50 UTC (permalink / raw To: Daniel Vetter; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 10010 bytes --] == Series Details == Series: shmem helpers for vgem (rev3) URL : https://patchwork.freedesktop.org/series/90670/ State : failure == Summary == CI Bug Log - changes from CI_DRM_10166 -> Patchwork_20276 ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with Patchwork_20276 absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_20276, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/index.html Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_20276: ### IGT changes ### #### Possible regressions #### * igt@prime_vgem@basic-fence-mmap: - fi-elk-e7500: [PASS][1] -> [INCOMPLETE][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-elk-e7500/igt@prime_vgem@basic-fence-mmap.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-elk-e7500/igt@prime_vgem@basic-fence-mmap.html * igt@prime_vgem@basic-fence-read: - fi-bsw-kefka: [PASS][3] -> [INCOMPLETE][4] +1 similar issue [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bsw-kefka/igt@prime_vgem@basic-fence-read.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-bsw-kefka/igt@prime_vgem@basic-fence-read.html - fi-ilk-650: [PASS][5] -> [INCOMPLETE][6] +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-ilk-650/igt@prime_vgem@basic-fence-read.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-ilk-650/igt@prime_vgem@basic-fence-read.html - fi-bwr-2160: [PASS][7] -> [INCOMPLETE][8] [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bwr-2160/igt@prime_vgem@basic-fence-read.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-bwr-2160/igt@prime_vgem@basic-fence-read.html * igt@prime_vgem@basic-gtt: - fi-ilk-650: [PASS][9] -> [FAIL][10] +2 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-ilk-650/igt@prime_vgem@basic-gtt.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-ilk-650/igt@prime_vgem@basic-gtt.html - fi-elk-e7500: [PASS][11] -> [FAIL][12] +3 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-elk-e7500/igt@prime_vgem@basic-gtt.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-elk-e7500/igt@prime_vgem@basic-gtt.html * igt@prime_vgem@basic-read: - fi-bwr-2160: [PASS][13] -> [FAIL][14] +3 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bwr-2160/igt@prime_vgem@basic-read.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-bwr-2160/igt@prime_vgem@basic-read.html - fi-bsw-kefka: [PASS][15] -> [FAIL][16] +2 similar issues [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bsw-kefka/igt@prime_vgem@basic-read.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-bsw-kefka/igt@prime_vgem@basic-read.html * igt@prime_vgem@basic-write: - fi-pnv-d510: [PASS][17] -> [FAIL][18] +4 similar issues [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-pnv-d510/igt@prime_vgem@basic-write.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-pnv-d510/igt@prime_vgem@basic-write.html #### Suppressed #### The following results come from untrusted machines, tests, or statuses. They do not affect the overall result. * igt@prime_self_import@basic-with_two_bos: - {fi-rkl-11500t}: NOTRUN -> [FAIL][19] +5 similar issues [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-rkl-11500t/igt@prime_self_import@basic-with_two_bos.html * igt@prime_vgem@basic-fence-flip: - {fi-rkl-11500t}: NOTRUN -> [SKIP][20] +11 similar issues [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-rkl-11500t/igt@prime_vgem@basic-fence-flip.html Known issues ------------ Here are the changes found in Patchwork_20276 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_selftest@live@gt_heartbeat: - fi-cml-s: [PASS][21] -> [DMESG-FAIL][22] ([i915#2291] / [i915#541]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-cml-s/igt@i915_selftest@live@gt_heartbeat.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-cml-s/igt@i915_selftest@live@gt_heartbeat.html * igt@kms_chamelium@hdmi-hpd-fast: - fi-icl-u2: [PASS][23] -> [DMESG-WARN][24] ([i915#2203] / [i915#2868]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html #### Warnings #### * igt@i915_selftest@live@execlists: - fi-cml-s: [DMESG-FAIL][25] ([i915#3462]) -> [INCOMPLETE][26] ([i915#3462]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-cml-s/igt@i915_selftest@live@execlists.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-cml-s/igt@i915_selftest@live@execlists.html * igt@runner@aborted: - fi-cfl-8700k: [FAIL][27] ([i915#2426] / [i915#3363]) -> [FAIL][28] ([i915#3363]) [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-cfl-8700k/igt@runner@aborted.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-cfl-8700k/igt@runner@aborted.html - fi-skl-6600u: [FAIL][29] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][30] ([i915#1436] / [i915#3363]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-skl-6600u/igt@runner@aborted.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-skl-6600u/igt@runner@aborted.html - fi-kbl-soraka: [FAIL][31] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][32] ([i915#1436] / [i915#3363]) [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-kbl-soraka/igt@runner@aborted.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-kbl-soraka/igt@runner@aborted.html - fi-kbl-7500u: [FAIL][33] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][34] ([i915#1436] / [i915#3363]) [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-kbl-7500u/igt@runner@aborted.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-kbl-7500u/igt@runner@aborted.html - fi-kbl-guc: [FAIL][35] ([i915#1436] / [i915#3363]) -> [FAIL][36] ([i915#1436] / [i915#2426] / [i915#3363]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-kbl-guc/igt@runner@aborted.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-kbl-guc/igt@runner@aborted.html - fi-skl-guc: [FAIL][37] ([i915#1436] / [i915#3363]) -> [FAIL][38] ([i915#1436] / [i915#2426] / [i915#3363]) [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-skl-guc/igt@runner@aborted.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/fi-skl-guc/igt@runner@aborted.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203 [i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291 [i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426 [i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868 [i915#2932]: https://gitlab.freedesktop.org/drm/intel/issues/2932 [i915#2966]: https://gitlab.freedesktop.org/drm/intel/issues/2966 [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012 [i915#3276]: https://gitlab.freedesktop.org/drm/intel/issues/3276 [i915#3277]: https://gitlab.freedesktop.org/drm/intel/issues/3277 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3283]: https://gitlab.freedesktop.org/drm/intel/issues/3283 [i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363 [i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462 [i915#3542]: https://gitlab.freedesktop.org/drm/intel/issues/3542 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541 Participating hosts (45 -> 41) ------------------------------ Additional (1): fi-rkl-11500t Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-bsw-nick fi-bdw-samus Build changes ------------- * IGT: IGT_6098 -> IGTPW_5854 * Linux: CI_DRM_10166 -> Patchwork_20276 CI-20190529: 20190529 CI_DRM_10166: 3fd09081d24a83a7f1df17e40a9278f678a75125 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_5854: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5854/index.html IGT_6098: 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_20276: a813167b42cc3eb969e3d40923229b1728532ff7 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == a813167b42cc drm/vgem: use shmem helpers 97e33fae0aa0 drm/shmem-helper: Align to page size in dumb_create d1d5656bffd9 drm/shmem-helper: Switch to vmf_insert_pfn c0a84d0fb311 dma-buf: Require VM_PFNMAP vma for mmap == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20276/index.html [-- Attachment #1.2: Type: text/html, Size: 11936 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev5) 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter ` (5 preceding siblings ...) 2021-06-03 19:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork @ 2021-06-03 21:16 ` Patchwork 2021-06-03 21:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 7 siblings, 0 replies; 12+ messages in thread From: Patchwork @ 2021-06-03 21:16 UTC (permalink / raw To: Daniel Vetter; +Cc: intel-gfx == Series Details == Series: shmem helpers for vgem (rev5) URL : https://patchwork.freedesktop.org/series/90670/ State : warning == Summary == $ dim checkpatch origin/drm-tip 9e8ef4e2828c dma-buf: Require VM_PFNMAP vma for mmap -:34: WARNING:TYPO_SPELLING: 'entires' may be misspelled - perhaps 'entries'? #34: From auditing the various functions to insert pfn pte entires ^^^^^^^ -:39: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #39: References: https://lore.kernel.org/lkml/CAKMK7uHi+mG0z0HUmNt13QCCvutuRVjpcR0NjRL12k-WbWzkRg@mail.gmail.com/ -:97: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 0 errors, 3 warnings, 0 checks, 39 lines checked dd1ffdf52775 drm/shmem-helper: Switch to vmf_insert_pfn -:14: WARNING:TYPO_SPELLING: 'wont' may be misspelled - perhaps 'won't'? #14: helpers for these drivers on those platforms. As-is this wont work. ^^^^ -:17: WARNING:TYPO_SPELLING: 'wont' may be misspelled - perhaps 'won't'? #17: definitely wont fly in practice since the pages are non-contig to ^^^^ -:108: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 0 errors, 3 warnings, 0 checks, 55 lines checked 6d03cb0b1181 drm/shmem-helper: Align to page size in dumb_create -:37: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 0 errors, 1 warnings, 0 checks, 15 lines checked d4c823697fde drm/vgem: use shmem helpers -:22: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 0cf2ef46c6c0 ("drm/shmem-helper: Use cached mappings by default")' #22: v4: I got tricked by 0cf2ef46c6c0 ("drm/shmem-helper: Use cached -:326: WARNING:TYPO_SPELLING: 'wont' may be misspelled - perhaps 'won't'? #326: FILE: drivers/gpu/drm/vgem/vgem_drv.c:104: + * coherent memory or dma-buf sharing just wont work. ^^^^ -:457: WARNING:FROM_SIGN_OFF_MISMATCH: From:/Signed-off-by: email address mismatch: 'From: Daniel Vetter <daniel.vetter@ffwll.ch>' != 'Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>' total: 1 errors, 2 warnings, 0 checks, 402 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for shmem helpers for vgem (rev5) 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter ` (6 preceding siblings ...) 2021-06-03 21:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev5) Patchwork @ 2021-06-03 21:48 ` Patchwork 7 siblings, 0 replies; 12+ messages in thread From: Patchwork @ 2021-06-03 21:48 UTC (permalink / raw To: Daniel Vetter; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 9973 bytes --] == Series Details == Series: shmem helpers for vgem (rev5) URL : https://patchwork.freedesktop.org/series/90670/ State : failure == Summary == CI Bug Log - changes from CI_DRM_10166 -> Patchwork_20278 ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with Patchwork_20278 absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_20278, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/index.html Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_20278: ### IGT changes ### #### Possible regressions #### * igt@prime_vgem@basic-fence-mmap: - fi-bsw-kefka: [PASS][1] -> [INCOMPLETE][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bsw-kefka/igt@prime_vgem@basic-fence-mmap.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-bsw-kefka/igt@prime_vgem@basic-fence-mmap.html - fi-bsw-nick: [PASS][3] -> [INCOMPLETE][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bsw-nick/igt@prime_vgem@basic-fence-mmap.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-bsw-nick/igt@prime_vgem@basic-fence-mmap.html - fi-bwr-2160: [PASS][5] -> [INCOMPLETE][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bwr-2160/igt@prime_vgem@basic-fence-mmap.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-bwr-2160/igt@prime_vgem@basic-fence-mmap.html * igt@prime_vgem@basic-fence-read: - fi-ilk-650: [PASS][7] -> [INCOMPLETE][8] +1 similar issue [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-ilk-650/igt@prime_vgem@basic-fence-read.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-ilk-650/igt@prime_vgem@basic-fence-read.html - fi-elk-e7500: [PASS][9] -> [INCOMPLETE][10] +1 similar issue [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-elk-e7500/igt@prime_vgem@basic-fence-read.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-elk-e7500/igt@prime_vgem@basic-fence-read.html * igt@prime_vgem@basic-gtt: - fi-ilk-650: [PASS][11] -> [FAIL][12] +2 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-ilk-650/igt@prime_vgem@basic-gtt.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-ilk-650/igt@prime_vgem@basic-gtt.html - fi-elk-e7500: [PASS][13] -> [FAIL][14] +2 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-elk-e7500/igt@prime_vgem@basic-gtt.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-elk-e7500/igt@prime_vgem@basic-gtt.html * igt@prime_vgem@basic-read: - fi-bwr-2160: [PASS][15] -> [FAIL][16] +3 similar issues [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bwr-2160/igt@prime_vgem@basic-read.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-bwr-2160/igt@prime_vgem@basic-read.html - fi-bsw-nick: [PASS][17] -> [FAIL][18] +3 similar issues [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bsw-nick/igt@prime_vgem@basic-read.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-bsw-nick/igt@prime_vgem@basic-read.html - fi-bsw-kefka: [PASS][19] -> [FAIL][20] +2 similar issues [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-bsw-kefka/igt@prime_vgem@basic-read.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-bsw-kefka/igt@prime_vgem@basic-read.html * igt@prime_vgem@basic-write: - fi-pnv-d510: [PASS][21] -> [FAIL][22] +4 similar issues [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-pnv-d510/igt@prime_vgem@basic-write.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-pnv-d510/igt@prime_vgem@basic-write.html #### Suppressed #### The following results come from untrusted machines, tests, or statuses. They do not affect the overall result. * igt@prime_self_import@basic-with_two_bos: - {fi-rkl-11500t}: NOTRUN -> [FAIL][23] +5 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-rkl-11500t/igt@prime_self_import@basic-with_two_bos.html * igt@prime_vgem@basic-fence-flip: - {fi-rkl-11500t}: NOTRUN -> [SKIP][24] +11 similar issues [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-rkl-11500t/igt@prime_vgem@basic-fence-flip.html Known issues ------------ Here are the changes found in Patchwork_20278 that come from known issues: ### IGT changes ### #### Warnings #### * igt@i915_selftest@live@execlists: - fi-cml-s: [DMESG-FAIL][25] ([i915#3462]) -> [INCOMPLETE][26] ([i915#3462]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-cml-s/igt@i915_selftest@live@execlists.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-cml-s/igt@i915_selftest@live@execlists.html * igt@runner@aborted: - fi-cfl-8700k: [FAIL][27] ([i915#2426] / [i915#3363]) -> [FAIL][28] ([i915#3363]) [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-cfl-8700k/igt@runner@aborted.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-cfl-8700k/igt@runner@aborted.html - fi-skl-6600u: [FAIL][29] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][30] ([i915#1436] / [i915#3363]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-skl-6600u/igt@runner@aborted.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-skl-6600u/igt@runner@aborted.html - fi-glk-dsi: [FAIL][31] ([i915#2426] / [i915#3363] / [k.org#202321]) -> [FAIL][32] ([i915#3363] / [k.org#202321]) [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-glk-dsi/igt@runner@aborted.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-glk-dsi/igt@runner@aborted.html - fi-kbl-7500u: [FAIL][33] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][34] ([i915#1436] / [i915#3363]) [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-kbl-7500u/igt@runner@aborted.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-kbl-7500u/igt@runner@aborted.html - fi-kbl-guc: [FAIL][35] ([i915#1436] / [i915#3363]) -> [FAIL][36] ([i915#1436] / [i915#2426] / [i915#3363]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-kbl-guc/igt@runner@aborted.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-kbl-guc/igt@runner@aborted.html - fi-cfl-guc: [FAIL][37] ([i915#3363]) -> [FAIL][38] ([i915#2426] / [i915#3363]) [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-cfl-guc/igt@runner@aborted.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-cfl-guc/igt@runner@aborted.html - fi-skl-6700k2: [FAIL][39] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][40] ([i915#1436] / [i915#3363]) [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10166/fi-skl-6700k2/igt@runner@aborted.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/fi-skl-6700k2/igt@runner@aborted.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426 [i915#2932]: https://gitlab.freedesktop.org/drm/intel/issues/2932 [i915#2966]: https://gitlab.freedesktop.org/drm/intel/issues/2966 [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012 [i915#3276]: https://gitlab.freedesktop.org/drm/intel/issues/3276 [i915#3277]: https://gitlab.freedesktop.org/drm/intel/issues/3277 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3283]: https://gitlab.freedesktop.org/drm/intel/issues/3283 [i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363 [i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462 [i915#3542]: https://gitlab.freedesktop.org/drm/intel/issues/3542 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321 Participating hosts (45 -> 39) ------------------------------ Additional (1): fi-rkl-11500t Missing (7): fi-ilk-m540 fi-tgl-u2 fi-hsw-4200u fi-bsw-n3050 fi-bsw-cyan fi-snb-2520m fi-bdw-samus Build changes ------------- * IGT: IGT_6098 -> IGTPW_5854 * Linux: CI_DRM_10166 -> Patchwork_20278 CI-20190529: 20190529 CI_DRM_10166: 3fd09081d24a83a7f1df17e40a9278f678a75125 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_5854: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5854/index.html IGT_6098: 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_20278: d4c823697fdeb07cca64f6d3d80d7b0538ad2715 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == d4c823697fde drm/vgem: use shmem helpers 6d03cb0b1181 drm/shmem-helper: Align to page size in dumb_create dd1ffdf52775 drm/shmem-helper: Switch to vmf_insert_pfn 9e8ef4e2828c dma-buf: Require VM_PFNMAP vma for mmap == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20278/index.html [-- Attachment #1.2: Type: text/html, Size: 12018 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-07-13 13:44 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-06-03 16:41 [Intel-gfx] [PATCH v3 0/4] shmem helpers for vgem Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 1/4] dma-buf: Require VM_PFNMAP vma for mmap Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 2/4] drm/shmem-helper: Switch to vmf_insert_pfn Daniel Vetter 2021-06-03 21:08 ` [Intel-gfx] [PATCH] " Daniel Vetter 2021-07-13 13:44 ` Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 3/4] drm/shmem-helper: Align to page size in dumb_create Daniel Vetter 2021-06-03 16:41 ` [Intel-gfx] [PATCH v3 4/4] drm/vgem: use shmem helpers Daniel Vetter 2021-06-03 21:09 ` [Intel-gfx] [PATCH] " Daniel Vetter 2021-06-03 19:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev3) Patchwork 2021-06-03 19:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2021-06-03 21:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helpers for vgem (rev5) Patchwork 2021-06-03 21:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).