[OSS-Tools] [PATCH dt-utils 6/6] state: backend_bucket_direct: add debug prints on read/write

[Marco Felsch]

This ports barebox commit:

| commit 2cc9777631ac22e2f8831727a7463000ba83c80e
| Author: Ahmad Fatoum <a.fat...@pengutronix.de>
| Date:   Fri Jul 28 15:31:58 2023 +0200
|
|     state: backend_bucket_direct: add debug prints on read/write
|
|     We already have debug prints for the circular backend to help see how
|     much data is read/written for each bucket. Add similar debugging info
|     for the direct backend as well. Example with stride size of 2048 and
|     44 bytes for the variable set:
|
|       barebox@board:/ state -l
|       state: Read state from 0 length 68
|       state: Read state from 2048 length 68
|       state: Read state from 4096 length 68
|
|       barebox@board:/ state -s
|       state: Written state to offset 0 length 68 data length 60
|       state: Written state to offset 2048 length 68 data length 60
|       state: Written state to offset 4096 length 68 data length 60
|
|     Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
|     Reviewed-by: Johannes Zink <j.z...@pengutronix.de>
|     Link: 
https://lore.barebox.org/20230728133158.3828436-1-a.fat...@pengutronix.de
|     Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>

Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
 src/barebox-state/backend_bucket_direct.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/barebox-state/backend_bucket_direct.c 
b/src/barebox-state/backend_bucket_direct.c
index bf060ebed4c0..3e756e21dd41 100644
--- a/src/barebox-state/backend_bucket_direct.c
+++ b/src/barebox-state/backend_bucket_direct.c
@@ -53,7 +53,7 @@ static int state_backend_bucket_direct_read(struct 
state_backend_storage_bucket
        struct state_backend_storage_bucket_direct *direct =
            get_bucket_direct(bucket);
        struct state_backend_storage_bucket_direct_meta meta;
-       uint32_t read_len;
+       uint32_t read_len, header_len = 0;
        void *buf;
        int ret;
 
@@ -73,6 +73,8 @@ static int state_backend_bucket_direct_read(struct 
state_backend_storage_bucket
                        return -EINVAL;
 
                }
+
+               header_len = sizeof(meta);
        } else {
                if (meta.magic != ~0 && !!meta.magic)
                        bucket->wrong_magic = 1;
@@ -88,12 +90,16 @@ static int state_backend_bucket_direct_read(struct 
state_backend_storage_bucket
                                -errno);
                        return -errno;
                }
+
        }
 
        buf = xmalloc(read_len);
        if (!buf)
                return -ENOMEM;
 
+       dev_dbg(direct->dev, "Read state from %lld length %d\n", (long long) 
direct->offset,
+               header_len + read_len);
+
        ret = read_full(direct->fd, buf, read_len);
        if (ret < 0) {
                dev_err(direct->dev, "Failed to read from file, %d\n", ret);
@@ -113,6 +119,7 @@ static int state_backend_bucket_direct_write(struct 
state_backend_storage_bucket
 {
        struct state_backend_storage_bucket_direct *direct =
            get_bucket_direct(bucket);
+       size_t header_len = 0;
        int ret;
        struct state_backend_storage_bucket_direct_meta meta;
 
@@ -130,6 +137,8 @@ static int state_backend_bucket_direct_write(struct 
state_backend_storage_bucket
                        dev_err(direct->dev, "Failed to write metadata to file, 
%d\n", ret);
                        return ret;
                }
+
+               header_len = sizeof(meta);
        } else {
                if (!IS_ENABLED(CONFIG_STATE_BACKWARD_COMPATIBLE)) {
                        dev_dbg(direct->dev, "Too small stride size: must skip 
metadata! Increase stride size\n");
@@ -149,6 +158,9 @@ static int state_backend_bucket_direct_write(struct 
state_backend_storage_bucket
                return ret;
        }
 
+       dev_dbg(direct->dev, "Written state to offset %lld length %zu data 
length %zu\n",
+               (long long)direct->offset, len + header_len, len);
+
        return 0;
 }
 
-- 
2.39.2