From patchwork Wed Aug 18 09:02:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13386 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 3BA7CBD87C for ; Wed, 18 Aug 2021 09:03:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 043F568895; Wed, 18 Aug 2021 11:03:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rahCF9za"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 35A476025E for ; Wed, 18 Aug 2021 11:03:04 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.238.109.15]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 92B79466; Wed, 18 Aug 2021 11:03:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1629277384; bh=oWqdDxtU4DI2eibi/7jjv5OTD/WVHyEs3wLemlBI17g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rahCF9za5Nqh034WquDdTo/LkwEG/Dro0E8VyFenoMKKCp1dfBbLyh3mVsxIiCzpm LWaGjeRic189Q9CXPpRZa1nsgzFT21cgQ3LWfUpoFGSfb5IInTvIb/liDjcr+CLtMK HrSjWaTBNSp36avNAbvWvPP9vCHR7DuJiBJAnxe4= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Wed, 18 Aug 2021 14:32:46 +0530 Message-Id: <20210818090247.33838-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210818090247.33838-1-umang.jain@ideasonboard.com> References: <20210818090247.33838-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/2] libtest: camera_test: Plumb constructor to set LIBCAMERA_IPA_FORCE_ISOLATION X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Some tests might require to have LIBCAMERA_IPA_FORCE_ISOLATION set to ensure they can test the IPA running in isolated mode. These tests are likely to leverage CameraTest. The environment variable should be set before CameraManager::start() call which happens in CameraTest's constructor. Hence, plumb the constructor with a flag so that the LIBCAMERA_IPA_FORCE_ISOLATION can be set before CameraManager::start(). Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart --- test/libtest/camera_test.cpp | 5 ++++- test/libtest/camera_test.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/libtest/camera_test.cpp b/test/libtest/camera_test.cpp index 2ae4d677..fe13d6ac 100644 --- a/test/libtest/camera_test.cpp +++ b/test/libtest/camera_test.cpp @@ -13,10 +13,13 @@ using namespace libcamera; using namespace std; -CameraTest::CameraTest(const char *name) +CameraTest::CameraTest(const char *name, bool isolate) { cm_ = new CameraManager(); + if (isolate) + setenv("LIBCAMERA_IPA_FORCE_ISOLATION", "1", 1); + if (cm_->start()) { cerr << "Failed to start camera manager" << endl; status_ = TestFail; diff --git a/test/libtest/camera_test.h b/test/libtest/camera_test.h index 7939798f..f56e343e 100644 --- a/test/libtest/camera_test.h +++ b/test/libtest/camera_test.h @@ -17,7 +17,7 @@ using namespace libcamera; class CameraTest { public: - CameraTest(const char *name); + CameraTest(const char *name, bool isolate = false); ~CameraTest(); protected: From patchwork Wed Aug 18 09:02:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13387 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 88D09BD87C for ; Wed, 18 Aug 2021 09:03:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 54118688A5; Wed, 18 Aug 2021 11:03:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="HpHzpEBX"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C224568893 for ; Wed, 18 Aug 2021 11:03:07 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.238.109.15]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 071CF466; Wed, 18 Aug 2021 11:03:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1629277386; bh=ack2zCUJm6QTm6zDqN8qGID6cBkZ7RFfVhLVeyfB6G8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpHzpEBXsu6zi/QJEgrYWjlCPlTlAGnzfkXyJC1ZfsEPsWcPbZ3WwX104oR6M5LRS IlqcW0Hl3LDjUbZV19QvfkJofV5lJ4CzH/4lyngPj/snA2OkhdCsS/jqWIkice/mt1 M/zY4auYl16yqSB/HYuGQQ7s0CuXDfYieaYOuWec= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Wed, 18 Aug 2021 14:32:47 +0530 Message-Id: <20210818090247.33838-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210818090247.33838-1-umang.jain@ideasonboard.com> References: <20210818090247.33838-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/2] test: camera: Camera reconfiguration and fd-leak test X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This tests basically checks for two things: - Camera reconfigurations without stopping CameraManager - Fd leaks across IPA IPC boundary [1] Currently, it uses vimc, but can be easily changed to using another platform (for e.g. IPU3) by changing kCamId_ and kIpaProxyName_. The test performs kNumOfReconfigures_ (currently set to 10) reconfigurations of the camera. Each reconfiguration runs start(), capture(100ms), stop() of the camera. Hence, the test runs approximately for 1 second. For checking the fd leaks, the test monitors the /proc/$PROXY_PID/fd directory for open fds. It compares the number of open fds after each run to the number of open fds before the first run. If those two are found to be mis-matched, the test shall report failure. Since, the test needs to test the IPA IPC code paths, it is meant to always run with LIBCAMERA_IPA_FORCE_ISOLATION=1 environment variable. [1] https://bugs.libcamera.org/show_bug.cgi?id=63 Signed-off-by: Umang Jain Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- test/camera/camera_reconfigure.cpp | 255 +++++++++++++++++++++++++++++ test/camera/meson.build | 1 + 2 files changed, 256 insertions(+) create mode 100644 test/camera/camera_reconfigure.cpp diff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp new file mode 100644 index 00000000..90f798fe --- /dev/null +++ b/test/camera/camera_reconfigure.cpp @@ -0,0 +1,255 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2021, Google Inc. + * + * Test: + * - Camera's multiple reconfigurations without stopping CameraManager + * - leaking fds across IPA IPC boundary + */ + +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "camera_test.h" +#include "test.h" + +using namespace std; + +namespace { + +class CameraReconfigure : public CameraTest, public Test +{ +public: + CameraReconfigure() + : CameraTest(kCamId_, true) + { + } + +private: + static constexpr const char *kCamId_ = "platform/vimc.0 Sensor B"; + static constexpr const char *kIpaProxyName_ = "vimc_ipa_proxy"; + static constexpr unsigned int kNumOfReconfigures_ = 10; + + void requestComplete(Request *request) + { + if (request->status() != Request::RequestComplete) + return; + + const Request::BufferMap &buffers = request->buffers(); + + /* Create a new request. */ + const Stream *stream = buffers.begin()->first; + FrameBuffer *buffer = buffers.begin()->second; + + request->reuse(); + request->addBuffer(stream, buffer); + camera_->queueRequest(request); + } + + int startAndStop() + { + StreamConfiguration &cfg = config_->at(0); + + if (camera_->acquire()) { + cerr << "Failed to acquire the camera" << endl; + return TestFail; + } + + if (camera_->configure(config_.get())) { + cerr << "Failed to set default configuration" << endl; + return TestFail; + } + + Stream *stream = cfg.stream(); + + if (!allocated_) { + int ret = allocator_->allocate(stream); + if (ret < 0) + return TestFail; + allocated_ = true; + } + + for (const unique_ptr &buffer : allocator_->buffers(stream)) { + unique_ptr request = camera_->createRequest(); + if (!request) { + cerr << "Failed to create request" << endl; + return TestFail; + } + + if (request->addBuffer(stream, buffer.get())) { + cerr << "Failed to associating buffer with request" << endl; + return TestFail; + } + + requests_.push_back(move(request)); + } + + camera_->requestCompleted.connect(this, &CameraReconfigure::requestComplete); + + if (camera_->start()) { + cerr << "Failed to start camera" << endl; + return TestFail; + } + + for (unique_ptr &request : requests_) { + if (camera_->queueRequest(request.get())) { + cerr << "Failed to queue request" << endl; + return TestFail; + } + } + + EventDispatcher *dispatcher = Thread::current()->eventDispatcher(); + + Timer timer; + timer.start(100); + while (timer.isRunning()) + dispatcher->processEvents(); + + if (camera_->stop()) { + cerr << "Failed to stop camera" << endl; + return TestFail; + } + + if (camera_->release()) { + cerr << "Failed to release camera" << endl; + return TestFail; + } + + camera_->requestCompleted.disconnect(this, &CameraReconfigure::requestComplete); + + requests_.clear(); + + return 0; + } + + int fdsOpen(pid_t pid) + { + string proxyFdPath = "/proc/" + to_string(pid) + "/fd"; + DIR *dir; + struct dirent *ptr; + unsigned int openFds = 0; + + dir = opendir(proxyFdPath.c_str()); + if (dir == nullptr) { + int err = errno; + cerr << "Error opening " << proxyFdPath << ": " + << strerror(-err) << endl; + return 0; + } + + while ((ptr = readdir(dir)) != nullptr) { + if ((strcmp(ptr->d_name, ".") == 0) || + (strcmp(ptr->d_name, "..") == 0)) + continue; + + openFds++; + } + closedir(dir); + + return openFds; + } + + pid_t findProxyPid() + { + string proxyPid; + string proxyName(kIpaProxyName_); + DIR *dir; + struct dirent *ptr; + + dir = opendir("/proc"); + while ((ptr = readdir(dir)) != nullptr) { + if (ptr->d_type != DT_DIR) + continue; + + string pname("/proc/" + string(ptr->d_name) + "/comm"); + if (File::exists(pname.c_str())) { + ifstream pfile(pname.c_str()); + string comm; + getline(pfile, comm); + pfile.close(); + + proxyPid = comm == proxyName ? string(ptr->d_name) : ""; + } + + if (!proxyPid.empty()) + break; + } + closedir(dir); + + if (!proxyPid.empty()) + return atoi(proxyPid.c_str()); + + return -1; + } + + int init() override + { + if (status_ != TestPass) + return status_; + + config_ = camera_->generateConfiguration({ StreamRole::StillCapture }); + if (!config_ || config_->size() != 1) { + cerr << "Failed to generate default configuration" << endl; + return TestFail; + } + + allocator_ = make_unique(camera_); + allocated_ = false; + + return TestPass; + } + + int run() override + { + unsigned int openFdsAtStart = 0; + unsigned int openFds = 0; + + pid_t proxyPid = findProxyPid(); + if (proxyPid < 0) { + cerr << "Cannot find " << kIpaProxyName_ + << " pid, exiting" << endl; + return TestFail; + } + + openFdsAtStart = fdsOpen(proxyPid); + for (unsigned int i = 0; i < kNumOfReconfigures_; i++) { + startAndStop(); + openFds = fdsOpen(proxyPid); + if (openFds == 0) { + cerr << "No open fds found whereas " + << "open fds at start: " << openFdsAtStart + << endl; + return TestFail; + } + + if (openFds != openFdsAtStart) { + cerr << "Leaking fds for " << kIpaProxyName_ + << " - Open fds: " << openFds << " vs " + << "Open fds at start: " << openFdsAtStart + << endl; + return TestFail; + } + } + + return TestPass; + } + + bool allocated_; + + vector> requests_; + + unique_ptr config_; + unique_ptr allocator_; +}; + +} /* namespace */ + +TEST_REGISTER(CameraReconfigure) diff --git a/test/camera/meson.build b/test/camera/meson.build index 002a87b5..668d5c03 100644 --- a/test/camera/meson.build +++ b/test/camera/meson.build @@ -8,6 +8,7 @@ camera_tests = [ ['buffer_import', 'buffer_import.cpp'], ['statemachine', 'statemachine.cpp'], ['capture', 'capture.cpp'], + ['camera_reconfigure', 'camera_reconfigure.cpp'], ] foreach t : camera_tests