{"id":16140,"url":"https://patchwork.libcamera.org/api/1.1/patches/16140/?format=json","web_url":"https://patchwork.libcamera.org/patch/16140/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220603132259.188845-4-umang.jain@ideasonboard.com>","date":"2022-06-03T13:22:58","name":"[libcamera-devel,v1,3/4] ipa: ipu3: Prevent over queuing of requests","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e4390c6a9b9085cc5d5288c79968f12298172cba","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16140/mbox/","series":[{"id":3157,"url":"https://patchwork.libcamera.org/api/1.1/series/3157/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3157","date":"2022-06-03T13:22:55","name":"Move frame contexts queue to separate class","version":1,"mbox":"https://patchwork.libcamera.org/series/3157/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16140/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16140/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 66F08C326E\n\tfor ;\n\tFri, 3 Jun 2022 13:23:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0FDFB6563B;\n\tFri, 3 Jun 2022 15:23:10 +0200 (CEST)","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 7037D60105\n\tfor ;\n\tFri, 3 Jun 2022 15:23:07 +0200 (CEST)","from perceval.ideasonboard.com\n\t(static-127-186-62-95.ipcom.comunitel.net [95.62.186.127])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 01B5810DD;\n\tFri, 3 Jun 2022 15:23:06 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1654262590;\n\tbh=rkzOhxHUJ/ogiiZQc37sw1q9ERNpAiHJGLINDSyqm78=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=cU/OgmlSeu1rsW/lrpFVhf3j27njZkiMd6hlxxnjg+npejv1uzA9kDGTteLVZD1TE\n\t0jzqaA6lWB2qMoZlvKw8/33fGMKvyk0SdMTEEaCm9T2q0jEWL/FmkGIqxSHK+ybiWe\n\tRlE3ajln6WLMKuTe1K1OMPl5sEfBwVjYNH2A15P81lHdGT27dSP4usIHRJlSUjoXS0\n\taL5UiR9J+qP8vGfuHNXa46apaAmHHbZW/dODNU6XEKNupsGmQpJKRg6wDEU6T884Mg\n\tI1vsL0ida3LOoM6FHuYkbhYcwTAiOMCociZMPMUw7V3PFtbe6FcPnXks6UHvQ3ygLn\n\tGVzeSheQ0/MKA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1654262587;\n\tbh=rkzOhxHUJ/ogiiZQc37sw1q9ERNpAiHJGLINDSyqm78=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=nY64hAankXJXeU0mBAhGo8WWt4nMOSoA1unPBc9Epl9JX+cxm0yQ2GShsXDYHWaoT\n\txa32VVKKRrJTq1mHFziYSnEaWKBGWUX55mhsHrhIv7SqWBesUmqyW+2SHkAqgHXieB\n\tb/AZeHHyaDWONA/fAa37rR2Ba/EHN8B9+UAC3v34="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"nY64hAan\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Jun 2022 15:22:58 +0200","Message-Id":"<20220603132259.188845-4-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20220603132259.188845-1-umang.jain@ideasonboard.com>","References":"<20220603132259.188845-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v1 3/4] ipa: ipu3: Prevent over queuing of\n\trequests","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Umang Jain via libcamera-devel ","Reply-To":"Umang Jain ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The IPAIPU3 processes each IPAFrameContext present in the FCQueue\nring buffer. If the application queues the requests at a pace where\nIPAFrameContext(s) can get potentially over-written without getting\nprocessed by the IPA, it would lead to un-desirable effects.\n\nHence, inspect the FCQueue if it is full and reject any further\nqueuing of requests. This requires changes to the IPAIPU3 mojom\ninterface. The IPAIPU3::queueRequest() cannot be [async] anymore\nsince we need to return a success/failure value.\n\nThe rejection by the IPA doesn't mean it cannot be queued\nlater. The request is still preserved in\nIPU3CameraData::pendingRequests_. It shall be queued sequentially\non subsequent calls to IPU3CameraData::queuePendingRequests().\n\nSigned-off-by: Umang Jain \n---\nI am not super-happy with changing the interface and dropping [async]\nbut this is what I've for now. Would appreciate any other ideas...\n---\n include/libcamera/ipa/ipu3.mojom | 2 +-\n src/ipa/ipu3/ipu3.cpp | 11 +++++++++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 10 +++++++++-\n 3 files changed, 19 insertions(+), 4 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex d1b1c6b8..3faffd9c 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -30,7 +30,7 @@ interface IPAIPU3Interface {\n \tmapBuffers(array buffers);\n \tunmapBuffers(array ids);\n \n-\t[async] queueRequest(uint32 frame, libcamera.ControlList controls);\n+\tqueueRequest(uint32 frame, libcamera.ControlList controls) => (int32 ret);\n \t[async] fillParamsBuffer(uint32 frame, uint32 bufferId);\n \t[async] processStatsBuffer(uint32 frame, int64 frameTimestamp,\n \t\t\t\t uint32 bufferId, libcamera.ControlList sensorControls);\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 1d6ee515..63aa9b56 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -145,7 +145,7 @@ public:\n \tvoid mapBuffers(const std::vector &buffers) override;\n \tvoid unmapBuffers(const std::vector &ids) override;\n \n-\tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n+\tint queueRequest(const uint32_t frame, const ControlList &controls) override;\n \tvoid fillParamsBuffer(const uint32_t frame, const uint32_t bufferId) override;\n \tvoid processStatsBuffer(const uint32_t frame, const int64_t frameTimestamp,\n \t\t\t\tconst uint32_t bufferId,\n@@ -616,11 +616,18 @@ void IPAIPU3::processStatsBuffer(const uint32_t frame,\n *\n * Parse the request to handle any IPA-managed controls that were set from the\n * application such as manual sensor settings.\n+ *\n+ * \\return 0 if successful, -EPERM otherwise.\n */\n-void IPAIPU3::queueRequest(const uint32_t frame, const ControlList &controls)\n+int IPAIPU3::queueRequest(const uint32_t frame, const ControlList &controls)\n {\n+\tif (context_.frameContexts.isFull())\n+\t\treturn -EPERM;\n+\n \t/* \\todo Start processing for 'frame' based on 'controls'. */\n \t*context_.frameContexts.get(frame) = { frame, controls };\n+\n+\treturn 0;\n }\n \n /**\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex fd989e61..d69e28d4 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -874,7 +874,15 @@ void IPU3CameraData::queuePendingRequests()\n \n \t\tinfo->rawBuffer = rawBuffer;\n \n-\t\tipa_->queueRequest(info->id, request->controls());\n+\t\t/*\n+\t\t * Queueing request to the IPA can fail in cases like over-flowing\n+\t\t * its queue. Hence, keep the request preserved in pendingRequests_\n+\t\t * if a failure occurs.\n+\t\t */\n+\t\tif (ipa_->queueRequest(info->id, request->controls()) != 0) {\n+\t\t\tframeInfos_.remove(info);\n+\t\t\tbreak;\n+\t\t}\n \n \t\tpendingRequests_.pop();\n \t\tprocessingRequests_.push(request);\n","prefixes":["libcamera-devel","v1","3/4"]}