From patchwork Tue Mar 28 09:55:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Hao Yang X-Patchwork-Id: 18487 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 1B54EC0F2A for ; Tue, 28 Mar 2023 09:55:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 13BDA62756; Tue, 28 Mar 2023 11:55:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1679997344; bh=Z1Mpl+qw1ze/oi6AZWCNx6OjkpDpzzECPjhC2lq7LPY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=DygWzgTwo2/zbpOMHLOGADMBY363/3kf7gc+s6SRJxIOfoU4BiUVx3fdxhD48H70o c5WH5OWB99sVMQvWjImpec6vq+Qf48cJkzDrzY9KgK79M+DQWH3ZDU+H2Yd3cj1g48 3UdH5/7DJfeYV0GVV8lBU2omVISr54uP2MLbBlua7ORqMi+6rogx4xMpRFlIJXA5e4 nhgAUiYneU+/Gvqqd/vfsU6tYkTCyIZciArvac/sNjandGVlkjTunFSnTGdbiPVvoy f4eEWdxHZkbJbnTmIE5JdiKxUij9Qp1vnO2gZPCBMplayiDLOAGyd/JLQGwgtmzaeu UUJgQWvx81+gw== Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 275D262749 for ; Tue, 28 Mar 2023 11:55:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="m9VnCz3v"; dkim-atps=neutral Received: by mail-pl1-x632.google.com with SMTP id u10so11116751plz.7 for ; Tue, 28 Mar 2023 02:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679997339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4A9iq5ROqHE9gJpemOtkccgsirtSYRj6290oe2xGeM8=; b=m9VnCz3vVWZmfzTeyVBKKG/ah+mTY+KGPXP3uL4dKtLzveD+Cf3AQ84ay95+BZYP7B ed7LXdL5tLEhXYTUJaULcMjwbvhvpIVFCIt7U0RR4NFFU2ZYN1jDzYktoybjtZg0IM0N W6aqWRahZcAGh8DeZPOHN83JTaFGVdPcLsvq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679997339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4A9iq5ROqHE9gJpemOtkccgsirtSYRj6290oe2xGeM8=; b=IVmQ9KfKAxqfR9hxW1BM/zVZKkEXlHsnMygf359W1Gp8tYfQJDbs/eIUkbGMYngzIk Rnn0UBwFDz1EHuYaMuEYbeIrXrt1pXeJ3Od4w04irHFbfLK5jDkw0WDwFxNx1Z1L2nFl kN4wHyGLsJAN6MkxCNgrRkO6g0/7bhvOnLkhTxLgmfFvm8qTN3ReCwEa8QTvfFmmRXov Wl2tY24Xvx/u8v3LC9TSPHbLPdGCcsbb/p2ApLoXw1oNfVwvwJUR9nyfDqJCnH0CLe2W uWqNCWuRoBdAFxIX1iyF1FIkpjzCJMKC6wT67xGSn7KWBcwr2dzIHmzxqsJQ5Mn83zzF 1+aQ== X-Gm-Message-State: AO0yUKWvszMRKoNZdiip9xk0b66+Cnh8/7voBOM79UAfm9/tS7/wPfw3 C2C+O7I05LM5nRdCrLGR+g9yTlzNCLSdXHshbOECNA== X-Google-Smtp-Source: AK7set89nZKlp+qdTme1kOQqjTVUIGhSZx1yz7JTMiURACpW9EV19uLR4jkrO/9o4D45/ybFGyON3g== X-Received: by 2002:a05:6a20:1aa1:b0:d9:11d2:383f with SMTP id ci33-20020a056a201aa100b000d911d2383fmr11725740pzb.53.1679997339366; Tue, 28 Mar 2023 02:55:39 -0700 (PDT) Received: from harveyyang.localdomain (1-163-26-93.dynamic-ip.hinet.net. [1.163.26.93]) by smtp.gmail.com with ESMTPSA id v21-20020aa78515000000b006259beddb63sm20241488pfn.44.2023.03.28.02.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 02:55:39 -0700 (PDT) X-Google-Original-From: Harvey Yang To: libcamera-devel@lists.libcamera.org Date: Tue, 28 Mar 2023 17:55:33 +0800 Message-Id: <20230328095534.3584-3-harveyycyang@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230328095534.3584-1-harveyycyang@gmail.com> References: <20230328095534.3584-1-harveyycyang@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 2/3] libcamera: Add UdmaHeap if DmaHeap is not valid X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harvey Yang via libcamera-devel From: Cheng-Hao Yang Reply-To: Harvey Yang Cc: Cheng-Hao Yang Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Cheng-Hao Yang If DmaHeap is not valid, fall back to UdmaHeap to allocate buffers. Signed-off-by: Harvey Yang --- include/libcamera/meson.build | 1 + include/libcamera/udma_heap.h | 20 ++++++ src/libcamera/heap_allocator.cpp | 3 + src/libcamera/meson.build | 1 + src/libcamera/udma_heap.cpp | 117 +++++++++++++++++++++++++++++++ 5 files changed, 142 insertions(+) create mode 100644 include/libcamera/udma_heap.h create mode 100644 src/libcamera/udma_heap.cpp diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index f486630a..a1414a57 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -19,6 +19,7 @@ libcamera_public_headers = files([ 'request.h', 'stream.h', 'transform.h', + 'udma_heap.h', ]) subdir('base') diff --git a/include/libcamera/udma_heap.h b/include/libcamera/udma_heap.h new file mode 100644 index 00000000..3ae46dc7 --- /dev/null +++ b/include/libcamera/udma_heap.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2023, Ideas on Board Oy + * + * udma_heap.h - Udma Heap implementation. + */ + +#include + +namespace libcamera { + +class UdmaHeap : public Heap +{ +public: + UdmaHeap(); + ~UdmaHeap(); + UniqueFD alloc(const char *name, std::size_t size) override; +}; + +} /* namespace libcamera */ diff --git a/src/libcamera/heap_allocator.cpp b/src/libcamera/heap_allocator.cpp index 594b1d6a..179c2c21 100644 --- a/src/libcamera/heap_allocator.cpp +++ b/src/libcamera/heap_allocator.cpp @@ -18,6 +18,7 @@ #include #include +#include namespace libcamera { @@ -26,6 +27,8 @@ LOG_DEFINE_CATEGORY(HeapAllocator) HeapAllocator::HeapAllocator() { heap_ = std::make_unique(); + if (!isValid()) + heap_ = std::make_unique(); } HeapAllocator::~HeapAllocator() = default; diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index ee586c0d..bce26d4b 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -45,6 +45,7 @@ libcamera_sources = files([ 'stream.cpp', 'sysfs.cpp', 'transform.cpp', + 'udma_heap.cpp', 'v4l2_device.cpp', 'v4l2_pixelformat.cpp', 'v4l2_subdevice.cpp', diff --git a/src/libcamera/udma_heap.cpp b/src/libcamera/udma_heap.cpp new file mode 100644 index 00000000..050ab80f --- /dev/null +++ b/src/libcamera/udma_heap.cpp @@ -0,0 +1,117 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2023, Ideas on Board Oy + * + * dma_heap.h - Dma Heap implementation. + */ + +#include + +#include +#include +#include +#include +#include +#include + +#include + +#include + +namespace libcamera { + +LOG_DEFINE_CATEGORY(UdmaHeap) + +UdmaHeap::UdmaHeap() +{ + int ret = ::open("/dev/udmabuf", O_RDWR, 0); + if (ret < 0) { + ret = errno; + LOG(UdmaHeap, Error) + << "Failed to open allocator: " << strerror(ret); + + if (ret == EACCES) { + LOG(UdmaHeap, Info) + << "Consider making /dev/udmabuf accessible by the video group"; + LOG(UdmaHeap, Info) + << "Alternatively, add your user to the kvm group."; + } + + } else { + handle_ = UniqueFD(ret); + } +} + +UdmaHeap::~UdmaHeap() = default; + +UniqueFD UdmaHeap::alloc(const char *name, std::size_t size) +{ + if (!isValid()) { + LOG(UdmaHeap, Fatal) << "Allocation attempted without allocator" << name; + return {}; + } + + int ret; + + ret = memfd_create(name, MFD_ALLOW_SEALING); + if (ret < 0) { + ret = errno; + LOG(UdmaHeap, Error) + << "Failed to allocate memfd storage: " + << strerror(ret); + return {}; + } + + UniqueFD memfd(ret); + + ret = ftruncate(memfd.get(), size); + if (ret < 0) { + ret = errno; + LOG(UdmaHeap, Error) + << "Failed to set memfd size: " << strerror(ret); + return {}; + } + + /* UdmaHeap Buffers *must* have the F_SEAL_SHRINK seal */ + ret = fcntl(memfd.get(), F_ADD_SEALS, F_SEAL_SHRINK); + if (ret < 0) { + ret = errno; + LOG(UdmaHeap, Error) + << "Failed to seal the memfd: " << strerror(ret); + return {}; + } + + struct udmabuf_create create; + + create.memfd = memfd.get(); + create.flags = UDMABUF_FLAGS_CLOEXEC; + create.offset = 0; + create.size = size; + + ret = ::ioctl(handle_.get(), UDMABUF_CREATE, &create); + if (ret < 0) { + ret = errno; + LOG(UdmaHeap, Error) + << "Failed to allocate " << size << " bytes: " + << strerror(ret); + return {}; + } + + /* The underlying memfd is kept as as a reference in the kernel */ + UniqueFD uDma(ret); + + if (create.size != size) + LOG(UdmaHeap, Warning) + << "Allocated " << create.size << " bytes instead of " + << size << " bytes"; + + /* Fail if not suitable, the allocation will be free'd by UniqueFD */ + if (create.size < size) + return {}; + + LOG(UdmaHeap, Debug) << "Allocated " << create.size << " bytes"; + + return uDma; +} + +} /* namespace libcamera */