From: frowand.list@gmail.com To: Rob Herring <robh+dt@kernel.org>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>, Moritz Fischer <mdf@kernel.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle in new nodes Date: Tue, 9 Oct 2018 23:04:55 -0700 [thread overview] Message-ID: <1539151495-8110-1-git-send-email-frowand.list@gmail.com> (raw) In-Reply-To: <CANk1AXQScT_b1_UOiVuWNcB=LiA3gvvZrw53H1XVSCNqsGPqtA@mail.gmail.com> From: Frank Rowand <frank.rowand@sony.com> "of: overlay: use prop add changeset entry for property in new nodes" fixed a problem where an 'update property' changeset entry was created for properties contained in nodes added by a changeset. The fix was to use an 'add property' changeset entry. This exposed more bugs in the apply overlay code. The properties 'name', 'phandle', and 'linux,phandle' were filtered out by add_changeset_property() as special properties. Change the filter to be only for existing nodes, not newly added nodes. The second bug is that the 'name' property does not exist in the newest FDT version, and has to be constructed from the node's full_name. Construct an 'add property' changeset entry for newly added nodes. Signed-off-by: Frank Rowand <frank.rowand@sony.com> --- Hi Alan, Thanks for reporting the problem with missing node names. I was able to replicate the problem, and have created this preliminary version of a patch to fix the problem. I have not extensively reviewed the patch yet, but would appreciate if you can confirm this fixes your problem. I created this patch as patch 17 of the series, but have also applied it as patch 05.1, immediately after patch 05/16, and built the kernel, booted, and verified name and phandle for one of the nodes in a unittest overlay for both cases. So minimal testing so far on my part. I have not verified whether the series builds and boots after each of patches 06..16 if this patch is applied as patch 05.1. There is definitely more work needed for me to complete this patch because it allocates some more memory, but does not yet free it when the overlay is released. -Frank drivers/of/overlay.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 0b0904f44bc7..9746cea2aa91 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -301,10 +301,11 @@ static int add_changeset_property(struct overlay_changeset *ovcs, struct property *new_prop = NULL, *prop; int ret = 0; - if (!of_prop_cmp(overlay_prop->name, "name") || - !of_prop_cmp(overlay_prop->name, "phandle") || - !of_prop_cmp(overlay_prop->name, "linux,phandle")) - return 0; + if (target->in_livetree) + if (!of_prop_cmp(overlay_prop->name, "name") || + !of_prop_cmp(overlay_prop->name, "phandle") || + !of_prop_cmp(overlay_prop->name, "linux,phandle")) + return 0; if (target->in_livetree) prop = of_find_property(target->np, overlay_prop->name, NULL); @@ -443,10 +444,13 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, struct target *target, const struct device_node *overlay_node) { struct device_node *child; - struct property *prop; + struct property *prop, *name_prop; + bool has_name = false; int ret; for_each_property_of_node(overlay_node, prop) { + if (!strcmp(prop->name, "name")) + has_name = true; ret = add_changeset_property(ovcs, target, prop, 0); if (ret) { pr_debug("Failed to apply prop @%pOF/%s, err=%d\n", @@ -455,6 +459,57 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, } } + /* + * With FDT version 0x10 we may not have the name property, + * recreate it here from the unit name if absent + */ + + if (!has_name) { + const char *p = target->np->full_name, *ps = p, *pa = NULL; + int len; + + /* + * zzz + * TODO: stash name_prop on a list in ovcs, to be freed + * after overlay removed + */ + + while (*p) { + if ((*p) == '@') + pa = p; + else if ((*p) == '/') + ps = p + 1; + p++; + } + + if (pa < ps) + pa = p; + len = (pa - ps) + 1; + + name_prop = kmalloc(sizeof(*name_prop), GFP_KERNEL); + if (!name_prop) + return -ENOMEM; + + name_prop->name = kstrdup("name", GFP_KERNEL); + name_prop->value = kmalloc(len, GFP_KERNEL); + if (!name_prop->name || !name_prop->value) { + ret = -ENOMEM; + goto err_free_name_prop; + } + + memcpy(name_prop->value, ps, len - 1); + ((char *)name_prop->value)[len - 1] = 0; + + name_prop->length = strlen(name_prop->value) + 1; + + ret = add_changeset_property(ovcs, target, name_prop, 0); + if (ret) { + pr_debug("Failed to apply name_prop @%pOF/%s, err=%d\n", + target->np, name_prop->name, ret); + goto err_free_name_prop; + } + } + for_each_child_of_node(overlay_node, child) { ret = add_changeset_node(ovcs, target, child); if (ret) { @@ -466,6 +521,13 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, } return 0; + +err_free_name_prop: + kfree(name_prop->name); + kfree(name_prop->value); + kfree(name_prop); + return ret; + } /* -- Frank Rowand <frank.rowand@sony.com>
WARNING: multiple messages have this Message-ID (diff)
From: frowand.list@gmail.com To: Rob Herring <robh+dt@kernel.org>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>, Moritz Fischer <mdf@kernel.org> Cc: devicetree@vger.kernel.org, linux-fpga@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle in new nodes Date: Tue, 9 Oct 2018 23:04:55 -0700 [thread overview] Message-ID: <1539151495-8110-1-git-send-email-frowand.list@gmail.com> (raw) In-Reply-To: <CANk1AXQScT_b1_UOiVuWNcB=LiA3gvvZrw53H1XVSCNqsGPqtA@mail.gmail.com> From: Frank Rowand <frank.rowand@sony.com> "of: overlay: use prop add changeset entry for property in new nodes" fixed a problem where an 'update property' changeset entry was created for properties contained in nodes added by a changeset. The fix was to use an 'add property' changeset entry. This exposed more bugs in the apply overlay code. The properties 'name', 'phandle', and 'linux,phandle' were filtered out by add_changeset_property() as special properties. Change the filter to be only for existing nodes, not newly added nodes. The second bug is that the 'name' property does not exist in the newest FDT version, and has to be constructed from the node's full_name. Construct an 'add property' changeset entry for newly added nodes. Signed-off-by: Frank Rowand <frank.rowand@sony.com> --- Hi Alan, Thanks for reporting the problem with missing node names. I was able to replicate the problem, and have created this preliminary version of a patch to fix the problem. I have not extensively reviewed the patch yet, but would appreciate if you can confirm this fixes your problem. I created this patch as patch 17 of the series, but have also applied it as patch 05.1, immediately after patch 05/16, and built the kernel, booted, and verified name and phandle for one of the nodes in a unittest overlay for both cases. So minimal testing so far on my part. I have not verified whether the series builds and boots after each of patches 06..16 if this patch is applied as patch 05.1. There is definitely more work needed for me to complete this patch because it allocates some more memory, but does not yet free it when the overlay is released. -Frank drivers/of/overlay.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 0b0904f44bc7..9746cea2aa91 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -301,10 +301,11 @@ static int add_changeset_property(struct overlay_changeset *ovcs, struct property *new_prop = NULL, *prop; int ret = 0; - if (!of_prop_cmp(overlay_prop->name, "name") || - !of_prop_cmp(overlay_prop->name, "phandle") || - !of_prop_cmp(overlay_prop->name, "linux,phandle")) - return 0; + if (target->in_livetree) + if (!of_prop_cmp(overlay_prop->name, "name") || + !of_prop_cmp(overlay_prop->name, "phandle") || + !of_prop_cmp(overlay_prop->name, "linux,phandle")) + return 0; if (target->in_livetree) prop = of_find_property(target->np, overlay_prop->name, NULL); @@ -443,10 +444,13 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, struct target *target, const struct device_node *overlay_node) { struct device_node *child; - struct property *prop; + struct property *prop, *name_prop; + bool has_name = false; int ret; for_each_property_of_node(overlay_node, prop) { + if (!strcmp(prop->name, "name")) + has_name = true; ret = add_changeset_property(ovcs, target, prop, 0); if (ret) { pr_debug("Failed to apply prop @%pOF/%s, err=%d\n", @@ -455,6 +459,57 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, } } + /* + * With FDT version 0x10 we may not have the name property, + * recreate it here from the unit name if absent + */ + + if (!has_name) { + const char *p = target->np->full_name, *ps = p, *pa = NULL; + int len; + + /* + * zzz + * TODO: stash name_prop on a list in ovcs, to be freed + * after overlay removed + */ + + while (*p) { + if ((*p) == '@') + pa = p; + else if ((*p) == '/') + ps = p + 1; + p++; + } + + if (pa < ps) + pa = p; + len = (pa - ps) + 1; + + name_prop = kmalloc(sizeof(*name_prop), GFP_KERNEL); + if (!name_prop) + return -ENOMEM; + + name_prop->name = kstrdup("name", GFP_KERNEL); + name_prop->value = kmalloc(len, GFP_KERNEL); + if (!name_prop->name || !name_prop->value) { + ret = -ENOMEM; + goto err_free_name_prop; + } + + memcpy(name_prop->value, ps, len - 1); + ((char *)name_prop->value)[len - 1] = 0; + + name_prop->length = strlen(name_prop->value) + 1; + + ret = add_changeset_property(ovcs, target, name_prop, 0); + if (ret) { + pr_debug("Failed to apply name_prop @%pOF/%s, err=%d\n", + target->np, name_prop->name, ret); + goto err_free_name_prop; + } + } + for_each_child_of_node(overlay_node, child) { ret = add_changeset_node(ovcs, target, child); if (ret) { @@ -466,6 +521,13 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, } return 0; + +err_free_name_prop: + kfree(name_prop->name); + kfree(name_prop->value); + kfree(name_prop); + return ret; + } /* -- Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2018-10-10 6:06 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-05 4:12 [PATCH 00/16] of: overlay: validation checks, subsequent fixes frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 01/16] of: overlay: add tests to validate kfrees from overlay removal frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 02/16] of: overlay: add missing of_node_put() after add new node to changeset frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 03/16] of: overlay: add missing of_node_get() in __of_attach_node_sysfs frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 04/16] powerpc/pseries: add of_node_put() in dlpar_detach_node() frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 05/16] of: overlay: use prop add changeset entry for property in new nodes frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-09 20:28 ` Alan Tull 2018-10-09 20:28 ` Alan Tull 2018-10-09 20:28 ` Alan Tull 2018-10-09 23:44 ` Frank Rowand 2018-10-09 23:44 ` Frank Rowand 2018-10-09 23:44 ` Frank Rowand 2018-10-10 6:04 ` frowand.list [this message] 2018-10-10 6:04 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " frowand.list 2018-10-10 6:49 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-10 6:49 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-10 20:40 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Alan Tull 2018-10-10 20:40 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Alan Tull 2018-10-10 20:40 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Alan Tull 2018-10-10 21:03 ` Frank Rowand 2018-10-10 21:03 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-10 21:03 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-11 5:39 ` Frank Rowand 2018-10-11 5:39 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-11 5:39 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-11 18:57 ` Alan Tull 2018-10-11 19:33 ` Alan Tull 2018-10-11 19:33 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Alan Tull 2018-10-11 19:33 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Alan Tull 2018-10-11 23:38 ` Frank Rowand 2018-10-11 23:38 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-11 23:38 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-05 4:12 ` [PATCH 06/16] of: overlay: do not duplicate properties from overlay for " frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 07/16] of: dynamic: change type of of_{at,de}tach_node() to void frowand.list 2018-10-05 4:12 ` [PATCH 07/16] of: dynamic: change type of of_{at, de}tach_node() " frowand.list 2018-10-05 4:12 ` [PATCH 08/16] of: overlay: reorder fields in struct fragment frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 09/16] of: overlay: validate overlay properties #address-cells and #size-cells frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 15:07 ` Rob Herring 2018-10-05 15:07 ` Rob Herring 2018-10-05 18:53 ` Frank Rowand 2018-10-05 18:53 ` Frank Rowand 2018-10-05 19:04 ` Rob Herring 2018-10-05 19:04 ` Rob Herring 2018-10-05 19:09 ` Frank Rowand 2018-10-05 19:09 ` Frank Rowand 2018-10-08 15:57 ` Alan Tull 2018-10-08 15:57 ` Alan Tull 2018-10-08 15:57 ` Alan Tull 2018-10-08 18:46 ` Alan Tull 2018-10-08 18:46 ` Alan Tull 2018-10-08 18:46 ` Alan Tull 2018-10-09 0:02 ` Frank Rowand 2018-10-09 0:02 ` Frank Rowand 2018-10-09 0:02 ` Frank Rowand 2018-10-09 18:40 ` Alan Tull 2018-10-09 18:40 ` Alan Tull 2018-10-09 18:40 ` Alan Tull 2018-10-05 4:12 ` [PATCH 10/16] of: overlay: make all pr_debug() and pr_err() messages unique frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 11/16] of: overlay: test case of two fragments adding same node frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 12/16] of: overlay: check prevents multiple fragments add or delete " frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 13/16] of: overlay: check prevents multiple fragments touching same property frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 14/16] of: unittest: remove unused of_unittest_apply_overlay() argument frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 15/16] of: unittest: initialize args before calling of_irq_parse_one() frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 13:26 ` Guenter Roeck 2018-10-05 13:26 ` Guenter Roeck 2018-10-05 19:05 ` Frank Rowand 2018-10-05 19:05 ` Frank Rowand 2018-10-05 14:53 ` Rob Herring 2018-10-05 14:53 ` Rob Herring 2018-10-05 19:04 ` Frank Rowand 2018-10-05 19:04 ` Frank Rowand 2018-10-05 4:12 ` [PATCH 16/16] of: unittest: find overlays[] entry by name instead of index frowand.list 2018-10-05 4:12 ` frowand.list
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1539151495-8110-1-git-send-email-frowand.list@gmail.com \ --to=frowand.list@gmail.com \ --cc=atull@kernel.org \ --cc=benh@kernel.crashing.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-fpga@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mdf@kernel.org \ --cc=mpe@ellerman.id.au \ --cc=pantelis.antoniou@konsulko.com \ --cc=paulus@samba.org \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.