Disallow re-use of the same label within a dts file

PATCH Applied David Gibson 2 participants 2 messages Feb 23, 2010

Share & tools

David Gibson

author

2010-02-23 08:56 UTC #0 lore raw

Currently, nothing will stop you from re-using the same label string multiple times in a dts, e.g.:

	/ {
		samelabel: prop1 = "foo";
		samelabel: prop2 = "bar";
	};

	/ {
		samelabel: prop1 = "foo";
		samelabel: subnode {
		};
	};

When using node references by label, this could lead to confusing results (with no warning), and in -Oasm mode will result in output which the assembler will complain about (since it too will have duplicate labels).

This patch, therefore, adds code to checks.c to give errors if you attempt to re-use the same label. It treats all labels (node, property, and value) as residing in the same namespace, since the assembler will treat them so for -Oasm mode.

Testcases for the new code are also added.

Signed-off-by David Gibson <[email protected]>

---
 checks.c               |   56 +++++++++++++++++++++++++++++++++++++++++++++++++
 dtc.h                  |    4 +++
 livetree.c             |   51 ++++++++++++++++++++++++++++++++++++++++++++
 tests/reuse-label.dts  |   15 +++++++++++++
 tests/reuse-label1.dts |   10 ++++++++
 tests/reuse-label2.dts |    6 +++++
 tests/reuse-label3.dts |    9 +++++++
 tests/reuse-label4.dts |    5 ++++
 tests/reuse-label5.dts |    6 +++++
 tests/reuse-label6.dts |    6 +++++
 tests/run_tests.sh     |    7 ++++++
 11 files changed, 175 insertions(+)

livetree.c +51 -0

Index: dtc/livetree.c
===================================================================
@@ -208,6 +208,57 @@ cell_t propval_cell(struct property *pro
 	return fdt32_to_cpu(*((cell_t *)prop->val.val));
 }
 
+struct property *get_property_by_label(struct node *tree, const char *label,
+				       struct node **node)
+{
+	struct property *prop;
+	struct node *c;
+
+	*node = tree;
+
+	for_each_property(tree, prop) {
+		if (prop->label && streq(prop->label, label))
+			return prop;
+	}
+
+	for_each_child(tree, c) {
+		prop = get_property_by_label(c, label, node);
+		if (prop)
+			return prop;
+	}
+
+	*node = NULL;
+	return NULL;
+}
+
+struct marker *get_marker_label(struct node *tree, const char *label,
+				struct node **node, struct property **prop)
+{
+	struct marker *m;
+	struct property *p;
+	struct node *c;
+
+	*node = tree;
+
+	for_each_property(tree, p) {
+		*prop = p;
+		m = p->val.markers;
+		for_each_marker_of_type(m, LABEL)
+			if (streq(m->ref, label))
+				return m;
+	}
+
+	for_each_child(tree, c) {
+		m = get_marker_label(c, label, node, prop);
+		if (m)
+			return m;
+	}
+
+	*prop = NULL;
+	*node = NULL;
+	return NULL;
+}
+
 struct node *get_subnode(struct node *node, const char *nodename)
 {
 	struct node *child;

tests/reuse-label.dts new file +15 -0

Index: dtc/tests/reuse-label.dts
===================================================================
@@ -0,0 +1,15 @@
+/dts-v1/;
+
+/ {
+	label: property1 = "foo";
+	label: property2 = "bar";
+
+	test1 = &label;
+
+	label: node1 {
+		prop = "foo";
+	};
+	label: node2 {
+		prop = "bar";
+	};
+};

tests/reuse-label1.dts new file +10 -0

Index: dtc/tests/reuse-label1.dts
===================================================================
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+/ {
+	label: node1 {
+		prop = "foo";
+	};
+	label: node2 {
+		prop = "bar";
+	};
+};

tests/reuse-label2.dts new file +6 -0

Index: dtc/tests/reuse-label2.dts
===================================================================
@@ -0,0 +1,6 @@
+/dts-v1/;
+
+/ {
+	label: property1 = "foo";
+	label: property2 = "bar";
+};

tests/reuse-label3.dts new file +9 -0

Index: dtc/tests/reuse-label3.dts
===================================================================
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+/ {
+	label: property = "foo";
+
+	label: node {
+		property = "foo";
+	};
+};

tests/run_tests.sh +7 -0

Index: dtc/tests/run_tests.sh
===================================================================
@@ -319,6 +319,13 @@ dtc_tests () {
     run_sh_test dtc-checkfails.sh node_name_format -- -I dtb -O dtb bad_node_format.dtb
     run_sh_test dtc-checkfails.sh prop_name_chars -- -I dtb -O dtb bad_prop_char.dtb
 
+    run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label1.dts
+    run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label2.dts
+    run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label3.dts
+    run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label4.dts
+    run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label5.dts
+    run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label6.dts
+
     # Check for proper behaviour reading from stdin
     run_dtc_test -I dts -O dtb -o stdin_dtc_tree1.test.dtb - < test_tree1.dts
     run_wrap_test cmp stdin_dtc_tree1.test.dtb dtc_tree1.test.dtb

checks.c +56 -0

68 lines not on this page · raw message

dtc.h +4 -0

Index: dtc/dtc.h
===================================================================
@@ -171,6 +171,10 @@ void add_child(struct node *parent, stru
 const char *get_unitname(struct node *node);
 struct property *get_property(struct node *node, const char *propname);
 cell_t propval_cell(struct property *prop);
+struct property *get_property_by_label(struct node *tree, const char *label,
+				       struct node **node);
+struct marker *get_marker_label(struct node *tree, const char *label,
+				struct node **node, struct property **prop);
 struct node *get_subnode(struct node *node, const char *nodename);
 struct node *get_node_by_path(struct node *tree, const char *path);
 struct node *get_node_by_label(struct node *tree, const char *label);

tests/reuse-label4.dts new file +5 -0

Index: dtc/tests/reuse-label4.dts
===================================================================
@@ -0,0 +1,5 @@
+/dts-v1/;
+
+/ {
+	property = label: "foo" label:;
+};

tests/reuse-label5.dts new file +6 -0

Index: dtc/tests/reuse-label5.dts
===================================================================
@@ -0,0 +1,6 @@
+/dts-v1/;
+
+/ {
+	prop1 = label: "foo";
+	prop2 = "bar" label:;
+};

tests/reuse-label6.dts new file +6 -0

Index: dtc/tests/reuse-label6.dts
===================================================================
@@ -0,0 +1,6 @@
+/dts-v1/;
+
+/ {
+	label: prop1 = "foo";
+	prop2 = "bar" label:;
+};

Signature · 4 lines

David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Jon Loeliger

Applied

2010-02-23 15:06 UTC #1 lore raw

Quoted 19 lines

Currently, nothing will stop you from re-using the same label string multiple times in a dts, e.g.:
	/ {
		samelabel: prop1 = "foo";
		samelabel: prop2 = "bar";
	};
or
	/ {
		samelabel: prop1 = "foo";
		samelabel: subnode {
		};
	};
When using node references by label, this could lead to confusing results (with no warning), and in -Oasm mode will result in output which the assembler will complain about (since it too will have duplicate labels).

Quoted 8 lines

This patch, therefore, adds code to checks.c to give errors if you attempt to re-use the same label. It treats all labels (node, property, and value) as residing in the same namespace, since the assembler will treat them so for -Oasm mode.
Testcases for the new code are also added.
Signed-off-by David Gibson <[email protected]>

Applied.