From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 03 Jul 2024 18:59:58 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sP3Ko-001EaN-0C for lore@lore.pengutronix.de; Wed, 03 Jul 2024 18:59:58 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sP3Kn-0005Sk-11 for lore@pengutronix.de; Wed, 03 Jul 2024 18:59:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nYpnK3JdnXDKYzqrhlKaybP149Jr5UVoD1lZGL/KQac=; b=h5xj19vP/mAyVwb/5NV9lALi0z 3ruAHlAgPNr69YDp2LY22eE/2QbibdiKJEnvLx0CkytcV8aljEvD4/KBRBqKKuRIA/kNojZ5Juuvn kCO2vHXZkkzNUPrrWkshy8AKS+wADmYLkQG+EAJOApZ3L2mqJ8vIzkbeU9ULAPQm008fg1/2b+jFd i0vB3LAE/LkEVpVPFk/N85AKysCkmwRgLR+K07+pL+JswfDWby179UhCpvd3GBfCXgo6Qp+VxZDAG ra/VBMpU065e87myKseGIDidrOoFWeLrrNt7P1uWowGuligF81RZV/ibQVaNU9N1WA4IEoMLTHum4 /7YPy25A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP3K8-0000000Av94-0spE; Wed, 03 Jul 2024 16:59:16 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP3Jx-0000000Av2B-3KDc for barebox@lists.infradead.org; Wed, 03 Jul 2024 16:59:08 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sP3Jr-0004uJ-Ii; Wed, 03 Jul 2024 18:58:59 +0200 From: Marco Felsch Date: Wed, 03 Jul 2024 18:58:38 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240703-v2024-05-0-topic-fit-overlay-v3-10-c1fd766fd31d@pengutronix.de> References: <20240703-v2024-05-0-topic-fit-overlay-v3-0-c1fd766fd31d@pengutronix.de> In-Reply-To: <20240703-v2024-05-0-topic-fit-overlay-v3-0-c1fd766fd31d@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Marco Felsch X-Mailer: b4 0.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240703_095905_960997_F86770FB X-CRM114-Status: GOOD ( 13.33 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v3 10/10] FIT: add support to cache opened fit images X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Cache the FIT image fit_open() calls to avoid loading the same FIT image twice. This is very useful if the same FIT image is used to provide the base devicetree, kernel and initrd as well as devicetree overlays. Signed-off-by: Marco Felsch --- common/image-fit.c | 32 ++++++++++++++++++++++++++++++++ include/image-fit.h | 4 ++++ 2 files changed, 36 insertions(+) diff --git a/common/image-fit.c b/common/image-fit.c index 4839d8dd33a4..a75bb79d1761 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -32,6 +33,8 @@ #define CHECK_LEVEL_SIG 2 #define CHECK_LEVEL_MAX 3 +static LIST_HEAD(open_fits); + static uint32_t dt_struct_advance(struct fdt_header *f, uint32_t dt, int size) { dt += size; @@ -847,6 +850,18 @@ void *fit_open_configuration(struct fit_handle *handle, const char *name, return conf_node; } +static struct fit_handle *fit_get_handle(const char *filename) +{ + struct fit_handle *handle; + + list_for_each_entry(handle, &open_fits, entry) { + if (!strcmp(filename, handle->filename)) + return handle; + } + + return NULL; +} + static int fit_do_open(struct fit_handle *handle) { const char *desc = "(no description)"; @@ -896,6 +911,8 @@ struct fit_handle *fit_open_buf(const void *buf, size_t size, bool verbose, handle->size = size; handle->verify = verify; + refcount_set(&handle->users, 1); + ret = fit_do_open(handle); if (ret) { fit_close(handle); @@ -923,6 +940,12 @@ struct fit_handle *fit_open(const char *filename, bool verbose, struct fit_handle *handle; int ret; + handle = fit_get_handle(filename); + if (handle) { + refcount_inc(&handle->users); + return handle; + } + handle = xzalloc(sizeof(struct fit_handle)); handle->verbose = verbose; @@ -939,6 +962,9 @@ struct fit_handle *fit_open(const char *filename, bool verbose, handle->fit = handle->fit_alloc; handle->filename = xstrdup(filename); + refcount_set(&handle->users, 1); + list_add(&handle->entry, &open_fits); + ret = fit_do_open(handle); if (ret) { fit_close(handle); @@ -950,9 +976,15 @@ struct fit_handle *fit_open(const char *filename, bool verbose, void fit_close(struct fit_handle *handle) { + if (!refcount_dec_and_test(&handle->users)) + return; + if (handle->root) of_delete_node(handle->root); + if (handle->filename) + list_del(&handle->entry); + free(handle->filename); free(handle->fit_alloc); free(handle); diff --git a/include/image-fit.h b/include/image-fit.h index 68f70f4365cb..f9791ff251c5 100644 --- a/include/image-fit.h +++ b/include/image-fit.h @@ -7,6 +7,7 @@ #define __IMAGE_FIT_H__ #include +#include #include struct fit_handle { @@ -15,6 +16,9 @@ struct fit_handle { size_t size; char *filename; + struct list_head entry; + refcount_t users; + bool verbose; enum bootm_verify verify; -- 2.39.2