When copying/duplicating set of properties, move smaller properties that
were stored separately directly inside property entry structures. We can
move:
- up to 8 bytes from U8 arrays
- up to 4 words
- up to 2 double words
- one U64 value
- one or 2 strings.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
---
drivers/base/swnode.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 18a30fb3cc58..49e1108aa4b7 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -280,6 +280,16 @@ static int property_entry_copy_data(struct property_entry *dst,
if (!dst->name)
goto out_free_data;
+ if (!dst->is_inline && dst->length <= sizeof(dst->value)) {
+ /* We have an opportunity to move the data inline */
+ const void *tmp = dst->pointer;
+
+ memcpy(&dst->value, tmp, dst->length);
+ dst->is_inline = true;
+
+ kfree(tmp);
+ }
+
return 0;
out_free_data:
--
2.23.0.866.gb869b98d4c-goog
