Received: by 10.223.185.116 with SMTP id b49csp1002183wrg; Fri, 16 Feb 2018 10:36:22 -0800 (PST) X-Google-Smtp-Source: AH8x225H5dMCFLNPSHS7ZQsT/A+beql40oyi46pFWsqdWlRHsgYKWAhJM89AqJx79DMtIyuQvVDD X-Received: by 10.99.103.69 with SMTP id b66mr5815226pgc.233.1518806182127; Fri, 16 Feb 2018 10:36:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518806182; cv=none; d=google.com; s=arc-20160816; b=oXXKNMt0kBK40TTkAVXEbPcl8Ck2i5PBz89JDg84DtSwPbXph7RAPLj5bJZ7mZmSNT 7ff08ZeK3cNYi0FgReHhMgcRTVETLRtaHsE3ibQGN4nro+iOJTRDMNIVJ+twznVlyQsV zb6funUzsW7Mm9dHAn5fYIW04hKU9abGmJK1oPlFJXZxpIrmy/JReZkOaR1zMVp+yRz1 zvQDcCvJxES1gV7fXJRDHsJlne+Z7JyKGhmKtd460BseQ+MmPDKRooxwGcXmh84fEiRo QhTcIbNbfnv3rRKFbueLoSCyml2jd8zE8pM9O1CoMLfCJNkOn1lNOYD4xoJMjHQ5yAoi wRzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=9WBd2SOxUoJp2dDxm1wYqvoPY+JfcP6yVHVMueMVdZk=; b=A0TEqpC7s3jSJEgnOyutpHMettEU70Vt3fF+PXoK+PIxvlGYw0BKZ/dR1XqeF8T8Io ultDhHgXH6EchnYptj5PAcW+YDlcav73KZnLRq/tjzz2hSBlR05/0kpBbEzSUiA4LW0M qk1k1gRu8z7IiU2qmEx2cMEw9pttO/4cHm8PZ1we+c0i5m+dMLK5HcB6wl+GCUP02hTn xBs74+AUeHehaUa3uYCxmTRqzH/vfYe7wXojAV9eUHnhhRFN+aXwzUIisNWCr6CBQlMu wNi5eDszxWgzuUTfk2TTDn8EvXkbfn5zZEkdq8TFjJU8wE5s/pD8H60CZQO2HyG+lwAF Ym+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t3si1649696pgp.222.2018.02.16.10.36.07; Fri, 16 Feb 2018 10:36:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757140AbeBPBZV (ORCPT + 99 others); Thu, 15 Feb 2018 20:25:21 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:44484 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757094AbeBPBY7 (ORCPT ); Thu, 15 Feb 2018 20:24:59 -0500 Received: by mail-oi0-f65.google.com with SMTP id b3so1257582oib.11 for ; Thu, 15 Feb 2018 17:24:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9WBd2SOxUoJp2dDxm1wYqvoPY+JfcP6yVHVMueMVdZk=; b=lnxrmGP0o4qfGK3ZLi8xWnvSN5qjuQ6pYU3BarJ+y6uXh3MEBvN8qKcoavFacIYIfO Fme2mSuIJqNV+H75Gh+lCBdncgSh8pksKGist9kEPc6ZG2vuzav/eS9jPtAIGH3akL+B kF0iHhTsvHfD5ITztgRGUR8bL6zftb7nwRT5pUmuSF3VrzMu/3PlORRnGlU1hpodtBtC zUu1fKd9RGfpoJbKXKzDaX7xRIO09zNMMlMMQQcO18IMXL0/tCLOtMzWMILwtAxGiAhy FKinPD7+xHzkqJGj3oHloARLaP09XlEDrhwoIiMk/J9IwQSrCOYSM0O/YcXJV7PKlDRL HSWQ== X-Gm-Message-State: APf1xPDJ2DjAa0EE/EAZIz3CZPkp3TRz/oMckodezL/lVBHl4Vt4A/NG fduFeqPGS89+3DL2vHRUW+NEYw== X-Received: by 10.202.10.137 with SMTP id k9mr3397305oiy.147.1518744299035; Thu, 15 Feb 2018 17:24:59 -0800 (PST) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::f21a]) by smtp.gmail.com with ESMTPSA id 18sm9156443oty.64.2018.02.15.17.24.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2018 17:24:57 -0800 (PST) From: Laura Abbott To: Sumit Semwal Cc: Laura Abbott , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Todd Kjos , dri-devel@lists.freedesktop.org, Chris Wilson , Liam Mark , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH 2/2] selftests: ion: Add simple test with the vgem driver Date: Thu, 15 Feb 2018 17:24:45 -0800 Message-Id: <20180216012445.17264-3-labbott@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180216012445.17264-1-labbott@redhat.com> References: <20180216012445.17264-1-labbott@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ion is designed to be a framework used by other clients who perform operations on the buffer. Use the DRM vgem client as a simple consumer. In conjunction with the dma-buf sync ioctls, this tests the full attach/map path for the system heap. Signed-off-by: Laura Abbott --- tools/testing/selftests/android/ion/Makefile | 3 +- tools/testing/selftests/android/ion/config | 1 + tools/testing/selftests/android/ion/ionmap_test.c | 136 ++++++++++++++++++++++ 3 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/android/ion/ionmap_test.c diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile index 96e0c448b39d..d23b6d537d8b 100644 --- a/tools/testing/selftests/android/ion/Makefile +++ b/tools/testing/selftests/android/ion/Makefile @@ -2,7 +2,7 @@ INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g -TEST_GEN_FILES := ionapp_export ionapp_import +TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test all: $(TEST_GEN_FILES) @@ -14,3 +14,4 @@ include ../../lib.mk $(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c $(OUTPUT)/ionapp_import: ionapp_import.c ipcsocket.c ionutils.c +$(OUTPUT)/ionmap_test: ionmap_test.c ionutils.c diff --git a/tools/testing/selftests/android/ion/config b/tools/testing/selftests/android/ion/config index 19db6ca9aa2b..b4ad748a9dd9 100644 --- a/tools/testing/selftests/android/ion/config +++ b/tools/testing/selftests/android/ion/config @@ -2,3 +2,4 @@ CONFIG_ANDROID=y CONFIG_STAGING=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y +CONFIG_DRM_VGEM=y diff --git a/tools/testing/selftests/android/ion/ionmap_test.c b/tools/testing/selftests/android/ion/ionmap_test.c new file mode 100644 index 000000000000..dab36b06b37d --- /dev/null +++ b/tools/testing/selftests/android/ion/ionmap_test.c @@ -0,0 +1,136 @@ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include + +#include "ion.h" +#include "ionutils.h" + +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 1; + + return strcmp(name, "vgem"); +} + +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; +} + +int import_vgem_fd(int vgem_fd, int dma_buf_fd, uint32_t *handle) +{ + struct drm_prime_handle import_handle = { 0 }; + int ret; + + import_handle.fd = dma_buf_fd; + import_handle.flags = 0; + import_handle.handle = 0; + + ret = ioctl(vgem_fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &import_handle); + if (ret == 0) + *handle = import_handle.handle; + return ret; +} + +void close_handle(int vgem_fd, uint32_t handle) +{ + struct drm_gem_close close = { 0 }; + + close.handle = handle; + ioctl(vgem_fd, DRM_IOCTL_GEM_CLOSE, &close); +} + +int main() +{ + int ret, vgem_fd; + struct ion_buffer_info info; + uint32_t handle = 0; + struct dma_buf_sync sync = { 0 }; + + info.heap_type = ION_HEAP_TYPE_SYSTEM; + info.heap_size = 4096; + info.flag_type = ION_FLAG_CACHED; + + ret = ion_export_buffer_fd(&info); + if (ret < 0) { + printf("ion buffer alloc failed\n"); + return -1; + } + + vgem_fd = open_vgem(); + if (vgem_fd < 0) { + ret = vgem_fd; + printf("Failed to open vgem\n"); + goto out_ion; + } + + ret = import_vgem_fd(vgem_fd, info.buffd, &handle); + + if (ret < 0) { + printf("Failed to import buffer\n"); + goto out_vgem; + } + + sync.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW; + ret = ioctl(info.buffd, DMA_BUF_IOCTL_SYNC, &sync); + if (ret) + printf("sync start failed %d\n", errno); + + memset(info.buffer, 0xff, 4096); + + sync.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW; + ret = ioctl(info.buffd, DMA_BUF_IOCTL_SYNC, &sync); + if (ret) + printf("sync end failed %d\n", errno); + + close_handle(vgem_fd, handle); + ret = 0; + +out_vgem: + close(vgem_fd); +out_ion: + ion_close_buffer_fd(&info); + printf("done.\n"); + return ret; +} -- 2.14.3