From patchwork Thu Jun 4 04:47:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 11586939 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06EC0739 for ; Thu, 4 Jun 2020 04:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2F5C2074B for ; Thu, 4 Jun 2020 04:47:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dYNtyfcw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726305AbgFDEr7 (ORCPT ); Thu, 4 Jun 2020 00:47:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725950AbgFDEr6 (ORCPT ); Thu, 4 Jun 2020 00:47:58 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C0E8C05BD43 for ; Wed, 3 Jun 2020 21:47:58 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id x22so2809520pfn.3 for ; Wed, 03 Jun 2020 21:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tlm2PTSV7hM+L+7Ca6RkRye5S/V5ZtU9rHLv62WycoQ=; b=dYNtyfcwBSXyO/J6rRPm84ZLJC5qWwx85iP1qOY6WJ3ZxKXCipzjfLla/+KsSKQ+FD ZRRj0uPWvVaPlnGIiYZ8MIzM+WFGMIekS8m2N587wws9C45ORkEnZOQa/Pa1eZEDJSq1 wZLMuIOhc2mJTQEmMjeDkjrV5/zfuntOMHB2nwIJ/gFy5B5AKS/cr63rmHEVioS/Z0qC Az2x7qMWra/y82/j9gI7Aet/riGCnOouIrcq0Y4+L4k6WsoYjd4befKwi183g/rrUmR3 JaoEUEYoFWPbgmG5NMQXhz9jGwczsjCnxaSTazO7jHuYCChS30rnhib6FjI500fMmvep XVIw== 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:mime-version :content-transfer-encoding; bh=tlm2PTSV7hM+L+7Ca6RkRye5S/V5ZtU9rHLv62WycoQ=; b=Ku1CtrdvjD1CSav9C6qRj6TYrIZGwS/q/gTRpvmyEsGYrDGO+LxdnfzFkmYZCFSK6n H/lpNRGpZcCT6wbdPsT4bggVOjwKD5+drSvgtF7PKbDbbP6LTwyro7rdbAb2uHBph2ca eAIe03cn3G45+2q8LHnEg3+G/MTWic+PDVYW5qwGbf348aNmUbCEnAREN10sD0ThmWe0 jfpEQ0WXeY2LVmWdAChSy+q0tgqECgWsN19Trf6K0mRy470dNjh/If+cOm5efwnZ8463 XgkLkFHgeqiUx6+YgbtficsChwwu2dnlBsh/w2RKvuNJToL3CsYHJC999K7ltGVZI4tG HpiQ== X-Gm-Message-State: AOAM532qbybOGrgFn3+kNqX+DdZXBtRrElQ+VKurIh7GqfA2TCedEoVm YguqnLqjHTSAzi5VmGUUy32lDqQk X-Google-Smtp-Source: ABdhPJx793H5I8xSH8Rd+1t/gMihzuy8ZCSJWeHdwLVHI8oa9yCiCX3BJdosffiKNhpub0A7aR84Wg== X-Received: by 2002:a05:6a00:1486:: with SMTP id v6mr2373077pfu.83.1591246077883; Wed, 03 Jun 2020 21:47:57 -0700 (PDT) Received: from localhost.localdomain ([2409:10:2e40:5100:6e29:95ff:fe2d:8f34]) by smtp.gmail.com with ESMTPSA id p31sm2744394pgb.46.2020.06.03.21.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 21:47:57 -0700 (PDT) From: Sergey Senozhatsky To: Hans Verkuil Cc: linux-media@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v2] v4l2-utils: test cache_hints for MMAP queues Date: Thu, 4 Jun 2020 13:47:52 +0900 Message-Id: <20200604044752.107856-1-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The patch adds V4L2_FLAG_MEMORY_NON_CONSISTENT consistency attr test to VIDIOC_REQBUFS and VIDIOC_CREATE_BUFS ioctl-s, and V4L2_BUF_FLAG_NO_CACHE_INVALIDATE/V4L2_BUF_FLAG_NO_CACHE_CLEAN buffer cache management hints test for MMAP queues. Signed-off-by: Sergey Senozhatsky --- - Fixed dmabuf cache sync/flags assertion (Hans) utils/common/cv4l-helpers.h | 8 +- utils/common/v4l-helpers.h | 10 +- utils/common/v4l2-info.cpp | 1 + utils/v4l2-compliance/v4l2-test-buffers.cpp | 127 +++++++++++++++++++- 4 files changed, 133 insertions(+), 13 deletions(-) diff --git a/utils/common/cv4l-helpers.h b/utils/common/cv4l-helpers.h index 9505e334..9de0cdf0 100644 --- a/utils/common/cv4l-helpers.h +++ b/utils/common/cv4l-helpers.h @@ -753,17 +753,17 @@ public: int g_fd(unsigned index, unsigned plane) const { return v4l_queue_g_fd(this, index, plane); } void s_fd(unsigned index, unsigned plane, int fd) { v4l_queue_s_fd(this, index, plane, fd); } - int reqbufs(cv4l_fd *fd, unsigned count = 0) + int reqbufs(cv4l_fd *fd, unsigned count = 0, unsigned int flags = 0) { - return v4l_queue_reqbufs(fd->g_v4l_fd(), this, count); + return v4l_queue_reqbufs(fd->g_v4l_fd(), this, count, flags); } bool has_create_bufs(cv4l_fd *fd) const { return v4l_queue_has_create_bufs(fd->g_v4l_fd(), this); } - int create_bufs(cv4l_fd *fd, unsigned count, const v4l2_format *fmt = NULL) + int create_bufs(cv4l_fd *fd, unsigned count, const v4l2_format *fmt = NULL, unsigned int flags = 0) { - return v4l_queue_create_bufs(fd->g_v4l_fd(), this, count, fmt); + return v4l_queue_create_bufs(fd->g_v4l_fd(), this, count, fmt, flags); } int mmap_bufs(cv4l_fd *fd, unsigned from = 0) { diff --git a/utils/common/v4l-helpers.h b/utils/common/v4l-helpers.h index b794ff88..53f7bec9 100644 --- a/utils/common/v4l-helpers.h +++ b/utils/common/v4l-helpers.h @@ -1513,7 +1513,7 @@ static inline int v4l_queue_querybufs(struct v4l_fd *f, struct v4l_queue *q, uns } static inline int v4l_queue_reqbufs(struct v4l_fd *f, - struct v4l_queue *q, unsigned count) + struct v4l_queue *q, unsigned count, unsigned int flags = 0) { struct v4l2_requestbuffers reqbufs; int ret; @@ -1521,7 +1521,7 @@ static inline int v4l_queue_reqbufs(struct v4l_fd *f, reqbufs.type = q->type; reqbufs.memory = q->memory; reqbufs.count = count; - memset(reqbufs.reserved, 0, sizeof(reqbufs.reserved)); + reqbufs.flags = flags; /* * Problem: if REQBUFS returns an error, did it free any old * buffers or not? @@ -1545,7 +1545,8 @@ static inline bool v4l_queue_has_create_bufs(struct v4l_fd *f, const struct v4l_ } static inline int v4l_queue_create_bufs(struct v4l_fd *f, - struct v4l_queue *q, unsigned count, const struct v4l2_format *fmt) + struct v4l_queue *q, unsigned count, + const struct v4l2_format *fmt, unsigned int flags = 0) { struct v4l2_create_buffers createbufs; int ret; @@ -1553,6 +1554,7 @@ static inline int v4l_queue_create_bufs(struct v4l_fd *f, createbufs.format.type = q->type; createbufs.memory = q->memory; createbufs.count = count; + createbufs.flags = flags; if (fmt) { createbufs.format = *fmt; } else { @@ -1731,7 +1733,7 @@ static inline void v4l_queue_free(struct v4l_fd *f, struct v4l_queue *q) v4l_ioctl(f, VIDIOC_STREAMOFF, &q->type); v4l_queue_release_bufs(f, q, 0); v4l_queue_close_exported_fds(q); - v4l_queue_reqbufs(f, q, 0); + v4l_queue_reqbufs(f, q, 0, 0); } static inline void v4l_queue_buffer_update(const struct v4l_queue *q, diff --git a/utils/common/v4l2-info.cpp b/utils/common/v4l2-info.cpp index 0aac8504..a69569a6 100644 --- a/utils/common/v4l2-info.cpp +++ b/utils/common/v4l2-info.cpp @@ -206,6 +206,7 @@ static const flag_def bufcap_def[] = { { V4L2_BUF_CAP_SUPPORTS_REQUESTS, "requests" }, { V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS, "orphaned-bufs" }, { V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF, "m2m-hold-capture-buf" }, + { V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS, "mmap-cache-hints" }, { 0, NULL } }; diff --git a/utils/v4l2-compliance/v4l2-test-buffers.cpp b/utils/v4l2-compliance/v4l2-test-buffers.cpp index fc49fff6..b6419d27 100644 --- a/utils/v4l2-compliance/v4l2-test-buffers.cpp +++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp @@ -381,8 +381,6 @@ int buffer::check(unsigned type, unsigned memory, unsigned index, if (g_flags() & V4L2_BUF_FLAG_BFRAME) frame_types++; fail_on_test(frame_types > 1); - fail_on_test(g_flags() & (V4L2_BUF_FLAG_NO_CACHE_INVALIDATE | - V4L2_BUF_FLAG_NO_CACHE_CLEAN)); if (g_flags() & V4L2_BUF_FLAG_QUEUED) buf_states++; if (g_flags() & V4L2_BUF_FLAG_DONE) @@ -534,6 +532,88 @@ static int testCanSetSameTimings(struct node *node) return 0; } +static int setupMmap(struct node *node, cv4l_queue &q); + +static int testCacheHints(struct node *node, int m) +{ + struct v4l2_create_buffers crbufs = { }; + struct v4l2_requestbuffers reqbufs = { }; + bool cache_hints_cap = false; + bool consistent; + cv4l_queue q; + cv4l_fmt fmt; + int ret; + + q.init(node->g_type(), m); + ret = q.reqbufs(node); + if (ret) + return ret; + + cache_hints_cap = q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS; + + reqbufs.count = 2; + reqbufs.type = q.g_type(); + reqbufs.memory = q.g_memory(); + reqbufs.flags = V4L2_FLAG_MEMORY_NON_CONSISTENT; + fail_on_test(doioctl(node, VIDIOC_REQBUFS, &reqbufs)); + consistent = reqbufs.flags & V4L2_FLAG_MEMORY_NON_CONSISTENT; + if (!cache_hints_cap) { + fail_on_test(consistent); + } else { + if (m == V4L2_MEMORY_MMAP) + fail_on_test(!consistent); + else + fail_on_test(consistent); + } + + q.reqbufs(node); + + node->g_fmt(crbufs.format, q.g_type()); + crbufs.count = 2; + crbufs.memory = q.g_memory(); + crbufs.flags = V4L2_FLAG_MEMORY_NON_CONSISTENT; + fail_on_test(doioctl(node, VIDIOC_CREATE_BUFS, &crbufs)); + consistent = crbufs.flags & V4L2_FLAG_MEMORY_NON_CONSISTENT; + if (!cache_hints_cap) { + fail_on_test(consistent); + } else { + if (m == V4L2_MEMORY_MMAP) + fail_on_test(!consistent); + else + fail_on_test(consistent); + } + + if (cache_hints_cap) { + crbufs.count = 2; + crbufs.memory = q.g_memory(); + /* + * Different memory consistency model. Should fail for MMAP + * queues which support cache hints. + */ + crbufs.flags = 0; + if (m == V4L2_MEMORY_MMAP) + fail_on_test(doioctl(node, VIDIOC_CREATE_BUFS, &crbufs) != EINVAL); + else + fail_on_test(doioctl(node, VIDIOC_CREATE_BUFS, &crbufs)); + } + q.reqbufs(node); + + /* For the time being only MMAP is tested */ + if (m != V4L2_MEMORY_MMAP) + return 0; + + node->g_fmt(fmt, q.g_type()); + q.create_bufs(node, 2, &fmt, 0); + fail_on_test(setupMmap(node, q)); + + q.reqbufs(node); + q.create_bufs(node, 2, &fmt, V4L2_FLAG_MEMORY_NON_CONSISTENT); + fail_on_test(setupMmap(node, q)); + + q.reqbufs(node, 1); + return ret; +} + int testReqBufs(struct node *node) { struct v4l2_create_buffers crbufs = { }; @@ -676,8 +756,8 @@ int testReqBufs(struct node *node) reqbufs.count = 0; reqbufs.type = i; reqbufs.memory = m; + reqbufs.flags = 0; fail_on_test(doioctl(node, VIDIOC_REQBUFS, &reqbufs)); - fail_on_test(check_0(reqbufs.reserved, sizeof(reqbufs.reserved))); q.reqbufs(node); ret = q.create_bufs(node, 1); @@ -698,6 +778,7 @@ int testReqBufs(struct node *node) node->g_fmt(crbufs.format, i); crbufs.count = 0; crbufs.memory = m; + crbufs.flags = 0; fail_on_test(doioctl(node, VIDIOC_CREATE_BUFS, &crbufs)); fail_on_test(check_0(crbufs.reserved, sizeof(crbufs.reserved))); fail_on_test(crbufs.index != q.g_buffers()); @@ -721,6 +802,8 @@ int testReqBufs(struct node *node) fmt.s_sizeimage(fmt.g_sizeimage(p) * 2, p); fail_on_test(q.create_bufs(node, 1, &fmt)); } + + printf("\ttest V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS: %s\n", ok(testCacheHints(node, m))); } fail_on_test(q.reqbufs(node)); } @@ -1176,14 +1259,22 @@ static int bufferOutputErrorTest(struct node *node, const buffer &orig_buf) static int setupMmap(struct node *node, cv4l_queue &q) { + bool cache_hints = q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS; + fail_on_test(q.mmap_bufs(node)); for (unsigned i = 0; i < q.g_buffers(); i++) { buffer buf(q); + unsigned int flags; int ret; fail_on_test(buf.querybuf(node, i)); fail_on_test(buf.check(q, Unqueued, i)); + flags = buf.g_flags(); + flags |= V4L2_BUF_FLAG_NO_CACHE_INVALIDATE; + flags |= V4L2_BUF_FLAG_NO_CACHE_CLEAN; + buf.s_flags(flags); + for (unsigned p = 0; p < buf.g_num_planes(); p++) { // Try a random offset fail_on_test(node->mmap(buf.g_length(p), @@ -1220,6 +1311,14 @@ static int setupMmap(struct node *node, cv4l_queue &q) buf.s_index(buf.g_index() - VIDEO_MAX_FRAME); fail_on_test(buf.g_index() != i); } + flags = buf.g_flags(); + if (cache_hints) { + fail_on_test(!(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE)); + fail_on_test(!(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN)); + } else { + fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE); + fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN); + } fail_on_test(buf.querybuf(node, i)); fail_on_test(buf.check(q, Queued, i)); fail_on_test(!buf.dqbuf(node)); @@ -1475,11 +1574,17 @@ static int setupUserPtr(struct node *node, cv4l_queue &q) { for (unsigned i = 0; i < q.g_buffers(); i++) { buffer buf(q); + unsigned int flags; int ret; fail_on_test(buf.querybuf(node, i)); fail_on_test(buf.check(q, Unqueued, i)); + flags = buf.g_flags(); + flags |= V4L2_BUF_FLAG_NO_CACHE_INVALIDATE; + flags |= V4L2_BUF_FLAG_NO_CACHE_CLEAN; + buf.s_flags(flags); + for (unsigned p = 0; p < buf.g_num_planes(); p++) { // This should not work! fail_on_test(node->mmap(buf.g_length(p), 0) != MAP_FAILED); @@ -1537,7 +1642,10 @@ static int setupUserPtr(struct node *node, cv4l_queue &q) if (v4l_type_is_output(q.g_type())) fail_on_test(!buf.g_bytesused(p)); } - fail_on_test(buf.g_flags() & V4L2_BUF_FLAG_DONE); + flags = buf.g_flags(); + fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE); + fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN); + fail_on_test(flags & V4L2_BUF_FLAG_DONE); fail_on_test(buf.querybuf(node, i)); fail_on_test(buf.check(q, Queued, i)); } @@ -1732,12 +1840,17 @@ static int setupDmaBuf(struct node *expbuf_node, struct node *node, fail_on_test(q.mmap_bufs(node)); for (unsigned i = 0; i < q.g_buffers(); i++) { buffer buf(q); + unsigned int flags; int ret; buf.init(q, i); fail_on_test(buf.querybuf(node, i)); for (unsigned p = 0; p < buf.g_num_planes(); p++) buf.s_fd(q.g_fd(i, p), p); + flags = buf.g_flags(); + flags |= V4L2_BUF_FLAG_NO_CACHE_INVALIDATE; + flags |= V4L2_BUF_FLAG_NO_CACHE_CLEAN; + buf.s_flags(flags); ret = buf.prepare_buf(node, q); if (ret != ENOTTY) { fail_on_test(ret); @@ -1757,7 +1870,11 @@ static int setupDmaBuf(struct node *expbuf_node, struct node *node, if (v4l_type_is_output(q.g_type())) fail_on_test(!buf.g_bytesused(p)); } - fail_on_test(buf.g_flags() & V4L2_BUF_FLAG_DONE); + flags = buf.g_flags(); + /* We always skip cache sync/flush for DMABUF memory type */ + fail_on_test(!(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE)); + fail_on_test(!(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN)); + fail_on_test(flags & V4L2_BUF_FLAG_DONE); fail_on_test(buf.querybuf(node, i)); fail_on_test(buf.check(q, Queued, i)); }