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 <m.felsch@xxxxxxxxxxxxxx>
---
common/image-fit.c | 38 +++++++++++++++++++++++++++++++++++++-
include/image-fit.h | 4 ++++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/common/image-fit.c b/common/image-fit.c
index c5c88ebe4c1e..061825f5f22c 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -18,6 +18,8 @@
#include <fnmatch.h>
#include <malloc.h>
#include <linux/ctype.h>
+#include <linux/minmax.h>
+#include <linux/refcount.h>
#include <asm/byteorder.h>
#include <errno.h>
#include <linux/err.h>
@@ -34,6 +36,8 @@
#define CHECK_LEVEL_SIG 2
#define CHECK_LEVEL_MAX 3
+LIST_HEAD(open_fits);
+
static uint32_t dt_struct_advance(struct fdt_header *f, uint32_t dt, int size)
{
dt += size;
@@ -861,6 +865,22 @@ void *fit_open_configuration(struct fit_handle *handle, const char *name)
return conf_node;
}
+static struct fit_handle *fit_get_handle(const char *filename)
+{
+ size_t query_len = strlen(filename);
+ struct fit_handle *handle;
+
+ list_for_each_entry(handle, &open_fits, entry) {
+ size_t len = strlen(handle->filename);
+
+ len = min(len, query_len);
+ if (!strncmp(filename, handle->filename, len))
+ return handle;
+ }
+
+ return NULL;
+}
+
static int fit_do_open(struct fit_handle *handle)
{
const char *desc = "(no description)";
@@ -910,6 +930,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);
@@ -937,6 +959,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;
@@ -953,6 +981,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);
@@ -964,11 +995,16 @@ 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)
+ if (handle->filename) {
free(handle->filename);
+ list_del(&handle->entry);
+ }
free(handle->fit_alloc);
free(handle);
diff --git a/include/image-fit.h b/include/image-fit.h
index 10fa3716a094..dbe621d6e091 100644
--- a/include/image-fit.h
+++ b/include/image-fit.h
@@ -7,6 +7,7 @@
#define __IMAGE_FIT_H__
#include <linux/types.h>
+#include <linux/refcount.h>
#include <bootm.h>
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
