| Message ID | 20190906184712.91980-6-john.stultz@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DMA-BUF Heaps (destaging ION) | expand |
Hi John, I didn't see any response about using the test harness. Did you decide against it? On Fri, Sep 06, 2019 at 06:47:12PM +0000, John Stultz wrote: > Add very trivial allocation and import test for dma-heaps, > utilizing the vgem driver as a test importer. > > A good chunk of this code taken from: > tools/testing/selftests/android/ion/ionmap_test.c > Originally by Laura Abbott <labbott@redhat.com> > > Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: Liam Mark <lmark@codeaurora.org> > Cc: Pratik Patel <pratikp@codeaurora.org> > Cc: Brian Starkey <Brian.Starkey@arm.com> > Cc: Vincent Donnefort <Vincent.Donnefort@arm.com> > Cc: Sudipto Paul <Sudipto.Paul@arm.com> > Cc: Andrew F. Davis <afd@ti.com> > Cc: Christoph Hellwig <hch@infradead.org> > Cc: Chenbo Feng <fengc@google.com> > Cc: Alistair Strachan <astrachan@google.com> > Cc: Hridya Valsaraju <hridya@google.com> > Cc: dri-devel@lists.freedesktop.org > Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- > v2: > * Switched to use reworked dma-heap apis > v3: > * Add simple mmap > * Utilize dma-buf testdev to test importing > v4: > * Rework to use vgem > * Pass in fd_flags to match interface changes > * Skip . and .. dirs > v6: > * Number of style/cleanups suggested by Brian > v7: > * Whitespace fixup for checkpatch > v8: > * More checkpatch whitespace fixups > --- > tools/testing/selftests/dmabuf-heaps/Makefile | 9 + > .../selftests/dmabuf-heaps/dmabuf-heap.c | 230 ++++++++++++++++++ > 2 files changed, 239 insertions(+) > create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile > create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c > > diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile > new file mode 100644 > index 000000000000..8c4c36e2972d > --- /dev/null > +++ b/tools/testing/selftests/dmabuf-heaps/Makefile > @@ -0,0 +1,9 @@ > +# SPDX-License-Identifier: GPL-2.0 > +CFLAGS += -static -O3 -Wl,-no-as-needed -Wall > +#LDLIBS += -lrt -lpthread -lm > + > +# these are all "safe" tests that don't modify > +# system time or require escalated privileges > +TEST_GEN_PROGS = dmabuf-heap > + > +include ../lib.mk > diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c > new file mode 100644 > index 000000000000..e439d6cf3d81 > --- /dev/null > +++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c > @@ -0,0 +1,230 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <dirent.h> > +#include <errno.h> > +#include <fcntl.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <stdint.h> > +#include <string.h> > +#include <unistd.h> > +#include <sys/ioctl.h> > +#include <sys/mman.h> > +#include <sys/types.h> > + > +#include <linux/dma-buf.h> > +#include <drm/drm.h> > + > +#include "../../../../include/uapi/linux/dma-heap.h" > + > +#define DEVPATH "/dev/dma_heap" > + > +static int check_vgem(int fd) > +{ > + drm_version_t version = { 0 }; > + char name[5]; > + int ret; > + > + version.name_len = 4; > + version.name = name; > + > + ret = ioctl(fd, DRM_IOCTL_VERSION, &version); > + if (ret) > + return 0; > + > + return !strcmp(name, "vgem"); > +} > + > +static int open_vgem(void) > +{ > + int i, fd; > + const char *drmstr = "/dev/dri/card"; > + > + fd = -1; > + for (i = 0; i < 16; i++) { > + char name[80]; > + > + sprintf(name, "%s%u", drmstr, i); > + > + fd = open(name, O_RDWR); > + if (fd < 0) > + continue; > + > + if (!check_vgem(fd)) { > + close(fd); I didn't spot this last time, but there's an (unlikely) error scenario here if there's >= 16 DRM devices and none of them are vgem, then you'll return a stale fd. > + continue; > + } else { > + break; > + } > + } > + return fd; > +} > + > +static int import_vgem_fd(int vgem_fd, int dma_buf_fd, uint32_t *handle) > +{ > + struct drm_prime_handle import_handle = { > + .fd = dma_buf_fd, > + .flags = 0, > + .handle = 0, > + }; > + int ret; > + > + ret = ioctl(vgem_fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &import_handle); > + if (ret == 0) > + *handle = import_handle.handle; > + return ret; > +} > + > +static void close_handle(int vgem_fd, uint32_t handle) > +{ > + struct drm_gem_close close = { > + .handle = handle, > + }; > + > + ioctl(vgem_fd, DRM_IOCTL_GEM_CLOSE, &close); > +} > + > +static int dmabuf_heap_open(char *name) > +{ > + int ret, fd; > + char buf[256]; > + > + ret = sprintf(buf, "%s/%s", DEVPATH, name); snprintf(), just because why not? > + if (ret < 0) { > + printf("sprintf failed!\n"); > + return ret; > + } > + > + fd = open(buf, O_RDWR); > + if (fd < 0) > + printf("open %s failed!\n", buf); > + return fd; > +} > + > +static int dmabuf_heap_alloc(int fd, size_t len, unsigned int flags, > + int *dmabuf_fd) > +{ > + struct dma_heap_allocation_data data = { > + .len = len, > + .fd_flags = O_RDWR | O_CLOEXEC, > + .heap_flags = flags, > + }; > + int ret; > + > + if (!dmabuf_fd) > + return -EINVAL; > + > + ret = ioctl(fd, DMA_HEAP_IOC_ALLOC, &data); > + if (ret < 0) > + return ret; > + *dmabuf_fd = (int)data.fd; > + return ret; > +} > + > +static void dmabuf_sync(int fd, int start_stop) > +{ > + struct dma_buf_sync sync = { > + .flags = start_stop | DMA_BUF_SYNC_RW, > + }; > + int ret; > + > + ret = ioctl(fd, DMA_BUF_IOCTL_SYNC, &sync); > + if (ret) > + printf("sync failed %d\n", errno); > +} > + > +#define ONE_MEG (1024 * 1024) > + > +static void do_test(char *heap_name) > +{ > + int heap_fd = -1, dmabuf_fd = -1, importer_fd = -1; > + uint32_t handle = 0; > + void *p = NULL; > + int ret; > + > + printf("Testing heap: %s\n", heap_name); > + > + heap_fd = dmabuf_heap_open(heap_name); > + if (heap_fd < 0) > + return; > + > + printf("Allocating 1 MEG\n"); > + ret = dmabuf_heap_alloc(heap_fd, ONE_MEG, 0, &dmabuf_fd); > + if (ret) { > + printf("Allocation Failed!\n"); > + goto out; > + } > + /* mmap and write a simple pattern */ > + p = mmap(NULL, > + ONE_MEG, > + PROT_READ | PROT_WRITE, > + MAP_SHARED, > + dmabuf_fd, > + 0); > + if (p == MAP_FAILED) { > + printf("mmap() failed: %m\n"); > + goto out; > + } > + printf("mmap passed\n"); > + > + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_START); > + > + memset(p, 1, ONE_MEG / 2); > + memset((char *)p + ONE_MEG / 2, 0, ONE_MEG / 2); > + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_END); > + > + importer_fd = open_vgem(); > + if (importer_fd < 0) { > + ret = importer_fd; > + printf("Failed to open vgem\n"); > + goto out; > + } > + > + ret = import_vgem_fd(importer_fd, dmabuf_fd, &handle); > + if (ret < 0) { > + printf("Failed to import buffer\n"); > + goto out; > + } > + printf("import passed\n"); > + > + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_START); > + memset(p, 0xff, ONE_MEG); > + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_END); > + printf("syncs passed\n"); > + > + close_handle(importer_fd, handle); > + > +out: > + if (p) > + munmap(p, ONE_MEG); > + if (importer_fd >= 0) > + close(importer_fd); > + if (dmabuf_fd >= 0) > + close(dmabuf_fd); > + if (heap_fd >= 0) > + close(heap_fd); > +} > + > +int main(void) > +{ > + DIR *d; > + struct dirent *dir; > + > + d = opendir(DEVPATH); > + if (!d) { > + printf("No %s directory?\n", DEVPATH); > + return -1; > + } > + > + while ((dir = readdir(d)) != NULL) { > + if (!strncmp(dir->d_name, ".", 2)) > + continue; > + if (!strncmp(dir->d_name, "..", 3)) > + continue; > + > + do_test(dir->d_name); As far as I understand it, if main() always returns zero, this test will always be indicated as a "pass" - shouldn't there be at least some failure scenarios? Cheers, -Brian > + } > + closedir(d); > + > + return 0; > +} > -- > 2.17.1 >
On Mon, Sep 23, 2019 at 3:12 PM Brian Starkey <Brian.Starkey@arm.com> wrote: > > I didn't see any response about using the test harness. Did you decide > against it? Hey! Spent a little time looking at this bit and just wanted to reply to this point. So first, apologies, I think I missed the suggestion earlier. That said, now that I've looked a little bit at the test harness, and at least at this point it feels like it makes it harder to reason with than standard c code. Maybe I need to spend a bit more time on it, but I'm a little hesitant to swap over just yet. I'm not particularly passionate on this point, but are you? Or was this just a recommendation to check it out and consider it? thanks -john
Hi John, On Thu, Sep 26, 2019 at 02:36:33PM -0700, John Stultz wrote: > On Mon, Sep 23, 2019 at 3:12 PM Brian Starkey <Brian.Starkey@arm.com> wrote: > > > > I didn't see any response about using the test harness. Did you decide > > against it? > > Hey! Spent a little time looking at this bit and just wanted to reply > to this point. So first, apologies, I think I missed the suggestion > earlier. That said, now that I've looked a little bit at the test > harness, and at least at this point it feels like it makes it harder > to reason with than standard c code. Maybe I need to spend a bit more > time on it, but I'm a little hesitant to swap over just yet. > > I'm not particularly passionate on this point, but are you? Or was > this just a recommendation to check it out and consider it? No particular strong feelings. I was just poking around the kernel docs for testing and the only info there is about the test harness, so wanted to check if you'd seen/considered it. A quick grep of tools/testing shows that it's obviously not that popular... so if you don't fancy it I won't complain. Thanks, -Brian > > thanks > -john
diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile new file mode 100644 index 000000000000..8c4c36e2972d --- /dev/null +++ b/tools/testing/selftests/dmabuf-heaps/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +CFLAGS += -static -O3 -Wl,-no-as-needed -Wall +#LDLIBS += -lrt -lpthread -lm + +# these are all "safe" tests that don't modify +# system time or require escalated privileges +TEST_GEN_PROGS = dmabuf-heap + +include ../lib.mk diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c new file mode 100644 index 000000000000..e439d6cf3d81 --- /dev/null +++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c @@ -0,0 +1,230 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <sys/types.h> + +#include <linux/dma-buf.h> +#include <drm/drm.h> + +#include "../../../../include/uapi/linux/dma-heap.h" + +#define DEVPATH "/dev/dma_heap" + +static int check_vgem(int fd) +{ + drm_version_t version = { 0 }; + char name[5]; + int ret; + + version.name_len = 4; + version.name = name; + + ret = ioctl(fd, DRM_IOCTL_VERSION, &version); + if (ret) + return 0; + + return !strcmp(name, "vgem"); +} + +static int open_vgem(void) +{ + int i, fd; + const char *drmstr = "/dev/dri/card"; + + fd = -1; + for (i = 0; i < 16; i++) { + char name[80]; + + sprintf(name, "%s%u", drmstr, i); + + fd = open(name, O_RDWR); + if (fd < 0) + continue; + + if (!check_vgem(fd)) { + close(fd); + continue; + } else { + break; + } + } + return fd; +} + +static int import_vgem_fd(int vgem_fd, int dma_buf_fd, uint32_t *handle) +{ + struct drm_prime_handle import_handle = { + .fd = dma_buf_fd, + .flags = 0, + .handle = 0, + }; + int ret; + + ret = ioctl(vgem_fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &import_handle); + if (ret == 0) + *handle = import_handle.handle; + return ret; +} + +static void close_handle(int vgem_fd, uint32_t handle) +{ + struct drm_gem_close close = { + .handle = handle, + }; + + ioctl(vgem_fd, DRM_IOCTL_GEM_CLOSE, &close); +} + +static int dmabuf_heap_open(char *name) +{ + int ret, fd; + char buf[256]; + + ret = sprintf(buf, "%s/%s", DEVPATH, name); + if (ret < 0) { + printf("sprintf failed!\n"); + return ret; + } + + fd = open(buf, O_RDWR); + if (fd < 0) + printf("open %s failed!\n", buf); + return fd; +} + +static int dmabuf_heap_alloc(int fd, size_t len, unsigned int flags, + int *dmabuf_fd) +{ + struct dma_heap_allocation_data data = { + .len = len, + .fd_flags = O_RDWR | O_CLOEXEC, + .heap_flags = flags, + }; + int ret; + + if (!dmabuf_fd) + return -EINVAL; + + ret = ioctl(fd, DMA_HEAP_IOC_ALLOC, &data); + if (ret < 0) + return ret; + *dmabuf_fd = (int)data.fd; + return ret; +} + +static void dmabuf_sync(int fd, int start_stop) +{ + struct dma_buf_sync sync = { + .flags = start_stop | DMA_BUF_SYNC_RW, + }; + int ret; + + ret = ioctl(fd, DMA_BUF_IOCTL_SYNC, &sync); + if (ret) + printf("sync failed %d\n", errno); +} + +#define ONE_MEG (1024 * 1024) + +static void do_test(char *heap_name) +{ + int heap_fd = -1, dmabuf_fd = -1, importer_fd = -1; + uint32_t handle = 0; + void *p = NULL; + int ret; + + printf("Testing heap: %s\n", heap_name); + + heap_fd = dmabuf_heap_open(heap_name); + if (heap_fd < 0) + return; + + printf("Allocating 1 MEG\n"); + ret = dmabuf_heap_alloc(heap_fd, ONE_MEG, 0, &dmabuf_fd); + if (ret) { + printf("Allocation Failed!\n"); + goto out; + } + /* mmap and write a simple pattern */ + p = mmap(NULL, + ONE_MEG, + PROT_READ | PROT_WRITE, + MAP_SHARED, + dmabuf_fd, + 0); + if (p == MAP_FAILED) { + printf("mmap() failed: %m\n"); + goto out; + } + printf("mmap passed\n"); + + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_START); + + memset(p, 1, ONE_MEG / 2); + memset((char *)p + ONE_MEG / 2, 0, ONE_MEG / 2); + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_END); + + importer_fd = open_vgem(); + if (importer_fd < 0) { + ret = importer_fd; + printf("Failed to open vgem\n"); + goto out; + } + + ret = import_vgem_fd(importer_fd, dmabuf_fd, &handle); + if (ret < 0) { + printf("Failed to import buffer\n"); + goto out; + } + printf("import passed\n"); + + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_START); + memset(p, 0xff, ONE_MEG); + dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_END); + printf("syncs passed\n"); + + close_handle(importer_fd, handle); + +out: + if (p) + munmap(p, ONE_MEG); + if (importer_fd >= 0) + close(importer_fd); + if (dmabuf_fd >= 0) + close(dmabuf_fd); + if (heap_fd >= 0) + close(heap_fd); +} + +int main(void) +{ + DIR *d; + struct dirent *dir; + + d = opendir(DEVPATH); + if (!d) { + printf("No %s directory?\n", DEVPATH); + return -1; + } + + while ((dir = readdir(d)) != NULL) { + if (!strncmp(dir->d_name, ".", 2)) + continue; + if (!strncmp(dir->d_name, "..", 3)) + continue; + + do_test(dir->d_name); + } + closedir(d); + + return 0; +}