From patchwork Fri Nov 6 10:36:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 10357 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 7D470BDB89 for ; Fri, 6 Nov 2020 10:37:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 45FE162D25; Fri, 6 Nov 2020 11:37:44 +0100 (CET) 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="Z/8qL08E"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A4A2662D2C for ; Fri, 6 Nov 2020 11:37:42 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DE571B16; Fri, 6 Nov 2020 11:37:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604659062; bh=UDU2ZwB2e8BWvwrqAlLiX9mIs4+kL8J0eZ95I0SNQ6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z/8qL08EzBSrkPqy2uILTkUzx0a/LhgnriJTzEWyATNAertGT4o7Q5PXPwPCG/jXR WSxgjNI5QT1PRQRpRGG9dWLsLlMpIILN1OZsTIvSqa7Ap8xXbLGBFQQmcj/BFWmPs9 t0wsMUMbWSNjLLouHlD/6Vol3Vry9ENU2egHtcjs= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 6 Nov 2020 19:36:39 +0900 Message-Id: <20201106103707.49660-10-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201106103707.49660-1-paul.elder@ideasonboard.com> References: <20201106103707.49660-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 09/37] libcamera: Add IPAIPC 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" Create a virtual IPAIPC class that models an IPC/RPC system. IPA proxies and proxy workers will call into the IPAIPC, rather than implementing the IPC themselves. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- Change in v4: - change snake_case to camelCase - remove ipaModulePath and ipaProxyWorkerPath from parameters in the IPAIPC base contructor - include signal.h Changes in v3: - expand documentation a bit - move [[maybe_unused]] to after the parameters in the IPAIPC constructor, to appease gcc <= 9.1 Changes in v2: - add documentation --- include/libcamera/internal/ipa_ipc.h | 42 ++++++++++ src/libcamera/ipa_ipc.cpp | 110 +++++++++++++++++++++++++++ src/libcamera/meson.build | 1 + 3 files changed, 153 insertions(+) create mode 100644 include/libcamera/internal/ipa_ipc.h create mode 100644 src/libcamera/ipa_ipc.cpp diff --git a/include/libcamera/internal/ipa_ipc.h b/include/libcamera/internal/ipa_ipc.h new file mode 100644 index 00000000..f83a90a3 --- /dev/null +++ b/include/libcamera/internal/ipa_ipc.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2020, Google Inc. + * + * ipa_ipc.h - Image Processing Algorithm IPC module for IPA proxies + */ +#ifndef __LIBCAMERA_INTERNAL_IPA_IPC_H__ +#define __LIBCAMERA_INTERNAL_IPA_IPC_H__ + +#include + +#include + +namespace libcamera { + +class IPAIPC +{ +public: + IPAIPC(); + virtual ~IPAIPC(); + + bool isValid() const { return valid_; } + + virtual int sendSync(uint32_t cmd, + const std::vector &dataIn, + const std::vector &fdsIn, + std::vector *dataOut = nullptr, + std::vector *fdsOut = nullptr) = 0; + + virtual int sendAsync(uint32_t cmd, + const std::vector &dataIn, + const std::vector &fdsIn) = 0; + + Signal &, std::vector &> recvIPC; + +protected: + bool valid_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_INTERNAL_IPA_IPC_H__ */ diff --git a/src/libcamera/ipa_ipc.cpp b/src/libcamera/ipa_ipc.cpp new file mode 100644 index 00000000..964d4ac1 --- /dev/null +++ b/src/libcamera/ipa_ipc.cpp @@ -0,0 +1,110 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2020, Google Inc. + * + * ipa_ipc.cpp - Image Processing Algorithm IPC module for IPA proxies + */ + +#include + +#include "libcamera/internal/ipc_unixsocket.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/process.h" +#include "libcamera/internal/thread.h" + +#include +#include + +#include "libcamera/internal/ipa_ipc.h" + +/** + * \file ipa_ipc.h + * \brief IPC mechanism for IPA isolation + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(IPAIPC) + +/** + * \class IPAIPC + * \brief IPC mechanism for IPA isolation + * + * Virtual class to model an IPC mechanism for use by IPA proxies for IPA + * isolation. sendSync() and sendAsync() must be implemented, and the recvIPC + * signal must be emitted whenever new data is available. + */ + +/** + * \brief Construct an IPAIPC instance + */ +IPAIPC::IPAIPC() : valid_(false) +{ +} + +IPAIPC::~IPAIPC() +{ +} + +/** + * \fn IPAIPC::isValid() + * \brief Check if the IPAIPC instance is valid + * + * An IPAIPC instance is valid if the IPA interface is successfully created in + * isolation, and IPC is successfully set up. + * + * \return True if the IPAIPC is valid, false otherwise + */ + +/** + * \fn IPAIPC::sendSync() + * \brief Send a message over IPC synchronously + * \param[in] cmd Command ID + * \param[in] dataIn Data to send, as a byte vector + * \param[in] fdsIn Fds to send, in a vector + * \param[in] dataOut Byte vector in which to receive data, if applicable + * \param[in] fdsOut Fds vector in which to receive fds, if applicable + * + * This function will not return until a response is received. The event loop + * will still continue to execute, however. + * + * \return Zero on success, negative error code otherwise + */ + +/** + * \fn IPAIPC::sendAsync() + * \brief Send a message over IPC asynchronously + * \param[in] cmd Command ID + * \param[in] dataIn Data to send, as a byte vector + * \param[in] fdsIn Fds to send, in a vector + * + * This function will return immediately after sending the message. + * + * \return Zero on success, negative error code otherwise + */ + +/** + * \var IPAIPC::recvIPC + * \brief Signal to be emitted when data is received over IPC + * + * When data is received over IPC, this signal shall be emitted. Users must + * connect to this to receive new data. + * + * The parameters of the signal are a vector of bytes and a vector of file + * descriptors. + */ + +/** + * \var IPAIPC::valid_ + * \brief Flag to indicate if the IPAIPC instance is valid + * + * An IPAIPC instance is valid if the IPA interface is successfully created in + * isolation, and IPC is successfully set up. + * + * This flag can be read via IPAIPC::isValid(). + * + * Implementations of the IPAIPC class should set this flag upon successful + * construction. + */ + +} /* namespace libcamera */ diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 01bcffd4..85f3a202 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -25,6 +25,7 @@ libcamera_sources = files([ 'ipa_context_wrapper.cpp', 'ipa_controls.cpp', 'ipa_data_serializer.cpp', + 'ipa_ipc.cpp', 'ipa_interface.cpp', 'ipa_manager.cpp', 'ipa_module.cpp',