[libcamera-devel,08/23] libcamera: Add IPAIPC implementation based on unix socket

Message ID 20200915142038.28757-9-paul.elder@ideasonboard.com
State Superseded
Headers show
Series
  • IPA isolation implementation
Related show

Commit Message

Paul Elder Sept. 15, 2020, 2:20 p.m. UTC
Add an implementation of IPAIPC using unix socket.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
---
 .../libcamera/internal/ipa_ipc_unixsocket.h   | 115 ++++++++++++
 src/libcamera/ipa_ipc_unixsocket.cpp          | 175 ++++++++++++++++++
 src/libcamera/meson.build                     |   1 +
 3 files changed, 291 insertions(+)
 create mode 100644 include/libcamera/internal/ipa_ipc_unixsocket.h
 create mode 100644 src/libcamera/ipa_ipc_unixsocket.cpp

Patch

diff --git a/include/libcamera/internal/ipa_ipc_unixsocket.h b/include/libcamera/internal/ipa_ipc_unixsocket.h
new file mode 100644
index 00000000..de8af35b
--- /dev/null
+++ b/include/libcamera/internal/ipa_ipc_unixsocket.h
@@ -0,0 +1,115 @@ 
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2020, Google Inc.
+ *
+ * ipa_ipc_unixsocket.h - Image Processing Algorithm IPC module using unix socket
+ */
+#ifndef __LIBCAMERA_INTERNAL_IPA_IPC_UNIXSOCKET_H__
+#define __LIBCAMERA_INTERNAL_IPA_IPC_UNIXSOCKET_H__
+
+#include <vector>
+
+#include <libcamera/span.h>
+
+#include "libcamera/internal/ipa_ipc.h"
+#include "libcamera/internal/ipa_module.h"
+#include "libcamera/internal/ipc_unixsocket.h"
+
+namespace libcamera {
+
+class Process;
+
+inline void writeHeader(IPCUnixSocket::Payload &payload, uint32_t cmd, uint32_t seq)
+{
+	uint8_t cmd_arr[] = {static_cast<uint8_t>(cmd & 0xff),
+			     static_cast<uint8_t>((cmd >> 8 ) & 0xff),
+			     static_cast<uint8_t>((cmd >> 16) & 0xff),
+			     static_cast<uint8_t>((cmd >> 24) & 0xff)};
+	uint8_t seq_arr[] = {static_cast<uint8_t>(seq & 0xff),
+			     static_cast<uint8_t>((seq >> 8 ) & 0xff),
+			     static_cast<uint8_t>((seq >> 16) & 0xff),
+			     static_cast<uint8_t>((seq >> 24) & 0xff)};
+	payload.data.insert(payload.data.begin(), cmd_arr, cmd_arr+4);
+	payload.data.insert(payload.data.begin() + 4, seq_arr, seq_arr+4);
+}
+
+inline std::tuple<uint32_t, uint32_t> readHeader(IPCUnixSocket::Payload &payload)
+{
+	uint32_t cmd = (payload.data[0] & 0xff) |
+		       ((payload.data[1] & 0xff) << 8) |
+		       ((payload.data[2] & 0xff) << 16) |
+		       ((payload.data[3] & 0xff) << 24);
+	uint32_t seq = (payload.data[4] & 0xff) |
+		       ((payload.data[5] & 0xff) << 8) |
+		       ((payload.data[6] & 0xff) << 16) |
+		       ((payload.data[7] & 0xff) << 24);
+
+	return {cmd, seq};
+}
+
+inline void eraseHeader(IPCUnixSocket::Payload &payload)
+{
+	payload.data.erase(payload.data.begin(), payload.data.begin() + 8);
+}
+
+inline void writeUInt32(IPCUnixSocket::Payload &payload, uint32_t val, uint32_t pos)
+{
+	if (pos + 4 > payload.data.size())
+		return;
+
+	uint8_t arr[] = {static_cast<uint8_t>(val & 0xff),
+			 static_cast<uint8_t>(val & (0xff << 8)),
+			 static_cast<uint8_t>(val & (0xff << 16)),
+			 static_cast<uint8_t>(val & (0xff << 24))};
+	std::copy(arr, arr + 4, payload.data.begin() + pos);
+}
+
+inline uint32_t readUInt32(IPCUnixSocket::Payload &payload, uint32_t pos)
+{
+	if (pos + 4 > payload.data.size())
+		return 0;
+
+	return payload.data[pos] & (payload.data[pos + 1] << 8) &
+	       (payload.data[pos + 2] << 16) & (payload.data[pos + 3] << 24);
+}
+
+
+class IPAIPCUnixSocket : public IPAIPC
+{
+public:
+	IPAIPCUnixSocket(const char *ipa_module_path, const char *ipa_proxy_worker_path);
+	~IPAIPCUnixSocket();
+
+	bool isValid() const { return valid_; }
+
+	int sendSync(uint32_t cmd,
+		     const std::vector<uint8_t> &data_in,
+		     const std::vector<int32_t> &fds_in,
+		     std::vector<uint8_t> *data_out = nullptr,
+		     std::vector<int32_t> *fds_out = nullptr) override;
+
+	int sendAsync(uint32_t cmd,
+		      const std::vector<uint8_t> &data_in,
+		      const std::vector<int32_t> &fds_in) override;
+
+private:
+	struct CallData {
+		IPCUnixSocket::Payload *response;
+		bool done;
+	};
+
+	void readyRead(IPCUnixSocket *socket);
+	int call(const IPCUnixSocket::Payload &message, IPCUnixSocket::Payload *response, uint32_t seq);
+
+	uint32_t seq_;
+
+	Process *proc_;
+
+	IPCUnixSocket *socket_;
+
+	std::map<uint32_t, struct CallData> callData_;
+};
+
+} /* namespace libcamera */
+
+#endif /* __LIBCAMERA_INTERNAL_IPA_IPC_UNIXSOCKET_H__ */
diff --git a/src/libcamera/ipa_ipc_unixsocket.cpp b/src/libcamera/ipa_ipc_unixsocket.cpp
new file mode 100644
index 00000000..c1997e96
--- /dev/null
+++ b/src/libcamera/ipa_ipc_unixsocket.cpp
@@ -0,0 +1,175 @@ 
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2020, Google Inc.
+ *
+ * ipa_ipc_unixsocket.cpp - Image Processing Algorithm IPC module using unix socket
+ */
+
+#include <vector>
+
+#include "libcamera/internal/ipc_unixsocket.h"
+#include "libcamera/internal/log.h"
+#include "libcamera/internal/process.h"
+#include "libcamera/internal/thread.h"
+
+#include <libcamera/event_dispatcher.h>
+#include <libcamera/timer.h>
+
+#include "libcamera/internal/ipa_ipc.h"
+#include "libcamera/internal/ipa_ipc_unixsocket.h"
+
+namespace libcamera {
+
+LOG_DECLARE_CATEGORY(IPAIPC)
+
+IPAIPCUnixSocket::IPAIPCUnixSocket(const char *ipa_module_path,
+				   const char *ipa_proxy_worker_path)
+	: IPAIPC(ipa_module_path, ipa_proxy_worker_path), seq_(0),
+	  proc_(nullptr), socket_(nullptr)
+{
+	std::vector<int> fds;
+	std::vector<std::string> args;
+	args.push_back(ipa_module_path);
+
+	socket_ = new IPCUnixSocket();
+	int fd = socket_->create();
+	if (fd < 0) {
+		LOG(IPAIPC, Error)
+			<< "Failed to create socket";
+		return;
+	}
+	socket_->readyRead.connect(this, &IPAIPCUnixSocket::readyRead);
+	args.push_back(std::to_string(fd));
+	fds.push_back(fd);
+
+	proc_ = new Process();
+	int ret = proc_->start(ipa_proxy_worker_path, args, fds);
+	if (ret) {
+		LOG(IPAIPC, Error)
+			<< "Failed to start proxy worker process";
+		return;
+	}
+
+	valid_ = true;
+}
+
+IPAIPCUnixSocket::~IPAIPCUnixSocket()
+{
+	delete proc_;
+	delete socket_;
+}
+
+int IPAIPCUnixSocket::sendSync(uint32_t cmd,
+			       const std::vector<uint8_t> &data_in,
+			       const std::vector<int32_t> &fds_in,
+			       std::vector<uint8_t> *data_out,
+			       std::vector<int32_t> *fds_out)
+{
+	IPCUnixSocket::Payload message, response;
+	int ret;
+
+	/* It's fine if seq_ overflows; that'll just be the new epoch. */
+	seq_++;
+	writeHeader(message, cmd, seq_);
+	message.data.insert(message.data.end(), data_in.begin(), data_in.end());
+
+	message.fds = const_cast<std::vector<int32_t> &>(fds_in);
+
+	ret = call(message, &response, seq_);
+	if (ret) {
+		LOG(IPAIPC, Error) << "Failed to call sync";
+		callData_.erase(seq_);
+		return ret;
+	}
+
+	if (data_out)
+		data_out->insert(data_out->end(), response.data.begin(), response.data.end());
+
+	if (fds_out)
+		fds_out->insert(fds_out->end(), response.fds.begin(), response.fds.end());
+
+	return 0;
+}
+
+int IPAIPCUnixSocket::sendAsync(uint32_t cmd,
+				const std::vector<uint8_t> &data_in,
+				const std::vector<int32_t> &fds_in)
+{
+	IPCUnixSocket::Payload message;
+	int ret;
+
+	writeHeader(message, cmd, 0);
+	message.data.insert(message.data.end(), data_in.begin(), data_in.end());
+
+	message.fds = const_cast<std::vector<int32_t> &>(fds_in);
+
+	ret = socket_->send(message);
+	if (ret) {
+		LOG(IPAIPC, Error) << "Failed to call async";
+		return ret;
+	}
+
+	return 0;
+}
+
+void IPAIPCUnixSocket::readyRead(IPCUnixSocket *socket)
+{
+	IPCUnixSocket::Payload message;
+	int ret = socket->receive(&message);
+	if (ret) {
+		LOG(IPAIPC, Error) << "Receive message failed" << ret;
+		return;
+	}
+
+	uint32_t cmd, seq;
+	std::tie(cmd, seq) = readHeader(message);
+
+	auto callData = callData_.find(seq);
+	if (callData != callData_.end()) {
+		eraseHeader(message);
+		/* Is there any way to avoid this copy? */
+		*callData->second.response = message;
+		callData->second.done = true;
+		return;
+	}
+
+	/*
+	 * Received unexpected data, this means it's a call from the IPA.
+	 * We can't return anything to the IPA (gotta keep them under *our*
+	 * control, plus returning would require blocking the caller, and we
+	 * can't afford to do that). Let the proxy do switch-case on cmd.
+	 */
+	recvIPC.emit(message.data, message.fds);
+
+	return;
+}
+
+int IPAIPCUnixSocket::call(const IPCUnixSocket::Payload &message, IPCUnixSocket::Payload *response, uint32_t seq)
+{
+	Timer timeout;
+	int ret;
+
+	callData_[seq].response = response;
+	callData_[seq].done = false;
+
+	ret = socket_->send(message);
+	if (ret)
+		return ret;
+
+	timeout.start(200);
+	while (!callData_[seq].done) {
+		if (!timeout.isRunning()) {
+			LOG(IPAIPC, Error) << "Call timeout!";
+			callData_.erase(seq);
+			return -ETIMEDOUT;
+		}
+
+		Thread::current()->eventDispatcher()->processEvents();
+	}
+
+	callData_.erase(seq);
+
+	return 0;
+}
+
+} /* namespace libcamera */
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 2e7c3b4d..9d1abeb0 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -25,6 +25,7 @@  libcamera_sources = files([
     'ipa_controls.cpp',
     'ipa_data_serializer.cpp',
     'ipa_ipc.cpp',
+    'ipa_ipc_unixsocket.cpp',
     'ipa_interface.cpp',
     'ipa_manager.cpp',
     'ipa_module.cpp',