Remove everything related to the C API, including ipa_context, ipa_context_wrapper, and IPAInterfaceWrapper. Also remove relevant documentation. ipaCreate() provided by IPA implementations, and createInterface() provided by IPAModule (wrapper around IPA implementation) both now return a C++ object IPAInterface instead of struct ipa_context. Although IPAInterfaceWrapper is the only component of libipa, the skeleton and build files for libipa are retained. After converting the C API to the C++-only API, make all pipeline handlers and IPAs use the new API. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- This is a combination of 21 commits: --- libcamera: IPAModule: Replace ipa_context with IPAInterface With the new IPC infrastructure, we no longer need the C interface as provided by struct ipa_context. Make ipaCreate_() and createInterface() return IPAInterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: ipa_context_wrapper: Remove ipa_context_wrapper Since ipa_context has been replaced with custom IPAInterfaces, it is not longer needed. Remove it. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAInterface: remove ipa_context and functions from documentation Remove all the documentation related to ipa_context and the C IPA API, as well as the documentation about the functions in the IPAInterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> --- libcamera: IPAInterface: Remove all functions from IPAInterface Now that all the functions in the IPA interface are defined in the data definition file and a specialized IPAInterface is generated per pipeline handler, remove all the functions from the base IPAInterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAInterface: make ipaCreate return IPAInterface With the new IPC infrastructure, we no longer need the C interface as provided by struct ipa_context. Make ipaCreate return IPAinterface. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> --- ipa: remove IPAInterfaceWrapper As every pipeline has its own proxy, IPAInterfaceWrapper is no longer necessary. Remove it. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Acked-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> --- libcamera: IPAProxy: Remove stop() override Since stop() is part of the IPA interface, and the IPA interface is now generated based on the data definition file per pipeline, this no longer needs to be overrided by the base IPAProxy. Remove it. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAProxy, IPAManager: Switch to one-proxy-per-pipeline scheme IPAProxy is changed in two major ways: - Every pipeline has its own proxy, to support each pipeline's IPA interface - IPAProxy implementations always encapsulate IPA modules, and switch internally for isolation or threaded The IPAProxy registration mechanism is removed, as each pipeline will have its own proxy, so the pipeline can pass the specialized class name of the IPAProxy to the IPAManager for construction. IPAManager is changed accordingly to support these changes: - createIPA is a template function that takes an IPAProxy class, and always returns an IPAProxy - IPAManager no longer decides on isolation, and simply creates an IPAProxy instance while passing the isolation flag Consequently, the old IPAProxy classes (IPAProxyThread and IPAProxyLinux) are removed. The IPAInterfaceTest is updated to use the new IPAManager interface, and to construct a ProcessManager as no single global instance is created anymore. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> --- libcamera: IPAProxy: Add isolate parameter to create() Since IPAProxy implementations now always encapsulate IPA modules, add a parameter to create() to signal if the proxy should isolate the IPA or not. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAManager: Fetch IPAProxy corresponding to pipeline Now that each pipeline handler has its own IPAProxy implementation, make the IPAManager fetch the IPAProxy based on the pipeline handler name. Also, since the IPAProxy is used regardless of isolation or no isolation, remove the isolation check from the proxy selection. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> --- libcamera: IPAManager: add isolation flag to proxy creation When the IPA proxy is created, it needs to know whether to isolate or not. Feed the flag at creation of the IPA proxy. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAManager: Make createIPA return proxy directly Since every pipeline knows the type of the proxy that it needs, and since all IPAs are to be wrapped in a proxy, IPAManager no longer needs to search in the factory list to fetch the proxy factory to construct a factory. Instead, we define createIPA as a template function, and the pipeline handler can declare the proxy type when it calls createIPA. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: IPAProxy: Remove registration mechanism Implementations of IPA proxies use a registration mechanism to register themselves with the main IPA proxy factory. This registration declares static objects, causing a risk of things being constructed before the proper libcamera facilities are ready. Since each pipeline handler has its own IPA proxy and knows the type, it isn't necessary to have a proxy factory. Remove it to alleviate the risk of early construction. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: proxy: Remove IPAProxyLinux and IPAProxyThread We have now changed the proxy from per-IPC mechanism to per-pipeline. The per-IPC mechanism proxies are thus no longer needed; remove them. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- tests: ipa_interface_test: Update to use new createIPA Update the IPA interface test to use the new createIPA function from IPAManager. Also create an instance of ProcessManager, as no single global instance is created automatically anymore. Update meson.build to to depend on the generated IPA interface headers. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: PipelineHandler: Remove IPA from base class Since pipeline handlers now have their own IPA interface types, it can no longer be defined in the base class, and each pipeline handler implementation must declare it and its type themselves. Remove it from the base class. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- ipa: raspberrypi: Add mojom data definition file Add a mojom data definition for raspberrypi pipeline handler's IPAs. This simplifies the API between the raspberrypi pipeline handler and the IPA, and is not a direct translation of what was used before with IPAOperationData. Also move the enums from raspberrypi.h to raspberrypi.mojom Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: pipeline, ipa: raspberrypi: Use new data definition Now that we can generate custom functions and data structures with mojo, switch the raspberrypi pipeline handler and IPA to use the custom data structures as defined in the mojom data definition file. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: pipeline, ipa: vimc: Support the new IPC mechanism Add support to vimc pipeline handler and IPA for the new IPC mechanism. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> --- libcamera: pipeline, ipa: rkisp1: Support the new IPC mechanism Add support to the rkisp1 pipeline handler and IPA for the new IPC mechanism. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- libcamera: pipeline, ipa: ipu3: Support the new IPC mechanism Add support to ipu3 pipeline handler and IPA for the new IPC mechanism. [Original version] Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> [Fixed commit message and small changes] Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
282 lines
8.1 KiB
C++
282 lines
8.1 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* ipa_manager.cpp - Image Processing Algorithm module manager
|
|
*/
|
|
|
|
#include "libcamera/internal/ipa_manager.h"
|
|
|
|
#include <algorithm>
|
|
#include <dirent.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "libcamera/internal/file.h"
|
|
#include "libcamera/internal/ipa_module.h"
|
|
#include "libcamera/internal/ipa_proxy.h"
|
|
#include "libcamera/internal/log.h"
|
|
#include "libcamera/internal/pipeline_handler.h"
|
|
#include "libcamera/internal/utils.h"
|
|
|
|
/**
|
|
* \file ipa_manager.h
|
|
* \brief Image Processing Algorithm module manager
|
|
*/
|
|
|
|
namespace libcamera {
|
|
|
|
LOG_DEFINE_CATEGORY(IPAManager)
|
|
|
|
/**
|
|
* \class IPAManager
|
|
* \brief Manager for IPA modules
|
|
*
|
|
* The IPA module manager discovers IPA modules from disk, queries and loads
|
|
* them, and creates IPA contexts. It supports isolation of the modules in a
|
|
* separate process with IPC communication and offers a unified IPAInterface
|
|
* view of the IPA contexts to pipeline handlers regardless of whether the
|
|
* modules are isolated or loaded in the same process.
|
|
*
|
|
* Module isolation is based on the module licence. Open-source modules are
|
|
* loaded without isolation, while closed-source module are forcefully isolated.
|
|
* The isolation mechanism ensures that no code from a closed-source module is
|
|
* ever run in the libcamera process.
|
|
*
|
|
* To create an IPA context, pipeline handlers call the IPAManager::createIPA()
|
|
* method. For a directly loaded module, the manager calls the module's
|
|
* ipaCreate() function directly and wraps the returned context in an
|
|
* IPAContextWrapper that exposes an IPAInterface.
|
|
*
|
|
* ~~~~
|
|
* +---------------+
|
|
* | Pipeline |
|
|
* | Handler |
|
|
* +---------------+
|
|
* |
|
|
* v
|
|
* +---------------+ +---------------+
|
|
* | IPA | | Open Source |
|
|
* | Interface | | IPA Module |
|
|
* | - - - - - - - | | - - - - - - - |
|
|
* | IPA Context | ipa_context_ops | ipa_context |
|
|
* | Wrapper | ----------------> | |
|
|
* +---------------+ +---------------+
|
|
* ~~~~
|
|
*
|
|
* For an isolated module, the manager instantiates an IPAProxy which spawns a
|
|
* new process for an IPA proxy worker. The worker loads the IPA module and
|
|
* creates the IPA context. The IPAProxy alse exposes an IPAInterface.
|
|
*
|
|
* ~~~~
|
|
* +---------------+ +---------------+
|
|
* | Pipeline | | Closed Source |
|
|
* | Handler | | IPA Module |
|
|
* +---------------+ | - - - - - - - |
|
|
* | | ipa_context |
|
|
* v | |
|
|
* +---------------+ +---------------+
|
|
* | IPA | ipa_context_ops ^
|
|
* | Interface | |
|
|
* | - - - - - - - | +---------------+
|
|
* | IPA Proxy | operations | IPA Proxy |
|
|
* | | ----------------> | Worker |
|
|
* +---------------+ over IPC +---------------+
|
|
* ~~~~
|
|
*
|
|
* The IPAInterface implemented by the IPAContextWrapper or IPAProxy is
|
|
* returned to the pipeline handler, and all interactions with the IPA context
|
|
* go the same interface regardless of process isolation.
|
|
*
|
|
* In all cases the data passed to the IPAInterface methods is serialized to
|
|
* Plain Old Data, either for the purpose of passing it to the IPA context
|
|
* plain C API, or to transmit the data to the isolated process through IPC.
|
|
*/
|
|
|
|
IPAManager *IPAManager::self_ = nullptr;
|
|
|
|
/**
|
|
* \brief Construct an IPAManager instance
|
|
*
|
|
* The IPAManager class is meant to only be instantiated once, by the
|
|
* CameraManager.
|
|
*/
|
|
IPAManager::IPAManager()
|
|
{
|
|
if (self_)
|
|
LOG(IPAManager, Fatal)
|
|
<< "Multiple IPAManager objects are not allowed";
|
|
|
|
unsigned int ipaCount = 0;
|
|
|
|
/* User-specified paths take precedence. */
|
|
const char *modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
|
|
if (modulePaths) {
|
|
for (const auto &dir : utils::split(modulePaths, ":")) {
|
|
if (dir.empty())
|
|
continue;
|
|
|
|
ipaCount += addDir(dir.c_str());
|
|
}
|
|
|
|
if (!ipaCount)
|
|
LOG(IPAManager, Warning)
|
|
<< "No IPA found in '" << modulePaths << "'";
|
|
}
|
|
|
|
/*
|
|
* When libcamera is used before it is installed, load IPAs from the
|
|
* same build directory as the libcamera library itself.
|
|
*/
|
|
std::string root = utils::libcameraBuildPath();
|
|
if (!root.empty()) {
|
|
std::string ipaBuildPath = root + "src/ipa";
|
|
constexpr int maxDepth = 1;
|
|
|
|
LOG(IPAManager, Info)
|
|
<< "libcamera is not installed. Adding '"
|
|
<< ipaBuildPath << "' to the IPA search path";
|
|
|
|
ipaCount += addDir(ipaBuildPath.c_str(), maxDepth);
|
|
}
|
|
|
|
/* Finally try to load IPAs from the installed system path. */
|
|
ipaCount += addDir(IPA_MODULE_DIR);
|
|
|
|
if (!ipaCount)
|
|
LOG(IPAManager, Warning)
|
|
<< "No IPA found in '" IPA_MODULE_DIR "'";
|
|
|
|
self_ = this;
|
|
}
|
|
|
|
IPAManager::~IPAManager()
|
|
{
|
|
for (IPAModule *module : modules_)
|
|
delete module;
|
|
|
|
self_ = nullptr;
|
|
}
|
|
|
|
/**
|
|
* \brief Identify shared library objects within a directory
|
|
* \param[in] libDir The directory to search for shared objects
|
|
* \param[in] maxDepth The maximum depth of sub-directories to parse
|
|
* \param[out] files A vector of paths to shared object library files
|
|
*
|
|
* Search a directory for .so files, allowing recursion down to sub-directories
|
|
* no further than the depth specified by \a maxDepth.
|
|
*
|
|
* Discovered shared objects are added to the \a files vector.
|
|
*/
|
|
void IPAManager::parseDir(const char *libDir, unsigned int maxDepth,
|
|
std::vector<std::string> &files)
|
|
{
|
|
struct dirent *ent;
|
|
DIR *dir;
|
|
|
|
dir = opendir(libDir);
|
|
if (!dir)
|
|
return;
|
|
|
|
while ((ent = readdir(dir)) != nullptr) {
|
|
if (ent->d_type == DT_DIR && maxDepth) {
|
|
if (strcmp(ent->d_name, ".") == 0 ||
|
|
strcmp(ent->d_name, "..") == 0)
|
|
continue;
|
|
|
|
std::string subdir = std::string(libDir) + "/" + ent->d_name;
|
|
|
|
/* Recursion is limited to maxDepth. */
|
|
parseDir(subdir.c_str(), maxDepth - 1, files);
|
|
|
|
continue;
|
|
}
|
|
|
|
int offset = strlen(ent->d_name) - 3;
|
|
if (offset < 0)
|
|
continue;
|
|
if (strcmp(&ent->d_name[offset], ".so"))
|
|
continue;
|
|
|
|
files.push_back(std::string(libDir) + "/" + ent->d_name);
|
|
}
|
|
|
|
closedir(dir);
|
|
}
|
|
|
|
/**
|
|
* \brief Load IPA modules from a directory
|
|
* \param[in] libDir The directory to search for IPA modules
|
|
* \param[in] maxDepth The maximum depth of sub-directories to search
|
|
*
|
|
* This method tries to create an IPAModule instance for every shared object
|
|
* found in \a libDir, and skips invalid IPA modules.
|
|
*
|
|
* Sub-directories are searched up to a depth of \a maxDepth. A \a maxDepth
|
|
* value of 0 only searches the directory specified in \a libDir.
|
|
*
|
|
* \return Number of modules loaded by this call
|
|
*/
|
|
unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth)
|
|
{
|
|
std::vector<std::string> files;
|
|
|
|
parseDir(libDir, maxDepth, files);
|
|
|
|
/* Ensure a stable ordering of modules. */
|
|
std::sort(files.begin(), files.end());
|
|
|
|
unsigned int count = 0;
|
|
for (const std::string &file : files) {
|
|
IPAModule *ipaModule = new IPAModule(file);
|
|
if (!ipaModule->isValid()) {
|
|
delete ipaModule;
|
|
continue;
|
|
}
|
|
|
|
LOG(IPAManager, Debug) << "Loaded IPA module '" << file << "'";
|
|
|
|
modules_.push_back(ipaModule);
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
/**
|
|
* \fn IPAManager::createIPA()
|
|
* \brief Create an IPA proxy that matches a given pipeline handler
|
|
* \param[in] pipe The pipeline handler that wants a matching IPA proxy
|
|
* \param[in] minVersion Minimum acceptable version of IPA module
|
|
* \param[in] maxVersion Maximum acceptable version of IPA module
|
|
*
|
|
* \return A newly created IPA proxy, or nullptr if no matching IPA module is
|
|
* found or if the IPA proxy fails to initialize
|
|
*/
|
|
|
|
bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
|
|
{
|
|
#if HAVE_IPA_PUBKEY
|
|
File file{ ipa->path() };
|
|
if (!file.open(File::ReadOnly))
|
|
return false;
|
|
|
|
Span<uint8_t> data = file.map();
|
|
if (data.empty())
|
|
return false;
|
|
|
|
bool valid = pubKey_.verify(data, ipa->signature());
|
|
|
|
LOG(IPAManager, Debug)
|
|
<< "IPA module " << ipa->path() << " signature is "
|
|
<< (valid ? "valid" : "not valid");
|
|
|
|
return valid;
|
|
#else
|
|
return false;
|
|
#endif
|
|
}
|
|
|
|
} /* namespace libcamera */
|