[{"id":19014,"web_url":"https://patchwork.libcamera.org/comment/19014/","msgid":"","date":"2021-08-23T22:30:30","subject":"Re: [libcamera-devel] [RFC PATCH v2 03/10] libcamera:\n\tmapped_framebuffer: Return plane begin address by\n\tMappedBuffer::maps()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Mon, Aug 23, 2021 at 10:12:14PM +0900, Hirokazu Honda wrote:\n> MappedBuffer::maps() returns std::vector.\n> Plane has the address, but the address points the beginning of the\n> buffer containing the plane.\n> This makes the Plane point the beginning of the plane. So\n> MappedBuffer::maps()[i].data() returns the address of i-th plane.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> .../libcamera/internal/mapped_framebuffer.h | 4 +-\n> src/libcamera/mapped_framebuffer.cpp | 69 ++++++++++++++++---\n> 2 files changed, 62 insertions(+), 11 deletions(-)\n> \n> diff --git a/include/libcamera/internal/mapped_framebuffer.h b/include/libcamera/internal/mapped_framebuffer.h\n> index 3401a9fc..42479541 100644\n> --- a/include/libcamera/internal/mapped_framebuffer.h\n> +++ b/include/libcamera/internal/mapped_framebuffer.h\n> @@ -30,12 +30,14 @@ public:\n> \n> \tbool isValid() const { return error_ == 0; }\n> \tint error() const { return error_; }\n> -\tconst std::vector &maps() const { return maps_; }\n> +\t/* \\todo rename to planes(). */\n> +\tconst std::vector &maps() const { return planes_; }\n> \n> protected:\n> \tMappedBuffer();\n> \n> \tint error_;\n> +\tstd::vector planes_;\n> \tstd::vector maps_;\n> \n> private:\n> diff --git a/src/libcamera/mapped_framebuffer.cpp b/src/libcamera/mapped_framebuffer.cpp\n> index 2ebe9fdb..03425dea 100644\n> --- a/src/libcamera/mapped_framebuffer.cpp\n> +++ b/src/libcamera/mapped_framebuffer.cpp\n> @@ -7,8 +7,11 @@\n> \n> #include \"libcamera/internal/mapped_framebuffer.h\"\n> \n> +#include \n> #include \n> +#include \n> #include \n> +#include \n> \n> #include \n> \n> @@ -79,6 +82,7 @@ MappedBuffer::MappedBuffer(MappedBuffer &&other)\n> MappedBuffer &MappedBuffer::operator=(MappedBuffer &&other)\n> {\n> \terror_ = other.error_;\n> +\tplanes_ = std::move(other.planes_);\n> \tmaps_ = std::move(other.maps_);\n> \tother.error_ = -ENOENT;\n> \n> @@ -127,10 +131,18 @@ MappedBuffer::~MappedBuffer()\n> */\n> \n> /**\n> - * \\var MappedBuffer::maps_\n> + * \\var MappedBuffer::planes_\n> * \\brief Stores the internal mapped planes\n> *\n> * MappedBuffer derived classes shall store the mappings they create in this\n> + * vector which points the beginning of mapped plane addresses.\n> + */\n> +\n> +/**\n> + * \\var MappedBuffer::maps_\n> + * \\brief Stores the mapped buffer\n> + *\n> + * MappedBuffer derived classes shall store the mappings they create in this\n> * vector which is parsed during destruct to unmap any memory mappings which\n> * completed successfully.\n> */\n> @@ -167,7 +179,8 @@ MappedBuffer::~MappedBuffer()\n> */\n> MappedFrameBuffer::MappedFrameBuffer(const FrameBuffer *buffer, MapFlags flags)\n> {\n> -\tmaps_.reserve(buffer->planes().size());\n> +\tASSERT(!buffer->planes().empty());\n> +\tplanes_.reserve(buffer->planes().size());\n> \n> \tint mmapFlags = 0;\n> \n> @@ -177,17 +190,53 @@ MappedFrameBuffer::MappedFrameBuffer(const FrameBuffer *buffer, MapFlags flags)\n> \tif (flags & MapFlag::Write)\n> \t\tmmapFlags |= PROT_WRITE;\n> \n> +\tstruct MappedBufferInfo {\n> +\t\tuint8_t *address = nullptr;\n> +\t\tsize_t mapLength = 0;\n> +\t\tsize_t dmabufLength = 0;\n> +\t};\n> +\tstd::map mappedBuffers;\n> +\tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n> +\t\tconst int fd = plane.fd.fd();\n> +\t\tif (mappedBuffers.find(fd) == mappedBuffers.end()) {\n> +\t\t\tconst size_t length = lseek(fd, 0, SEEK_END);\n> +\t\t\tmappedBuffers[fd] = MappedBufferInfo{ nullptr, 0, length };\n> +\t\t}\n> +\n> +\t\tconst size_t length = mappedBuffers[fd].dmabufLength;\n> +\n> +\t\tif (plane.offset > length ||\n> +\t\t plane.offset + plane.length > length) {\n> +\t\t\tLOG(Buffer, Fatal) << \"plane is out of buffer: \"\n> +\t\t\t\t\t << \"buffer length=\" << length\n> +\t\t\t\t\t << \", plane offset=\" << plane.offset\n> +\t\t\t\t\t << \", plane length=\" << plane.length;\n> +\t\t\treturn;\n> +\t\t}\n> +\t\tsize_t &mapLength = mappedBuffers[fd].mapLength;\n> +\t\tmapLength = std::max(mapLength,\n> +\t\t\t\t static_cast(plane.offset + plane.length));\n> +\t}\n> +\n> \tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n> -\t\tvoid *address = mmap(nullptr, plane.length, mmapFlags,\n> -\t\t\t\t MAP_SHARED, plane.fd.fd(), 0);\n> -\t\tif (address == MAP_FAILED) {\n> -\t\t\terror_ = -errno;\n> -\t\t\tLOG(Buffer, Error) << \"Failed to mmap plane: \"\n> -\t\t\t\t\t << strerror(-error_);\n> -\t\t\tbreak;\n> +\t\tconst int fd = plane.fd.fd();\n> +\t\tauto &info = mappedBuffers[fd];\n> +\t\tif (!info.address) {\n> +\t\t\tinfo.address =\n> +\t\t\t\tstatic_cast(\n> +\t\t\t\t\tmmap(nullptr, info.mapLength, mmapFlags,\n> +\t\t\t\t\t MAP_SHARED, fd, 0));\n> +\t\t\tif (info.address == MAP_FAILED) {\n\nI think the following would be more readable:\n\n\t\t\tvoid *addr = mmap(nullptr, info.mapLength, mmapFlags,\n\t\t\t\t\t MAP_SHARED, fd, 0));\n\t\t\tif (addr == MAP_FAILED) {\n\t\t\t\t...\n\t\t\t}\n\n\t\t\tinfo.address = static_cast(addr);\n\nOverall the patch looks quite elegant to me :-)\n\nReviewed-by: Laurent Pinchart \n\n> +\t\t\t\terror_ = -errno;\n> +\t\t\t\tLOG(Buffer, Error) << \"Failed to mmap plane: \"\n> +\t\t\t\t\t\t << strerror(-error_);\n> +\t\t\t\treturn;\n> +\t\t\t}\n> +\n> +\t\t\tmaps_.emplace_back(info.address, info.mapLength);\n> \t\t}\n> \n> -\t\tmaps_.emplace_back(static_cast(address), plane.length);\n> +\t\tplanes_.emplace_back(info.address + plane.offset, plane.length);\n> \t}\n> }\n>","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 30497BD87D\n\tfor ;\n\tMon, 23 Aug 2021 22:30:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 70992688A3;\n\tTue, 24 Aug 2021 00:30:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4138D68890\n\tfor ;\n\tTue, 24 Aug 2021 00:30:41 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BB9372A5;\n\tTue, 24 Aug 2021 00:30:40 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gIzjHb0C\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629757840;\n\tbh=G0bhmqezZd3fh5qUTzwLYvadFJrMCzCvouI8a6WFY0k=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gIzjHb0COedj2PmiwvxS7TJ/4XD5R6I4S6gIGbwL8hV2UhRtpcIe8rorgKKfjC/gE\n\tW75KYi70xju/qJyDziadZPoJFVKkOjkrYjTej4ZXcD9pqQht7G5DrObfoxc5e25T4k\n\t58OnBzzOyG+2yCMYnhNXy2UiORTcukv4tsMgbN8w=","Date":"Tue, 24 Aug 2021 01:30:30 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210823131221.1034059-1-hiroh@chromium.org>\n\t<20210823131221.1034059-4-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210823131221.1034059-4-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [RFC PATCH v2 03/10] libcamera:\n\tmapped_framebuffer: Return plane begin address by\n\tMappedBuffer::maps()","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":19028,"web_url":"https://patchwork.libcamera.org/comment/19028/","msgid":"","date":"2021-08-24T15:49:32","subject":"Re: [libcamera-devel] [RFC PATCH v2 03/10] libcamera:\n\tmapped_framebuffer: Return plane begin address by\n\tMappedBuffer::maps()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nOn Tue, Aug 24, 2021 at 01:30:32AM +0300, Laurent Pinchart wrote:\n> Hi Hiro,\n> \n> Thank you for the patch.\n> \n> On Mon, Aug 23, 2021 at 10:12:14PM +0900, Hirokazu Honda wrote:\n> > MappedBuffer::maps() returns std::vector.\n> > Plane has the address, but the address points the beginning of the\n> > buffer containing the plane.\n> > This makes the Plane point the beginning of the plane. So\n> > MappedBuffer::maps()[i].data() returns the address of i-th plane.\n> > \n> > Signed-off-by: Hirokazu Honda \n> > ---\n> > .../libcamera/internal/mapped_framebuffer.h | 4 +-\n> > src/libcamera/mapped_framebuffer.cpp | 69 ++++++++++++++++---\n> > 2 files changed, 62 insertions(+), 11 deletions(-)\n> > \n> > diff --git a/include/libcamera/internal/mapped_framebuffer.h b/include/libcamera/internal/mapped_framebuffer.h\n> > index 3401a9fc..42479541 100644\n> > --- a/include/libcamera/internal/mapped_framebuffer.h\n> > +++ b/include/libcamera/internal/mapped_framebuffer.h\n> > @@ -30,12 +30,14 @@ public:\n> > \n> > \tbool isValid() const { return error_ == 0; }\n> > \tint error() const { return error_; }\n> > -\tconst std::vector &maps() const { return maps_; }\n> > +\t/* \\todo rename to planes(). */\n> > +\tconst std::vector &maps() const { return planes_; }\n> > \n> > protected:\n> > \tMappedBuffer();\n> > \n> > \tint error_;\n> > +\tstd::vector planes_;\n> > \tstd::vector maps_;\n> > \n> > private:\n> > diff --git a/src/libcamera/mapped_framebuffer.cpp b/src/libcamera/mapped_framebuffer.cpp\n> > index 2ebe9fdb..03425dea 100644\n> > --- a/src/libcamera/mapped_framebuffer.cpp\n> > +++ b/src/libcamera/mapped_framebuffer.cpp\n> > @@ -7,8 +7,11 @@\n> > \n> > #include \"libcamera/internal/mapped_framebuffer.h\"\n> > \n> > +#include \n> > #include \n> > +#include \n> > #include \n> > +#include \n> > \n> > #include \n> > \n> > @@ -79,6 +82,7 @@ MappedBuffer::MappedBuffer(MappedBuffer &&other)\n> > MappedBuffer &MappedBuffer::operator=(MappedBuffer &&other)\n> > {\n> > \terror_ = other.error_;\n> > +\tplanes_ = std::move(other.planes_);\n> > \tmaps_ = std::move(other.maps_);\n> > \tother.error_ = -ENOENT;\n> > \n> > @@ -127,10 +131,18 @@ MappedBuffer::~MappedBuffer()\n> > */\n> > \n> > /**\n> > - * \\var MappedBuffer::maps_\n> > + * \\var MappedBuffer::planes_\n> > * \\brief Stores the internal mapped planes\n> > *\n> > * MappedBuffer derived classes shall store the mappings they create in this\n> > + * vector which points the beginning of mapped plane addresses.\n> > + */\n> > +\n> > +/**\n> > + * \\var MappedBuffer::maps_\n> > + * \\brief Stores the mapped buffer\n> > + *\n> > + * MappedBuffer derived classes shall store the mappings they create in this\n> > * vector which is parsed during destruct to unmap any memory mappings which\n> > * completed successfully.\n> > */\n> > @@ -167,7 +179,8 @@ MappedBuffer::~MappedBuffer()\n> > */\n> > MappedFrameBuffer::MappedFrameBuffer(const FrameBuffer *buffer, MapFlags flags)\n> > {\n> > -\tmaps_.reserve(buffer->planes().size());\n> > +\tASSERT(!buffer->planes().empty());\n> > +\tplanes_.reserve(buffer->planes().size());\n> > \n> > \tint mmapFlags = 0;\n> > \n> > @@ -177,17 +190,53 @@ MappedFrameBuffer::MappedFrameBuffer(const FrameBuffer *buffer, MapFlags flags)\n> > \tif (flags & MapFlag::Write)\n> > \t\tmmapFlags |= PROT_WRITE;\n> > \n> > +\tstruct MappedBufferInfo {\n> > +\t\tuint8_t *address = nullptr;\n> > +\t\tsize_t mapLength = 0;\n> > +\t\tsize_t dmabufLength = 0;\n> > +\t};\n> > +\tstd::map mappedBuffers;\n> > +\tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n> > +\t\tconst int fd = plane.fd.fd();\n> > +\t\tif (mappedBuffers.find(fd) == mappedBuffers.end()) {\n> > +\t\t\tconst size_t length = lseek(fd, 0, SEEK_END);\n> > +\t\t\tmappedBuffers[fd] = MappedBufferInfo{ nullptr, 0, length };\n> > +\t\t}\n> > +\n> > +\t\tconst size_t length = mappedBuffers[fd].dmabufLength;\n> > +\n> > +\t\tif (plane.offset > length ||\n> > +\t\t plane.offset + plane.length > length) {\n> > +\t\t\tLOG(Buffer, Fatal) << \"plane is out of buffer: \"\n> > +\t\t\t\t\t << \"buffer length=\" << length\n> > +\t\t\t\t\t << \", plane offset=\" << plane.offset\n> > +\t\t\t\t\t << \", plane length=\" << plane.length;\n\nBy the way, this patch breaks multiple unit tests:\n\n[192:35:55.294272353] [19738] FATAL Buffer mapped_framebuffer.cpp:210 plane is out of buffer: buffer length=6221824, plane offset=969921872, plane length=6220800\n\nThe issue is fixed later on in the series, in patch 08/10. It would be\nnice to avoid breaking bisection, which I think can simply be done by\nmoving the plane.offset = 0 in v4l2_videodevice.cpp from patch 08/10 to\n01/10.\n\nThe reason I noticed is that the V4L2 buffer cache unit test is broken\nby the series in 08/10, and I tried to check if 07/10 worked properly.\n\n> > +\t\t\treturn;\n> > +\t\t}\n> > +\t\tsize_t &mapLength = mappedBuffers[fd].mapLength;\n> > +\t\tmapLength = std::max(mapLength,\n> > +\t\t\t\t static_cast(plane.offset + plane.length));\n> > +\t}\n> > +\n> > \tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n> > -\t\tvoid *address = mmap(nullptr, plane.length, mmapFlags,\n> > -\t\t\t\t MAP_SHARED, plane.fd.fd(), 0);\n> > -\t\tif (address == MAP_FAILED) {\n> > -\t\t\terror_ = -errno;\n> > -\t\t\tLOG(Buffer, Error) << \"Failed to mmap plane: \"\n> > -\t\t\t\t\t << strerror(-error_);\n> > -\t\t\tbreak;\n> > +\t\tconst int fd = plane.fd.fd();\n> > +\t\tauto &info = mappedBuffers[fd];\n> > +\t\tif (!info.address) {\n> > +\t\t\tinfo.address =\n> > +\t\t\t\tstatic_cast(\n> > +\t\t\t\t\tmmap(nullptr, info.mapLength, mmapFlags,\n> > +\t\t\t\t\t MAP_SHARED, fd, 0));\n> > +\t\t\tif (info.address == MAP_FAILED) {\n> \n> I think the following would be more readable:\n> \n> \t\t\tvoid *addr = mmap(nullptr, info.mapLength, mmapFlags,\n> \t\t\t\t\t MAP_SHARED, fd, 0));\n> \t\t\tif (addr == MAP_FAILED) {\n> \t\t\t\t...\n> \t\t\t}\n> \n> \t\t\tinfo.address = static_cast(addr);\n> \n> Overall the patch looks quite elegant to me :-)\n> \n> Reviewed-by: Laurent Pinchart \n> \n> > +\t\t\t\terror_ = -errno;\n> > +\t\t\t\tLOG(Buffer, Error) << \"Failed to mmap plane: \"\n> > +\t\t\t\t\t\t << strerror(-error_);\n> > +\t\t\t\treturn;\n> > +\t\t\t}\n> > +\n> > +\t\t\tmaps_.emplace_back(info.address, info.mapLength);\n> > \t\t}\n> > \n> > -\t\tmaps_.emplace_back(static_cast(address), plane.length);\n> > +\t\tplanes_.emplace_back(info.address + plane.offset, plane.length);\n> > \t}\n> > }\n> >","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 118FCBD87D\n\tfor ;\n\tTue, 24 Aug 2021 15:49:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6E4BC68892;\n\tTue, 24 Aug 2021 17:49:45 +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 ECEBC60505\n\tfor ;\n\tTue, 24 Aug 2021 17:49:43 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 614102A5;\n\tTue, 24 Aug 2021 17:49:43 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"EKKU96Zn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629820183;\n\tbh=hlPbbRCWrDkfOWCCqOhpKgDJZdt75cPxrzErVFQ356g=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=EKKU96ZnQhluwtWWiSAh0AOdcZUqjGW8WzgpkvkEzD5taC43bSJPdmNYSJn5JEQwp\n\tLdNa9BfaanMaB0IQJda+jVcmfgyHofpWKqwnUSrWgLUaM4x6B/7Zv+yOA8X39OxYhR\n\tkikYhlmzJSG7QkTgfVVggOOPUmFdg5hju34BMLVU=","Date":"Tue, 24 Aug 2021 18:49:32 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210823131221.1034059-1-hiroh@chromium.org>\n\t<20210823131221.1034059-4-hiroh@chromium.org>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [RFC PATCH v2 03/10] libcamera:\n\tmapped_framebuffer: Return plane begin address by\n\tMappedBuffer::maps()","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]