From patchwork Mon May 22 08:35:07 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: 18644 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 726F4C31E9 for ; Mon, 22 May 2023 08:35:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5447D627DC; Mon, 22 May 2023 10:35:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1684744557; bh=zUzbFMtsdXvvxDXM+ui/p1b/35MGxQs9X2/3noCu2wo=; 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=htbd1cybnM7nXEc6S4gg+3mP4G8v9wHyfHYecwPorr3fwACx71+TzQCDTLrudLj8G rhqQUe/2j7WpPrw8ub8aT5W0elOihB2rQEc13qIRklmlQkSjORmN22WlGjML5dw+Oy njX5aNEpriJmMOqGK2BuelCbU0j/gKa0043FGmDBTihrIQGyzGSMDmT6/DXz17IuR7 EfX4+cZ0gNJ0YXxgF546uvYI9LUrAfV2CEGxjeC2RwDNKztdnxDPqLHxG7Jtylq438 6AVMZhj/Ym5ycem/DTdBLiEropHrr2QaLVwn00RZRAzA8sqVCWVx5t17EXHZmvhlOO dSEzKdfvSDucA== Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 49FF4627DC for ; Mon, 22 May 2023 10:35:55 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="OGa94fnp"; dkim-atps=neutral Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1afbc02c602so2137355ad.1 for ; Mon, 22 May 2023 01:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684744553; x=1687336553; 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=JouvgO2fyVzHl6E/gHYv6bTHugQHpSDy2GAoLY5wuro=; b=OGa94fnpm256BRVgFyBkWOWz1KziCko/FZNW5CCJ0XGTaWWTGAeDZuvHkhvH6SvlQQ LQjwor9P3/0Kyf1I7Esw8ym+S7o063GJFEc6ITxYxCEgY4O5JMxDXBY1njxl9PWAzPod LZHQ41E5b5UOskxG89MtoIn8M5Zs45F0oiIrU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684744553; x=1687336553; 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=JouvgO2fyVzHl6E/gHYv6bTHugQHpSDy2GAoLY5wuro=; b=QUrLiOk+7QFEAqPn471u12Dskvr9S/lqbw9giMLRerBgwwleaqA8OGSthBb4ZjJ266 6eG7+VH1tQcieQAIFzQ3H6rFKW6ZHWr4qNNTqDL7XJPp/jM+DJaS1e9vB4gSRgGoKwcp kDWvNs7pBQw4LdLCbpH6XIeWLW8NW+v+uQFOy/mmUfYH9+ir7IHa9CVQZPX/AGUZgcy5 qrx/VGdP8Id8i+Gv5sLI8Kw5HrJyJYKd1Kaqy6Zisc4s2PHs3QXaZbixj6BD99o3/lH4 X5ptRPCcpcUdLkNWRhyI8PNUjZaIoiC7ieaWxtEh6ZHehzfuI/aGTT38TQrzWKsCs44T vBNg== X-Gm-Message-State: AC+VfDxSYKCZuiXYLh8MA+5lCq4QUgLKOSe0yxO4Ltk/PFHJJ0zMe1Sy wRGvQdEKo/TMTMAqswNwV4+9n9Da1Y54rngYiPo= X-Google-Smtp-Source: ACHHUZ6d9Xl3FgOKz4KqrP+j0vdF3zSqKxQyoPasAB85dR9rzVxXCRGNKto9RCln80d9qwkuRykO9Q== X-Received: by 2002:a17:903:2343:b0:1ae:35b8:d5ae with SMTP id c3-20020a170903234300b001ae35b8d5aemr11504092plh.19.1684744553616; Mon, 22 May 2023 01:35:53 -0700 (PDT) Received: from chenghaoyang-low.c.googlers.com.com (27.247.221.35.bc.googleusercontent.com. [35.221.247.27]) by smtp.gmail.com with ESMTPSA id h1-20020a170902f54100b001a980a23804sm4321253plf.4.2023.05.22.01.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 01:35:53 -0700 (PDT) X-Google-Original-From: Harvey Yang To: libcamera-devel@lists.libcamera.org Date: Mon, 22 May 2023 08:35:07 +0000 Message-ID: <20230522083546.2465448-3-chenghaoyang@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230522083546.2465448-1-chenghaoyang@google.com> References: <20230522083546.2465448-1-chenghaoyang@google.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 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 --- src/libcamera/heap_allocator.cpp | 100 +++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/src/libcamera/heap_allocator.cpp b/src/libcamera/heap_allocator.cpp index 69f65062..8f99f590 100644 --- a/src/libcamera/heap_allocator.cpp +++ b/src/libcamera/heap_allocator.cpp @@ -11,10 +11,14 @@ #include #include #include +#include +#include +#include #include #include #include +#include #include @@ -54,6 +58,14 @@ public: UniqueFD alloc(const char *name, std::size_t size) override; }; +class UdmaHeap : public Heap +{ +public: + UdmaHeap(); + ~UdmaHeap(); + UniqueFD alloc(const char *name, std::size_t size) override; +}; + DmaHeap::DmaHeap() { for (const char *name : dmaHeapNames) { @@ -65,6 +77,7 @@ DmaHeap::DmaHeap() continue; } + LOG(HeapAllocator, Info) << "Using DmaHeap allocator"; handle_ = UniqueFD(ret); break; } @@ -105,9 +118,96 @@ UniqueFD DmaHeap::alloc(const char *name, std::size_t size) return allocFd; } +UdmaHeap::UdmaHeap() +{ + int ret = ::open("/dev/udmabuf", O_RDWR, 0); + if (ret < 0) { + ret = errno; + LOG(HeapAllocator, Error) + << "UdmaHeap failed to open allocator: " << strerror(ret); + } else { + LOG(HeapAllocator, Info) << "Using UdmaHeap allocator"; + handle_ = UniqueFD(ret); + } +} + +UdmaHeap::~UdmaHeap() = default; + +UniqueFD UdmaHeap::alloc(const char *name, std::size_t size) +{ + if (!isValid()) { + LOG(HeapAllocator, Fatal) << "UdmaHeap: Allocation attempted without allocator" << name; + return {}; + } + + int ret; + + ret = memfd_create(name, MFD_ALLOW_SEALING); + if (ret < 0) { + ret = errno; + LOG(HeapAllocator, Error) + << "UdmaHeap failed to allocate memfd storage: " + << strerror(ret); + return {}; + } + + UniqueFD memfd(ret); + + ret = ftruncate(memfd.get(), size); + if (ret < 0) { + ret = errno; + LOG(HeapAllocator, Error) + << "UdmaHeap 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(HeapAllocator, Error) + << "UdmaHeap 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(HeapAllocator, Error) + << "UdmaHeap 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(HeapAllocator, Warning) + << "UdmaHeap 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(HeapAllocator, Debug) << "UdmaHeap allocated " << create.size << " bytes"; + + return uDma; +} + HeapAllocator::HeapAllocator() { heap_ = std::make_unique(); + if (!isValid()) + heap_ = std::make_unique(); } HeapAllocator::~HeapAllocator() = default;