From patchwork Tue Mar 2 00:49:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 12111999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D1E8C433E9 for ; Tue, 2 Mar 2021 17:32:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF98A64F23 for ; Tue, 2 Mar 2021 17:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580148AbhCBRaL (ORCPT ); Tue, 2 Mar 2021 12:30:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378025AbhCBAuI (ORCPT ); Mon, 1 Mar 2021 19:50:08 -0500 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73721C061756 for ; Mon, 1 Mar 2021 16:49:28 -0800 (PST) Received: by mail-pg1-x531.google.com with SMTP id g4so12759787pgj.0 for ; Mon, 01 Mar 2021 16:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=muqxZfcDQiiUg5ZPKg0Ezp+w/e0QAiVsgc1LytNSRdk=; b=QChrouQVA6ya0+EX2yuCQGAX2Yjq+RaPpBLZW9UZlub8RV/ITRPRJgxyO3ScMKrJw6 w9KoWFwJxHfHHPU3kyEx3Y0H5PImKpxhJSH5rukwcoxt+a85Ks6M0YyhIRO1q3kiZCtz V8COI+COCCog2xxhBbD/lsVVEQsy5VMSsFt0Q= 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:mime-version:content-transfer-encoding; bh=muqxZfcDQiiUg5ZPKg0Ezp+w/e0QAiVsgc1LytNSRdk=; b=IVV3GYTi8yjGqpP4weikc0kUtkfCU0w4z46fNuCTxbMwaAzCB63IwddHmo7AoFRZ8E mBBjbKy0XgKRD7T8xlOZO43B/RzHSp7RwzXL+7kOeXHVyzpE3qlsxZFxEmv//+BC96VV IfRA1XGCabQ/sBgi6IVzHKlwrbeP43oeuVmKcBs+aBQZsgvxD0ndO+9PWe17ec2b3QJ+ ADOzD9MVNsRuh+qDUEdz9WxehHlkUQaXIXw/H9r4H0KB7y7ds1Ou3zx6MeQho667ALc+ USnMB+I6Za5bI9ofxLTIjxzMfmNU10WtaZj9cpugeK/0FPCffAcvuGwgisENdm1adYhv MeYw== X-Gm-Message-State: AOAM532G72S98JKGejeN1E8wTnaNm5ykMRTROMOPY5O9Rxcjkkf7CLhp 7UW3gt+B5A1J65HBx71GJNjSRw== X-Google-Smtp-Source: ABdhPJx9voOFjP/+lhp6qXXgNKpt2KA4xlsMPdBNMSEG0/QicK5N1Pq8z3ol4jP70uhJTwQyxOa95g== X-Received: by 2002:a63:574c:: with SMTP id h12mr16067517pgm.79.1614646167946; Mon, 01 Mar 2021 16:49:27 -0800 (PST) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:d5d7:1a61:2cdf:273c]) by smtp.gmail.com with ESMTPSA id q34sm17978743pgl.92.2021.03.01.16.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 16:49:27 -0800 (PST) From: Sergey Senozhatsky To: Hans Verkuil Cc: Tomasz Figa , Christoph Hellwig , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH] v4l-compliance: re-introduce NON_COHERENT and cache hints tests Date: Tue, 2 Mar 2021 09:49:22 +0900 Message-Id: <20210302004922.32052-1-senozhatsky@chromium.org> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210302004624.31294-1-senozhatsky@chromium.org> References: <20210302004624.31294-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This returns back non-coherent (previously known as NON_COHERENT) memory flag and buffer cache management hints testing (for VB2_MEMORY_MMAP buffers). Signed-off-by: Sergey Senozhatsky --- utils/common/cv4l-helpers.h | 8 +-- utils/common/v4l-helpers.h | 8 ++- utils/v4l2-compliance/v4l2-test-buffers.cpp | 65 ++++++++++++++++++--- 3 files changed, 66 insertions(+), 15 deletions(-) diff --git a/utils/common/cv4l-helpers.h b/utils/common/cv4l-helpers.h index 712efde6..3cee372b 100644 --- a/utils/common/cv4l-helpers.h +++ b/utils/common/cv4l-helpers.h @@ -754,17 +754,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 f96b3c38..c09cd987 100644 --- a/utils/common/v4l-helpers.h +++ b/utils/common/v4l-helpers.h @@ -1515,7 +1515,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; @@ -1523,6 +1523,7 @@ static inline int v4l_queue_reqbufs(struct v4l_fd *f, reqbufs.type = q->type; reqbufs.memory = q->memory; reqbufs.count = count; + reqbufs.flags = flags; /* * Problem: if REQBUFS returns an error, did it free any old * buffers or not? @@ -1547,7 +1548,7 @@ 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) + const struct v4l2_format *fmt, unsigned int flags = 0) { struct v4l2_create_buffers createbufs; int ret; @@ -1555,6 +1556,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 { @@ -1733,7 +1735,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/v4l2-compliance/v4l2-test-buffers.cpp b/utils/v4l2-compliance/v4l2-test-buffers.cpp index e40461bd..6555c0cb 100644 --- a/utils/v4l2-compliance/v4l2-test-buffers.cpp +++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp @@ -663,6 +663,10 @@ int testReqBufs(struct node *node) fail_on_test(q.reqbufs(node, 0)); for (m = V4L2_MEMORY_MMAP; m <= V4L2_MEMORY_DMABUF; m++) { + bool cache_hints_cap = false; + bool consistent; + + cache_hints_cap = q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS; if (!(node->valid_memorytype & (1 << m))) continue; cv4l_queue q2(i, m); @@ -678,8 +682,17 @@ int testReqBufs(struct node *node) reqbufs.count = 1; reqbufs.type = i; reqbufs.memory = m; + reqbufs.flags = V4L2_FLAG_MEMORY_NON_COHERENT; fail_on_test(doioctl(node, VIDIOC_REQBUFS, &reqbufs)); - fail_on_test(check_0(reqbufs.reserved, sizeof(reqbufs.reserved))); + consistent = reqbufs.flags & V4L2_FLAG_MEMORY_NON_COHERENT; + 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); ret = q.create_bufs(node, 0); @@ -692,9 +705,32 @@ int testReqBufs(struct node *node) node->g_fmt(crbufs.format, i); crbufs.count = 1; crbufs.memory = m; + crbufs.flags = V4L2_FLAG_MEMORY_NON_COHERENT; 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()); + + consistent = crbufs.flags & V4L2_FLAG_MEMORY_NON_COHERENT; + 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) { + /* + * 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); fail_on_test(q.create_bufs(node, 1)); @@ -1207,10 +1243,16 @@ static int setupMmap(struct node *node, cv4l_queue &q) 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); + /* + * Do not set cache hints for all the buffers, but only on + * some of them, so that we can test more cases. + */ + if (i == 0) { + 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 @@ -1250,8 +1292,15 @@ static int setupMmap(struct node *node, cv4l_queue &q) } 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)); + if (i == 0) { + /* We do expect cache hints on this buffer */ + fail_on_test(!(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE)); + fail_on_test(!(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN)); + } else { + /* We expect no cache hints on this buffer */ + fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE); + fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN); + } } else if (node->might_support_cache_hints) { fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_INVALIDATE); fail_on_test(flags & V4L2_BUF_FLAG_NO_CACHE_CLEAN); @@ -1341,7 +1390,7 @@ int testMmap(struct node *node, struct node *node_m2m_cap, unsigned frame_count, have_createbufs = false; if (have_createbufs) { q.reqbufs(node); - q.create_bufs(node, 2, &cur_fmt); + q.create_bufs(node, 2, &cur_fmt, V4L2_FLAG_MEMORY_NON_COHERENT); fail_on_test(setupMmap(node, q)); q.munmap_bufs(node); q.reqbufs(node, 2);