[{"id":4183,"web_url":"https://patchwork.libcamera.org/comment/4183/","msgid":"<20200323110509.GB571071@oden.dyn.berto.se>","date":"2020-03-23T11:05:09","subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera:\n\tdevice_enumerator_udev: Don't add media device twice","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2020-03-20 23:04:35 +0200, Laurent Pinchart wrote:\n> Commit 68daa9302f90 (\"libcamera: device_enumerator: Don't stop if one\n> device fails\") introduced a bug in device enumeration. Previously, a\n> media device would only be added when all its dependencies were present,\n> as indicated by populateMediaDevice() returning 0. The commit changed\n> the logic to propagate the populateMediaDevice() return code up, but\n> mistakenly added the media device to the enumerator even when\n> dependencies were missing. This causes media devices enumerated with\n> missing dependencies to be added twice, once when enumerating the media\n> device itself, and a second time when all the dependencies are found.\n> \n> Fix it by deferring addition of the media device when dependencies are\n> missing, and add debug messages to track this process.\n> \n> Fixes: 68daa9302f90 (\"libcamera: device_enumerator: Don't stop if one device fails\")\n> Reported-by: Andrey Konovalov \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/device_enumerator_udev.cpp | 10 ++++++++++\n> 1 file changed, 10 insertions(+)\n> \n> diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\n> index 87638c59761c..e55350544feb 100644\n> --- a/src/libcamera/device_enumerator_udev.cpp\n> +++ b/src/libcamera/device_enumerator_udev.cpp\n> @@ -90,6 +90,13 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)\n> \t\t\treturn ret;\n> \t\t}\n> \n> +\t\tif (ret) {\n> +\t\t\tLOG(DeviceEnumerator, Debug)\n> +\t\t\t\t<< \"Defer media device \" << media->deviceNode()\n> +\t\t\t\t<< \" due to \" << ret << \" missing dependencies\";\n> +\t\t\treturn 0;\n> +\t\t}\n> +\n> \t\taddDevice(media);\n> \t\treturn 0;\n> \t}\n> @@ -313,6 +320,9 @@ int DeviceEnumeratorUdev::addV4L2Device(dev_t devnum)\n> \tdeps->deps_.erase(devnum);\n> \n> \tif (deps->deps_.empty()) {\n> +\t\tLOG(DeviceEnumerator, Debug)\n> +\t\t\t<< \"All dependencies for media device \"\n> +\t\t\t<< deps->media_->deviceNode() << \" found\";\n> \t\taddDevice(deps->media_);\n> \t\tpending_.remove(*deps);\n> \t}\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lf1-x144.google.com (mail-lf1-x144.google.com\n\t[IPv6:2a00:1450:4864:20::144])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 67D7260413\n\tfor ;\n\tMon, 23 Mar 2020 12:05:11 +0100 (CET)","by mail-lf1-x144.google.com with SMTP id t21so9839667lfe.9\n\tfor ;\n\tMon, 23 Mar 2020 04:05:11 -0700 (PDT)","from localhost (h-200-138.A463.priv.bahnhof.se. [176.10.200.138])\n\tby smtp.gmail.com with ESMTPSA id\n\tb23sm8061939lfi.55.2020.03.23.04.05.10\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Mar 2020 04:05:10 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=SoAilqGqGhK/MZW9C/QYBKTqzg/fNU/6xclz4+GJVXY=;\n\tb=h4ll2FAVNhcZRMapYCmXAHkV2UYSxHdIJR6cujIaG42FKVx5OS6mPVLrS7YofeynUq\n\tohgmI06K+WnJg5iUJ8X36gDsuxXNaRho7kNST2FsQkJdi5BCw79iJ7CXuEF/m0oQlSLd\n\t9BTHdatuh16u57J/tPvZGLu6cPEJZrX4T/k4dgrxiUz6b9sF+n4O8AZOYEtkwKCTTEOP\n\tOjLYDGr0uDHfWdz+6Yo9d/pMVE7U8y78/isMZUe3/IZLYUe2PMaAGkgkPihsWaZrZVD9\n\ts+KWJOGuBpahHpN4hJ+9z/JQgyoU9ZCjLd67+hsyGFXBLuJ08iNSgLPI9n+wuJPN0hbG\n\tbfeA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=SoAilqGqGhK/MZW9C/QYBKTqzg/fNU/6xclz4+GJVXY=;\n\tb=m2Hr8wXlgQH1HaEz4lO24iWk+Xv9/lxOssULuVgNbjAyZIJQ5QU6zCgOoD+6qdFxr5\n\t4DPoc8fxBgyNBOMelzSOYMLS6pt+OYwf9nOjuLQxHaL5KVI9jesyRsSW/N4/0qpjTEaT\n\tH5tTeN83lp2MHLfP0+atJErLlIoC+YT+RiTMKPsf5eTfhH+NjfqRWaB3041JIR993puN\n\tbv4ZUy4K3FFqm8NHxodqFh+H7CV4268FSJE2Q653XLgVGlf3QBTrExSECyPzJdKy4je7\n\tW1do6jtVFuxuV9FrCt6njrWSxehDj3B17/QD9fWRBgV1cj2jecVlnk2Zf4+6HrRKtppV\n\tAYxw==","X-Gm-Message-State":"ANhLgQ1HGrpvsXV4WpXotaaUpeal9sVO1wFjOS7cZQlDIqzRFDIwmFq/\n\tpTdv9+tWyxDRrqs1U/wkijCYXPiFqbY=","X-Google-Smtp-Source":"ADFU+vtcGdYgG2ZnkATnfLPxp7NgwpmizmBJHNcfdBal9NaRlFKmhlLcauAi7d71bQbMCpvipaw1Yw==","X-Received":"by 2002:a05:6512:51c:: with SMTP id\n\to28mr4751919lfb.116.1584961510829; \n\tMon, 23 Mar 2020 04:05:10 -0700 (PDT)","Date":"Mon, 23 Mar 2020 12:05:09 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200323110509.GB571071@oden.dyn.berto.se>","References":"<20200320210435.8876-1-laurent.pinchart@ideasonboard.com>\n\t<20200320210435.8876-2-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200320210435.8876-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera:\n\tdevice_enumerator_udev: Don't add media device twice","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","X-List-Received-Date":"Mon, 23 Mar 2020 11:05:11 -0000"}},{"id":4189,"web_url":"https://patchwork.libcamera.org/comment/4189/","msgid":"","date":"2020-03-23T11:21:32","subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera:\n\tdevice_enumerator_udev: Don't add media device twice","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 23/03/2020 11:05, Niklas Söderlund wrote:\n> Hi Laurent,\n> \n> Thanks for your patch.\n> \n> On 2020-03-20 23:04:35 +0200, Laurent Pinchart wrote:\n>> Commit 68daa9302f90 (\"libcamera: device_enumerator: Don't stop if one\n>> device fails\") introduced a bug in device enumeration. Previously, a\n>> media device would only be added when all its dependencies were present,\n>> as indicated by populateMediaDevice() returning 0. The commit changed\n>> the logic to propagate the populateMediaDevice() return code up, but\n>> mistakenly added the media device to the enumerator even when\n>> dependencies were missing. This causes media devices enumerated with\n>> missing dependencies to be added twice, once when enumerating the media\n>> device itself, and a second time when all the dependencies are found.\n>>\n>> Fix it by deferring addition of the media device when dependencies are\n>> missing, and add debug messages to track this process.\n>>\n>> Fixes: 68daa9302f90 (\"libcamera: device_enumerator: Don't stop if one device fails\")\n>> Reported-by: Andrey Konovalov \n>> Signed-off-by: Laurent Pinchart \n> \n> Reviewed-by: Niklas Söderlund \n\nSure, looks ok.\n\nReviewed-by: Kieran Bingham \n\n> \n>> ---\n>> src/libcamera/device_enumerator_udev.cpp | 10 ++++++++++\n>> 1 file changed, 10 insertions(+)\n>>\n>> diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\n>> index 87638c59761c..e55350544feb 100644\n>> --- a/src/libcamera/device_enumerator_udev.cpp\n>> +++ b/src/libcamera/device_enumerator_udev.cpp\n>> @@ -90,6 +90,13 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)\n>> \t\t\treturn ret;\n>> \t\t}\n>> \n>> +\t\tif (ret) {\n>> +\t\t\tLOG(DeviceEnumerator, Debug)\n>> +\t\t\t\t<< \"Defer media device \" << media->deviceNode()\n>> +\t\t\t\t<< \" due to \" << ret << \" missing dependencies\";\n>> +\t\t\treturn 0;\n>> +\t\t}\n>> +\n>> \t\taddDevice(media);\n>> \t\treturn 0;\n>> \t}\n>> @@ -313,6 +320,9 @@ int DeviceEnumeratorUdev::addV4L2Device(dev_t devnum)\n>> \tdeps->deps_.erase(devnum);\n>> \n>> \tif (deps->deps_.empty()) {\n>> +\t\tLOG(DeviceEnumerator, Debug)\n>> +\t\t\t<< \"All dependencies for media device \"\n>> +\t\t\t<< deps->media_->deviceNode() << \" found\";\n>> \t\taddDevice(deps->media_);\n>> \t\tpending_.remove(*deps);\n>> \t}\n>> -- \n>> Regards,\n>>\n>> Laurent Pinchart\n>>\n>> _______________________________________________\n>> libcamera-devel mailing list\n>> libcamera-devel@lists.libcamera.org\n>> https://lists.libcamera.org/listinfo/libcamera-devel\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ED17B60413\n\tfor ;\n\tMon, 23 Mar 2020 12:21:34 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2CB90308;\n\tMon, 23 Mar 2020 12:21:34 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584962494;\n\tbh=BClc6WvKtStgXuGRhhi1K7CzbsPiPSuDE9KEuXWqXyw=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=NVd/1BpLnod3lHO5GUEkjjxxXhsg8PwQqo9kAgS1pU4NnzQoUgKZw2tUhwIrCycw6\n\tP+DjWKVlvrzNlMpOmqqYc95VRLFhLvYmrilDf/MqQ8EMOczkLu9DZPSTT0adrihJy1\n\twTf6oNzba+1Vz2VwSW2QXP1P46+QSOoOo/xG6pKw=","Reply-To":"kieran.bingham@ideasonboard.com","To":"=?utf-8?q?Niklas_S=C3=B6derlund?= ,\n\tLaurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","References":"<20200320210435.8876-1-laurent.pinchart@ideasonboard.com>\n\t<20200320210435.8876-2-laurent.pinchart@ideasonboard.com>\n\t<20200323110509.GB571071@oden.dyn.berto.se>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Mon, 23 Mar 2020 11:21:32 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200323110509.GB571071@oden.dyn.berto.se>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera:\n\tdevice_enumerator_udev: Don't add media device twice","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","X-List-Received-Date":"Mon, 23 Mar 2020 11:21:35 -0000"}}]