| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20241209151830.95723-8-herve.codina@bootlin.com>
Date: Mon, 9 Dec 2024 16:18:25 +0100
From: Herve Codina <herve.codina@...tlin.com>
To: Andrew Davis <afd@...com>,
Ayush Singh <ayush@...gleboard.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Herve Codina <herve.codina@...tlin.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Saravana Kannan <saravanak@...gle.com>
Cc: devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org,
Luca Ceresoli <luca.ceresoli@...tlin.com>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>
Subject: [PATCH 7/7] of: unittest: Add tests for export symbols
The export symbols feature allows to use some additional symbols
provided in an export symbols node to resolve overlay symbols.
Add tests to exercise the export symbols feature.
Signed-off-by: Herve Codina <herve.codina@...tlin.com>
---
drivers/of/unittest-data/Makefile | 5 ++
.../unittest-data/overlay_export_symbols.dtso | 15 +++++
.../of/unittest-data/testcases_common.dtsi | 1 +
.../unittest-data/tests-export-symbols.dtsi | 30 +++++++++
drivers/of/unittest.c | 64 +++++++++++++++++++
5 files changed, 115 insertions(+)
create mode 100644 drivers/of/unittest-data/overlay_export_symbols.dtso
create mode 100644 drivers/of/unittest-data/tests-export-symbols.dtsi
diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile
index 01a966e39f23..b51be046749a 100644
--- a/drivers/of/unittest-data/Makefile
+++ b/drivers/of/unittest-data/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_OF_OVERLAY) += overlay.dtbo.o \
overlay_gpio_04a.dtbo.o \
overlay_gpio_04b.dtbo.o \
overlay_pci_node.dtbo.o \
+ overlay_export_symbols.dtbo.o \
overlay_bad_unresolved.dtbo.o
# enable creation of __symbols__ node
@@ -66,6 +67,10 @@ DTC_FLAGS_testcases += -Wno-interrupts_property \
# overlay_bad_add_dup_prop.dtbo \
# overlay_bad_phandle.dtbo \
# overlay_bad_symbol.dtbo \
+#
+# Also overlay_export_symbols_ovl.dtbo is designed to be applied to a specific
+# node and cannot be applied statically with fdtoverlay
+
apply_static_overlay_1 := overlay_0.dtbo \
overlay_1.dtbo \
diff --git a/drivers/of/unittest-data/overlay_export_symbols.dtso b/drivers/of/unittest-data/overlay_export_symbols.dtso
new file mode 100644
index 000000000000..89c9df4ef89b
--- /dev/null
+++ b/drivers/of/unittest-data/overlay_export_symbols.dtso
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+/plugin/;
+
+/ {
+ fragment@0 {
+ target-path="";
+ __overlay__ {
+ ovl_node {
+ ref-base = <&test_export_base>;
+ ref-node = <&test_export_node>;
+ };
+ };
+ };
+};
diff --git a/drivers/of/unittest-data/testcases_common.dtsi b/drivers/of/unittest-data/testcases_common.dtsi
index 1c2cdf353ae3..21ffe0fb03ef 100644
--- a/drivers/of/unittest-data/testcases_common.dtsi
+++ b/drivers/of/unittest-data/testcases_common.dtsi
@@ -18,4 +18,5 @@ node-remove {
#include "tests-address.dtsi"
#include "tests-platform.dtsi"
#include "tests-overlay.dtsi"
+#include "tests-export-symbols.dtsi"
#include "tests-lifecycle.dtsi"
diff --git a/drivers/of/unittest-data/tests-export-symbols.dtsi b/drivers/of/unittest-data/tests-export-symbols.dtsi
new file mode 100644
index 000000000000..1650289b34cd
--- /dev/null
+++ b/drivers/of/unittest-data/tests-export-symbols.dtsi
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+ testcase-data {
+ test-export-symbols {
+ test_export_symbols_b0: base0 {
+ test_export_symbols_n0: node {
+ dummy;
+ };
+
+ export-symbols {
+ test_export_base = <&test_export_symbols_b0>;
+ test_export_node = <&test_export_symbols_n0>;
+ };
+ };
+
+ test_export_symbols_b1: base1 {
+
+ test_export_symbols_n1: node {
+ dummy;
+ };
+
+ export-symbols {
+ test_export_base = <&test_export_symbols_b1>;
+ test_export_node = <&test_export_symbols_n1>;
+ };
+ };
+ };
+ };
+};
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index f19e15f8b288..1be4ffb7a4db 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -4043,6 +4043,69 @@ static __init void of_unittest_overlay_high_level(void)
mutex_unlock(&of_mutex);
}
+OVERLAY_INFO_EXTERN(overlay_export_symbols);
+
+static __init void of_unittest_export_symbols(const char *prefix,
+ const char *base_full_path)
+{
+ const struct overlay_info ovl = OVERLAY_INFO(overlay_export_symbols, 0, 0);
+ struct device_node *ovl_node;
+ struct device_node *base;
+ struct device_node *node;
+ struct device_node *ref;
+ int ovcs_id;
+ u32 size;
+ int ret;
+
+ base = of_find_node_by_path(base_full_path);
+ if (unittest(base, "%s: Get base (%s) failed\n", prefix, base_full_path))
+ return;
+
+ node = of_get_child_by_name(base, "node");
+ if (unittest(base, "%s: Get node from %pOF failed\n", prefix, base))
+ goto end_put_base;
+
+ size = ovl.dtbo_end - ovl.dtbo_begin;
+ ret = of_overlay_fdt_apply(ovl.dtbo_begin, size, &ovcs_id, base, "export-symbols");
+ if (unittest(!ret, "%s: Apply '%s' failed (%d)\n", prefix, ovl.name, ret))
+ goto end_put_node;
+
+ ovl_node = of_get_child_by_name(base, "ovl_node");
+ if (unittest(ovl_node, "%s: Get ovl_node from %pOF failed\n", prefix, base))
+ goto end_remove_overlay;
+
+ ref = of_parse_phandle(ovl_node, "ref-base", 0);
+ if (unittest(ref, "%s: Parse 'ref-base' from %pOF failed\n", prefix, ovl_node))
+ goto end_put_ovl_node;
+ unittest(ref == base,
+ "%s: Node from 'ref-base' phandle mismatches (got %pOF, expected %pOF)\n",
+ prefix, ref, base);
+ of_node_put(ref);
+
+ ref = of_parse_phandle(ovl_node, "ref-node", 0);
+ if (unittest(ref, "%s: Parse 'ref-node' from %pOF failed\n", prefix, ovl_node))
+ goto end_put_ovl_node;
+ unittest(ref == node,
+ "%s: Node from 'ref-node' phandle mismatches (got %pOF, expected %pOF)\n",
+ prefix, ref, node);
+ of_node_put(ref);
+
+end_put_ovl_node:
+ of_node_put(ovl_node);
+end_remove_overlay:
+ of_overlay_remove(&ovcs_id);
+end_put_node:
+ of_node_put(node);
+end_put_base:
+ of_node_put(base);
+}
+
+static __init void of_unittest_overlay_export_symbols(void)
+{
+ of_unittest_export_symbols("base0", "/testcase-data/test-export-symbols/base0");
+ of_unittest_export_symbols("base1", "/testcase-data/test-export-symbols/base1");
+}
+
static int of_unittest_pci_dev_num;
static int of_unittest_pci_child_num;
@@ -4281,6 +4344,7 @@ static int __init of_unittest(void)
of_unittest_overlay();
of_unittest_lifecycle();
of_unittest_pci_node();
+ of_unittest_overlay_export_symbols();
/* Double check linkage after removing testcase data */
of_unittest_check_tree_linkage();
--
2.47.0
Powered by blists - more mailing lists