Patch Detail
Show a patch.
GET /api/patches/1367/?format=api
{ "id": 1367, "url": "https://patchwork.libcamera.org/api/patches/1367/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1367/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190605221817.966-7-paul.elder@ideasonboard.com>", "date": "2019-06-05T22:18:13", "name": "[libcamera-devel,RFC,06/10] libcamera: ipa_manager: add shims", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "cf0a3278690f0d70cb5f53d2859982599a0d5954", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1367/mbox/", "series": [ { "id": 339, "url": "https://patchwork.libcamera.org/api/series/339/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=339", "date": "2019-06-05T22:18:07", "name": "Add IPA process isolation", "version": 1, "mbox": "https://patchwork.libcamera.org/series/339/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1367/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1367/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CE50A66C75\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Jun 2019 00:18:32 +0200 (CEST)", "from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2AF1C9BC;\n\tThu, 6 Jun 2019 00:18:32 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1559773112;\n\tbh=bRpVbdJkCA2p8oENqa8RmSJRj6p0z8NpYLh9vE/vAEU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Zom3/DzNyWtl1ecf8cBxqW5bCGtlEM7WzIFQIvQkDlLbZOxco/nEu4jv9TZwepIbE\n\t/GPF13YN8ZNL9is8dZ7g+4685ev4PIiLC2E76p8GxDsJ9yidUAevbWrhovIQnz2tnD\n\t9zDX1Esh6L9QFRPU9T4zISVdWVql6iJrulHRDsDA=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 5 Jun 2019 18:18:13 -0400", "Message-Id": "<20190605221817.966-7-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190605221817.966-1-paul.elder@ideasonboard.com>", "References": "<20190605221817.966-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH 06/10] libcamera: ipa_manager: add\n\tshims", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Wed, 05 Jun 2019 22:18:33 -0000" }, "content": "Make IPAManager load shim shared objects in addition to IPA module\nshared objects, and keep them in a shims list. When requested for an\nIPA, if the IPA requires isolation, wrap the IPA in the first shim that\nis available.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/libcamera/include/ipa_manager.h | 1 +\n src/libcamera/ipa_manager.cpp | 34 +++++++++++++++++++++++++++--\n 2 files changed, 33 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nindex 310ce7c..a0fb8ad 100644\n--- a/src/libcamera/include/ipa_manager.h\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -28,6 +28,7 @@ public:\n \n private:\n \tstd::vector<IPAModule *> modules_;\n+\tstd::vector<IPAModule *> shims_;\n \n \tIPAManager();\n \t~IPAManager();\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex f689aa6..3648ea6 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -110,7 +110,10 @@ int IPAManager::addDir(const char *libDir)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tmodules_.push_back(ipaModule);\n+\t\tif (!strncmp(ipaModule->info().pipelineName, \"Shim\", 4))\n+\t\t\tshims_.push_back(ipaModule);\n+\t\telse\n+\t\t\tmodules_.push_back(ipaModule);\n \t\tcount++;\n \t}\n \n@@ -132,6 +135,7 @@ std::unique_ptr<IPAInterface> IPAManager::createIPA(PipelineHandler *pipe,\n \t\t\t\t\t\t uint32_t minVersion)\n {\n \tIPAModule *m = nullptr;\n+\tIPAModule *shim = nullptr;\n \n \tfor (IPAModule *module : modules_) {\n \t\tif (module->match(pipe, minVersion, maxVersion)) {\n@@ -140,7 +144,33 @@ std::unique_ptr<IPAInterface> IPAManager::createIPA(PipelineHandler *pipe,\n \t\t}\n \t}\n \n-\tif (!m || !m->load())\n+\tif (!m)\n+\t\treturn nullptr;\n+\n+\tif (m->info().isolate) {\n+\t\tif (shims_.empty()) {\n+\t\t\tLOG(IPAManager, Error) << \"No shims available\";\n+\t\t\treturn nullptr;\n+\t\t}\n+\n+\t\tshim = shims_.front();\n+\t\tif (!shim || !shim->load()) {\n+\t\t\tLOG(IPAManager, Error) << \"Failed to obtain shim\";\n+\t\t\treturn nullptr;\n+\t\t}\n+\n+\t\tauto shimIPAIntf = shim->createInstance();\n+\t\tif (!shimIPAIntf) {\n+\t\t\tLOG(IPAManager, Error) << \"Failed to load shim\";\n+\t\t\treturn nullptr;\n+\t\t}\n+\n+\t\tshimIPAIntf->init(m->path());\n+\n+\t\treturn shimIPAIntf;\n+\t}\n+\n+\tif (!m->load())\n \t\treturn nullptr;\n \n \treturn m->createInstance();\n", "prefixes": [ "libcamera-devel", "RFC", "06/10" ] }