dtc: Add a plugin interface
Subsystems (2)
v3 cover dtc: Add a plugin interface
I added a simple live tree API. There's no longer a need to move any definitions. The live tree struct is hidden from plugins, so it's not an ABI. The API doesn't allow plugins to modify the live tree yet, but that will probably change later.
I also removed the EXPORT_FUNCTION macro. Plugins now have to implement certain prototypes, defined in dtc-plugin.h. This allows plugins to be generated by tools.
===========
This is one possible implementation of a plugin interface for DTC.
A plugin interface would allow us to add checks in languages other than C. Specifically, it would allow DTC and DT Schema (which is written in Python) to be integrated.
It would also allow for better debugging of dts files. For example, DT Schema would be able to print dts source line information, without us having to add source line annotations to yaml files.
In the future, plugins will be allowed to modify the live tree and pass it back for further processing, but the API doesn't support that yet.
There's a question of whether we should relicense some headers to dual BSD to be able call Python code.
Any thoughts would be much appreciated.
Thanks,
Andrei.
Changes in v3:
- live tree API (dt.h and dt.c)
- additional functionality in dtc.h
- plugins have to implement prototypes
- improved documentation
Changes in v2:
- improved documentation
- plugins must register with the build system
- the "validate_fn_t" hook can return a status
- define "struct reserve_info" in "dtc-plugin.h"
- specify that minor versions are compatible
- check if plugin_dir is NULL, just in case
- better variable names in register_plugin_info
Andrei Ziureaev (4):
dtc: Add marker type functionality to dtc.h
dtc: Add a live tree API
dtc: Add plugin documentation and examples
dtc: Add a plugin interface
Documentation/manual.txt | 146 ++++++++++++++++++++++++++++ Makefile | 29 +++++- Makefile.dtc | 1 + dt.c | 158 +++++++++++++++++++++++++++++++ dt.h | 63 ++++++++++++ dtc-plugin.h | 76 +++++++++++++++ dtc.c | 142 ++++++++++++++++++++++++++- dtc.h | 57 +++++++++++ plugins/example/Makefile.example | 27 ++++++ plugins/example/example.c | 33 +++++++ treesource.c | 8 +- 11 files changed, 734 insertions(+), 6 deletions(-) create mode 100644 dt.c create mode 100644 dt.h create mode 100644 dtc-plugin.h create mode 100644 plugins/example/Makefile.example create mode 100644 plugins/example/example.c
Signature · 1 line
2.17.1
A message that is not in the archive (sent off-list or not yet received): 20200906131220.6192-1-andrei.ziureaev-5wv7dgnIgG8@public.gmane.org
RFC PATCH v3 1/4 dtc: Add marker type functionality to dtc.h
Add an inline helper function to dtc.h that checks if there's a marker of a type at an offset.
Also, there are two useful static functions in treesource.c. Make them public, add their prototypes to dtc.h and rename one of them.
--- dtc.h | 11 +++++++++++ treesource.c | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
dtc.h +11 -0
@@ -125,6 +125,17 @@ struct data { for_each_marker(m) \ if ((m)->type == (t)) +static inline bool markers_have_type_at_offset(struct marker *m, enum markertype type, int off) +{ + for_each_marker_of_type(m, type) + if (m->offset == off) + return true; + +return false; +} + +bool marker_has_data_type_information (struct marker *m); +struct marker *next_type_marker (struct marker *m);size_t type_marker_length (struct marker *m);void data_free (struct data d);
treesource.c +4 -4
@@ -124,14 +124,14 @@ static void write_propval_int(FILE *f, const char *p, size_t len, size_t width) } } -static bool has_data_type_information (struct marker *m) +bool marker_has_data_type_information (struct marker *m) {return m->type >=TYPE_UINT8 ; } -static struct marker *next_type_marker (struct marker *m) +struct marker *next_type_marker (struct marker *m) { -while (m && !has_data_type_information (m)) +while (m && !marker_has_data_type_information (m)) m = m->next;return m; }
@@ -230,7 +230,7 @@ static void write_propval(FILE *f, struct property *prop)size_t data_len =type_marker_length (m) ? : len - m->offset;const char *p = &prop->val.val[m->offset]; -if (has_data_type_information (m)) { +if (marker_has_data_type_information (m)) { emit_type = m->type;fprintf (f," %s" , delim_start[emit_type]); }else if (m->type ==LABEL )
Signature · 1 line
2.17.1
RFC PATCH v3 2/4 dtc: Add a live tree API
In reply to a message not in the archiveThe purpose of this API is to completely abstract away the internal live tree implementation.
This API can traverse the tree and read its values. This is enough to validate the tree in Python, for example. We could add more functionality, documentation and tests, and turn it into a separate library.
--- Makefile.dtc | 1 + dt.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ dt.h | 63 ++++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 dt.c create mode 100644 dt.h
Makefile.dtc +1 -0
@@ -7,6 +7,7 @@ DTC_SRCS = \ checks.c \ data.c \ + dt.c \ dtc.c \ flattree.c \ fstree.c \
dt.c new file +158 -0
158 lines not on this page · raw message
dt.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.17.1
A message that is not in the archive (sent off-list or not yet received): 20200906131220.6192-3-andrei.ziureaev-5wv7dgnIgG8@public.gmane.org
Re: [RFC PATCH v3 2/4] dtc: Add a live tree API
Hi Andrei,
Quoted 252 lines · Andrei Ziureaev
The purpose of this API is to completely abstract away the internal live tree implementation.
This API can traverse the tree and read its values. This is enough to validate the tree in Python, for example. We could add more functionality, documentation and tests, and turn it into a separate library.
Signed-off-by Andrei Ziureaev <[email protected]>Signed-off-by Andrei Ziureaev <[email protected]>--- Makefile.dtc | 1 + dt.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ dt.h | 63 ++++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 dt.c create mode 100644 dt.hMakefile.dtc +1
-0@@ -7,6 +7,7 @@ DTC_SRCS = \ checks.c \ data.c \ + dt.c \ dtc.c \ flattree.c \ fstree.c \dt.c new file +158
-0@@ -0,0 +1,158 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* (C) Copyright Arm Holdings. 2020 +*/ + +#include "dt.h" +#include "dtc.h" + +struct node *dt_root (struct dt_info *dti) +{ +return dti->dt; +} + +struct node *dt_first_child (struct node *node) +{ +return node->children; +} + +struct node *dt_next_sibling (struct node *node) +{ +return node->next_sibling; +} + +struct property *dt_first_property (struct node *node) +{ +return node->proplist; +} + +struct property *dt_next_property (struct property *prop) +{ +return prop->next; +} + +struct marker *dt_first_row (struct property *prop) +{ +return next_type_marker (prop->val.markers); +} + +struct marker *dt_next_row (struct marker *row) +{ +return next_type_marker (row->next); +} + +int dt_row_length (struct property *prop,struct marker *row) +{ +int length_bytes =type_marker_length (row) ? : prop->val.len - row->offset; +return length_bytes /dt_cell_width_bytes (row); +} + +uint64_t dt_uint (struct property *prop,struct marker *row,int col) +{ +int width =dt_cell_width_bytes (row); +const char *p = &dt_string (prop, row)[col * width]; + +switch (width) { +case 2 : +return dtb_ld16 (p); +case 4 : +return dtb_ld32 (p); +case 8 : +return dtb_ld64 (p); +default : +return *(const uint8_t *)p; + } +} + +bool dt_cell_is_phandle (struct property *prop,struct marker *row,int col) +{ +int width =dt_cell_width_bytes (row); +int off = row->offset + col * width; + +if (width !=4 ) +return false; + +return markers_have_type_at_offset (row,REF_PHANDLE , off); +} + +const char *dt_string (struct property *prop,struct marker *row) +{ +return &prop->val.val[row->offset]; +} + +enum dt_type dt_row_type (struct marker *row) +{ +switch (row->type) { +/* fallthrough */ +case TYPE_UINT8 : +case TYPE_UINT16 : +case TYPE_UINT32 : +case TYPE_UINT64 : +return DT_TYPE_UINT ; +case TYPE_STRING : +return DT_TYPE_STRING ; +default : +return DT_TYPE_NONE ; + } +} + +const char *dt_row_type_name (struct marker *row) +{ +switch (dt_row_type (row)) { +case DT_TYPE_UINT : +return "uint" ; +case DT_TYPE_STRING : +return "string" ; +default : +return "none" ; + } +} + +int dt_cell_width_bytes (struct marker *row) +{ +switch (row->type) { +case TYPE_UINT16 : +return 2 ; +case TYPE_UINT32 : +return 4 ; +case TYPE_UINT64 : +return 8 ; +default : +return 1 ; + } +} + +const char *dt_node_name (struct node *node) +{ +return *node->name ? node->name :"/" ; +} + +struct srcpos *dt_node_srcpos (struct node *node) +{ +return node->srcpos; +} + +const char *dt_property_name (struct property *prop) +{ +return prop->name; +} + +struct srcpos *dt_property_srcpos (struct property *prop) +{ +return prop->srcpos; +} + +const char *dt_srcpos_dir (struct srcpos *srcpos) +{ +return srcpos->file->dir; +} + +const char *dt_srcpos_file_name (struct srcpos *srcpos) +{ +return srcpos->file->name; +} + +int dt_srcpos_first_line (struct srcpos *srcpos) +{ +return srcpos->first_line; +}dt.h new file +51
-0@@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef DT_H +#define DT_H + +/* +* (C) Copyright Arm Holdings. 2020 +*/ + +#include <stdint.h> +#include <stdbool.h> + +#include "srcpos.h" + +struct dt_info ; +struct node ; +struct property ; +struct marker ; + +enum dt_type { +DT_TYPE_NONE , +DT_TYPE_UINT , +DT_TYPE_STRING , +}; + +/* Traversal */ +struct node *dt_root (struct dt_info *dti); + +struct node *dt_first_child (struct node *node); +struct node *dt_next_sibling (struct node *node); + +struct property *dt_first_property (struct node *node); +struct property *dt_next_property (struct property *prop); + +/* A property value resembles a matrix (or a table). A marker with data +* type information can represent a row. +* +* So, each property has a linked list of rows. */ +struct marker *dt_first_row (struct property *prop); +struct marker *dt_next_row (struct marker *row); + +/* Accessing data. Each row is an array of cells. */ +int dt_row_length (struct property *prop,struct marker *row); + +uint64_t dt_uint (struct property *prop,struct marker *row,int col); +bool dt_cell_is_phandle (struct property *prop,struct marker *row,int col); +const char *dt_string (struct property *prop,struct marker *row); + +/* Accessing metadata */ +enum dt_type dt_row_type (struct marker *row); +const char *dt_row_type_name (struct marker *row); +int dt_cell_width_bytes (struct marker *row);
dt.h line 61
Quoted 10 lines
dt.h new file +10
-0+ +const char *dt_node_name (struct node *node); +struct srcpos *dt_node_srcpos (struct node *node); + +const char *dt_property_name (struct property *prop); +struct srcpos *dt_property_srcpos (struct property *prop); + +const char *dt_srcpos_dir (struct srcpos *srcpos); +const char *dt_srcpos_file_name (struct srcpos *srcpos); +int dt_srcpos_first_line (struct srcpos *srcpos);
How about adding full comments for these functions?
Quoted 5 lines
dt.h new file +2
-1+ +#endif /* DT_H */ --2.17.1
Regards,
Simon
A message that is not in the archive (sent off-list or not yet received): CAPnjgZ09ve8x2kjx5KHqXJ9QFprk2uZdaKpAbTtaKYhA506gUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [RFC PATCH v3 2/4] dtc: Add a live tree API
Quoted 259 lines · Simon Glass
Hi Andrei,
Quoted 256 lines · Andrei Ziureaev
The purpose of this API is to completely abstract away the internal live tree implementation.
This API can traverse the tree and read its values. This is enough to validate the tree in Python, for example. We could add more functionality, documentation and tests, and turn it into a separate library.
Signed-off-by Andrei Ziureaev <[email protected]>Signed-off-by Andrei Ziureaev <[email protected]>--- Makefile.dtc | 1 + dt.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ dt.h | 63 ++++++++++++++++++++ 3 files changed, 222 insertions(+)create mode 100644
dt.c
create mode 100644dt.hMakefile.dtc +1
-0@@ -7,6 +7,7 @@ DTC_SRCS = \ checks.c \ data.c \ + dt.c \ dtc.c \ flattree.c \ fstree.c \dt.c new file +158
-0@@ -0,0 +1,158 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* (C) Copyright Arm Holdings. 2020 +*/ + +#include "dt.h" +#include "dtc.h" + +struct node *dt_root (struct dt_info *dti) +{ +return dti->dt; +} + +struct node *dt_first_child (struct node *node) +{ +return node->children; +} + +struct node *dt_next_sibling (struct node *node) +{ +return node->next_sibling; +} + +struct property *dt_first_property (struct node *node) +{ +return node->proplist; +} + +struct property *dt_next_property (struct property *prop) +{ +return prop->next; +} + +struct marker *dt_first_row (struct property *prop) +{ +return next_type_marker (prop->val.markers); +} + +struct marker *dt_next_row (struct marker *row) +{ +return next_type_marker (row->next); +} + +int dt_row_length (struct property *prop,struct marker *row) +{ +int length_bytes =type_marker_length (row) ? : prop->val.len - row->offset; +return length_bytes /dt_cell_width_bytes (row); +} + +uint64_t dt_uint (struct property *prop,struct marker *row,int col) +{ +int width =dt_cell_width_bytes (row); +const char *p = &dt_string (prop, row)[col * width]; + +switch (width) { +case 2 : +return dtb_ld16 (p); +case 4 : +return dtb_ld32 (p); +case 8 : +return dtb_ld64 (p); +default : +return *(const uint8_t *)p; + } +} + +bool dt_cell_is_phandle (struct property *prop,struct marker *row,int col) +{ +int width =dt_cell_width_bytes (row); +int off = row->offset + col * width; + +if (width !=4 ) +return false; + +return markers_have_type_at_offset (row,REF_PHANDLE , off); +} + +const char *dt_string (struct property *prop,struct marker *row) +{ +return &prop->val.val[row->offset]; +} + +enum dt_type dt_row_type (struct marker *row) +{ +switch (row->type) { +/* fallthrough */ +case TYPE_UINT8 : +case TYPE_UINT16 : +case TYPE_UINT32 : +case TYPE_UINT64 : +return DT_TYPE_UINT ; +case TYPE_STRING : +return DT_TYPE_STRING ; +default : +return DT_TYPE_NONE ; + } +} + +const char *dt_row_type_name (struct marker *row) +{ +switch (dt_row_type (row)) { +case DT_TYPE_UINT : +return "uint" ; +case DT_TYPE_STRING : +return "string" ; +default : +return "none" ; + } +} + +int dt_cell_width_bytes (struct marker *row) +{ +switch (row->type) { +case TYPE_UINT16 : +return 2 ; +case TYPE_UINT32 : +return 4 ; +case TYPE_UINT64 : +return 8 ; +default : +return 1 ; + } +} + +const char *dt_node_name (struct node *node) +{ +return *node->name ? node->name :"/" ; +} + +struct srcpos *dt_node_srcpos (struct node *node) +{ +return node->srcpos; +} + +const char *dt_property_name (struct property *prop) +{ +return prop->name; +} + +struct srcpos *dt_property_srcpos (struct property *prop) +{ +return prop->srcpos; +} + +const char *dt_srcpos_dir (struct srcpos *srcpos) +{ +return srcpos->file->dir; +} + +const char *dt_srcpos_file_name (struct srcpos *srcpos) +{ +return srcpos->file->name; +} + +int dt_srcpos_first_line (struct srcpos *srcpos) +{ +return srcpos->first_line; +}dt.h new file +55
-0@@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef DT_H +#define DT_H + +/* +* (C) Copyright Arm Holdings. 2020 +*/ + +#include <stdint.h> +#include <stdbool.h> + +#include "srcpos.h" + +struct dt_info ; +struct node ; +struct property ; +struct marker ; + +enum dt_type { +DT_TYPE_NONE , +DT_TYPE_UINT , +DT_TYPE_STRING , +}; + +/* Traversal */ +struct node *dt_root (struct dt_info *dti); + +struct node *dt_first_child (struct node *node); +struct node *dt_next_sibling (struct node *node); + +struct property *dt_first_property (struct node *node); +struct property *dt_next_property (struct property *prop); + +/* A property value resembles a matrix (or a table). A marker with data +* type information can represent a row. +* +* So, each property has a linked list of rows. */ +struct marker *dt_first_row (struct property *prop); +struct marker *dt_next_row (struct marker *row); + +/* Accessing data. Each row is an array of cells. */ +int dt_row_length (struct property *prop,struct marker *row); + +uint64_t dt_uint (struct property *prop,struct marker *row,int col); +bool dt_cell_is_phandle (struct property *prop,struct marker *row,int col); +const char *dt_string (struct property *prop,struct marker *row); + +/* Accessing metadata */ +enum dt_type dt_row_type (struct marker *row); +const char *dt_row_type_name (struct marker *row); +int dt_cell_width_bytes (struct marker *row); + +const char *dt_node_name (struct node *node); +struct srcpos *dt_node_srcpos (struct node *node); +
Quoted 8 lines
dt.h line 61
Quoted 6 lines
dt.h new file +6
-0+const char *dt_property_name (struct property *prop); +struct srcpos *dt_property_srcpos (struct property *prop); + +const char *dt_srcpos_dir (struct srcpos *srcpos); +const char *dt_srcpos_file_name (struct srcpos *srcpos); +int dt_srcpos_first_line (struct srcpos *srcpos);How about adding full comments for these functions?
OK, will do.
Quoted 10 lines
Quoted 6 lines
dt.h new file +2
-1+ +#endif /* DT_H */ --2.17.1
Regards,
Simon
RFC PATCH v3 3/4 dtc: Add plugin documentation and examples
In reply to a message not in the archiveDocument the plugin API in Documentation/manual.txt and provide an example plugin.
---
Changes in v3:
- plugins have to implement prototypes
- added license tags to the example
- copied some definitions from dtc-plugin.h to the manual
- better wording
Changes in v2:
- better structure
- information about the data model under "5.2) Exporting Functionality"
- plugins must register with the build system
- the "validate_fn_t" hook can return a status
Documentation/manual.txt | 146 +++++++++++++++++++++++++++++++ plugins/example/Makefile.example | 27 ++++++ plugins/example/example.c | 33 +++++++ 3 files changed, 206 insertions(+) create mode 100644 plugins/example/Makefile.example create mode 100644 plugins/example/example.c
Documentation/manual.txt +146 -0
@@ -10,6 +10,9 @@ I - "dtc", the device tree compiler 4.1) Overview 4.2) Properties 4.3) Labels and References + 5) Plugins + 5.1) Building and Installing + 5.2) Exporting Functionality II - The DT block format 1) Header
@@ -115,6 +118,16 @@ Options: -d <dependency_filename> Generate a dependency file during compilation. + -l, --plugin <plugin name>[,key[,value]] + Load a plugin and, optionally, pass it an argument. + plugin name - the name of the shared object without the extension (can contain a path) + key - the name of the argument + value - the value of the argument (can be omitted) + Example: dtc -l some-plugin,o,out.dts -l some-plugin,help -l another-plugin [...] + + -L, --plugin-dir <arg> + The directory in which to search for plugins + -q Quiet: -q suppress warnings, -qq errors, -qqq all
@@ -272,6 +285,139 @@ And used in properties, labels may appear before or after any value: }; +5) Plugins + +Plugins are shared libraries that DTC loads at runtime using + + dlopen(path, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND) + +RTLD_NOW means they are loaded immediately (right before the parsing +stage). + +RTLD_GLOBAL means their symbols can be used by other plugins. + +RTLD_DEEPBIND means the dynamic linker will look for symbols within the +plugin first, before searching in the main program and other plugins. + +All plugins must include the "dtc-plugin.h" header. + + +5.1) Building and Installing + +Plugins are built and installed using the command "make plugins". + +Suppose your plugin is called "example" and its source code is in +"plugins/example/example.c". To register it with the build system, +create a file "plugins/example/Makefile.example" with the following +line as its contents: + +PLUGIN_LIBS += $(PLUGIN_dir)/example/example.so + +This means "make plugins" will try to build + + plugins/example/example.so + +from + + plugins/example/example.c + +It will also make a symlink + + plugins/example.so + +for convenience. You could then call DTC like this: + + ./dtc -Onull some-file.dts -l plugins/example + +Please, see "plugins/example/Makefile.example" for how to override the +default behavior, add GCC flags, etc. + + +5.2) Exporting Functionality + +- From "dtc-plugin.h": + +``` +/* + * Plugins export functionality by implementing one or more of the + * functions below. DTC tries to call each function exactly once for + * each plugin. + * + * The typedefs are there for conveniently storing pointers to these + * functions. + */ + +/** + * Initialize the plugin. + * + * Called right after the plugin is loaded. + * + * Every plugin must implement this. At the very least, it should + * perform a version check. + * + * @param dtc_ver DTC's plugin API version + * @param argc Length of argv + * @param argv Array of plugin arguments + * @return 0 on success, or 1 on failure + */ +int dtc_init(struct plugin_version dtc_ver, int argc, struct plugin_arg *argv); +typedef int (*dtc_init_fn_t)(struct plugin_version dtc_ver, int argc, + struct plugin_arg *argv); + +/** + * Validate a device tree. + * + * Called after DTC's parsing stage, but before the output stage. + * + * @param dti The unflattened device tree. Implementations can modify + * it and "pass it back" to DTC and to subsequent plugins. + * The header "dt.h" contains functionality for accessing + * "struct dt_info". + * @return 1 on a fatal failure, otherwise 0 + */ +int dtc_validate(struct dt_info *dti); +typedef int (*dtc_validate_fn_t)(struct dt_info *dti); +``` + +- "struct plugin_version" is defined as: + +``` +struct plugin_version { + int major; /* Incompatible changes */ + int minor; /* Compatible changes, such as adding a new field + * to the end of a struct */ +}; +``` + +- A version check can be performed by calling this function: + +``` +/** + * The strictest possible version check. + * + * @param dtc_ver The version passed by DTC + * @return true on success, false on failure + */ +static inline bool dtc_plugin_default_version_check(struct plugin_version dtc_ver) +{ + struct plugin_version plugin_ver = DTC_PLUGIN_API_VERSION; + return dtc_ver.major == plugin_ver.major && dtc_ver.minor == plugin_ver.minor; +} +``` + +- "struct plugin_arg" is defined as: + +``` +struct plugin_arg { + char *key; /* A non-empty string */ + char *value; /* NULL or a non-empty string */ +}; +``` + +Please, see an example of a "dtc_init" implementation in +"plugins/example/example.c". + + II - The DT block format ========================
plugins/example/Makefile.example new file +27 -0
@@ -0,0 +1,27 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Makefile.example +# +# This is not a complete Makefile of itself. Instead, it is designed to +# be easily embeddable into other systems of Makefiles. +# + +# Allow "make plugins" to discover the plugin +PLUGIN_LIBS += $(PLUGIN_dir)/example/example.$(SHAREDLIB_EXT) + +# Add GCC flags: +# PLUGIN_CFLAGS_example = -some-flag + +# Add libraries: +# PLUGIN_LDLIBS_example = -lsome-lib + +# Add files to clean: +# PLUGIN_CLEANFILES += $(PLUGIN_dir)/example/*.tmp + +# Override the default rules: +# $(PLUGIN_dir)/example/example.$(SHAREDLIB_EXT): $(PLUGIN_dir)/example/example.o +# @$(VECHO) LD $@ +# ... +# +# $(PLUGIN_dir)/example/example.o: $(PLUGIN_dir)/example/example.c +# @$(VECHO) CC $@ +# ...
plugins/example/example.c new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* (C) Copyright Arm Holdings. 2020 +*/ + +#include <stdio.h> +#include <string.h> + +#include "dtc-plugin.h" + +#define NAME "example: " + +int dtc_init (struct plugin_version dtc_ver,int argc,struct plugin_arg *argv) +{ +if (!dtc_plugin_default_version_check (dtc_ver)) { +fprintf (stderr,NAME "Plugin is incompatible with this version of DTC\n" ); +return 1 ; + } + +for (int i =0 ; i < argc; i++) { +if (strcmp (argv[i].key,"h" ) ==0 + ||strcmp (argv[i].key,"help" ) ==0 ) { +printf (NAME "This is an example plugin. It prints its arguments.\n" ); +return 1 ; + }else { +printf (NAME "%s: %s\n" , argv[i].key, + argv[i].value ? argv[i].value :"" ); + } + } + +printf (NAME "Loaded plugin 'example'\n" ); +return 0 ; +}
Signature · 1 line
2.17.1
RFC PATCH v3 4/4 dtc: Add a plugin interface
In reply to a message not in the archiveAdd support for building and loading plugins.
A plugin interface makes it possible to add checks in any language. It also allows these checks to print dts source line information.
---
Changes in v3:
- plugins have to implement prototypes
- better wording of comments and messages
Changes in v2:
- describe the data model in dtc-plugin.h
- plugins must register with the build system
- the "validate_fn_t" hook can return a status
- specify that minor versions are compatible
- check if plugin_dir is NULL, just in case
- better variable names in register_plugin_info
Makefile | 29 ++++++++++- dtc-plugin.h | 76 +++++++++++++++++++++++++++ dtc.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++- dtc.h | 46 +++++++++++++++++ 4 files changed, 291 insertions(+), 2 deletions(-) create mode 100644 dtc-plugin.h
Makefile +28 -1
@@ -25,6 +25,8 @@ WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) +LDLIBS_dtc += -ldl -export-dynamic + BISON = bison LEX = flex SWIG = swig
@@ -66,14 +68,17 @@ ifeq ($(HOSTOS),darwin) SHAREDLIB_EXT = dylib SHAREDLIB_CFLAGS = -fPIC SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl, +PLUGIN_ldflags = -fPIC -dynamiclib else ifeq ($(HOSTOS),$(filter $(HOSTOS),msys cygwin)) SHAREDLIB_EXT = so SHAREDLIB_CFLAGS = SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, +PLUGIN_ldflags = -shared else SHAREDLIB_EXT = so SHAREDLIB_CFLAGS = -fPIC SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, +PLUGIN_ldflags = -fPIC -shared endif #
@@ -187,7 +192,29 @@ ifneq ($(MAKECMDGOALS),libfdt) endif endif +# +# Rules for plugins +# +PLUGIN_dir = plugins +PLUGIN_CLEANFILES += $(PLUGIN_dir)/*.$(SHAREDLIB_EXT) +PLUGIN_CLEANFILES += $(addprefix $(PLUGIN_dir)/*/,*.o *.$(SHAREDLIB_EXT)) + +include $(wildcard $(PLUGIN_dir)/*/Makefile.*) + +plugins: $(PLUGIN_LIBS) + +$(PLUGIN_dir)/%.$(SHAREDLIB_EXT): $(PLUGIN_dir)/%.o + @$(VECHO) LD $@ + $(LINK.c) $(PLUGIN_ldflags) -o $@ $< $(PLUGIN_LDLIBS_$(notdir $*)) + ln -sf $(patsubst $(PLUGIN_dir)/%,%,$@) $(PLUGIN_dir)/$(notdir $@) + +$(PLUGIN_dir)/%.o: $(PLUGIN_dir)/%.c + @$(VECHO) CC $@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(PLUGIN_CFLAGS_$(notdir $*)) -o $@ -c $< +plugins_clean: + @$(VECHO) CLEAN "(plugins)" + rm -f $(PLUGIN_CLEANFILES) # # Rules for libfdt
@@ -331,7 +358,7 @@ endif STD_CLEANFILES = *~ *.o *.$(SHAREDLIB_EXT) *.d *.a *.i *.s core a.out vgcore.* \ *.tab.[ch] *.lex.c *.output -clean: libfdt_clean pylibfdt_clean tests_clean +clean: libfdt_clean pylibfdt_clean tests_clean plugins_clean @$(VECHO) CLEAN rm -f $(STD_CLEANFILES) rm -f $(VERSION_FILE)
dtc-plugin.h new file +76 -0
76 lines not on this page · raw message
dtc.c +141 -1
201 lines not on this page · raw message
dtc.h +46 -0
56 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 4 lines · Andrei Ziureaev
I added a simple live tree API. There's no longer a need to move any definitions. The live tree struct is hidden from plugins, so it's not an ABI. The API doesn't allow plugins to modify the live tree yet, but that will probably change later.
Hrm. So. Before we get into any of the details of implementation, I think we need to be clear on what it means to expose the "live tree". The live tree in dtc was never designed to be an exposed structure, so we need to think about that carefully before we do expose it, because we now have to consider stability of it across releases which we never did before.
AFAICT the fact the tree is "live" (i.e. a pointer-based random access representation) isn't really the relevant point here. We could easily enough serialize/deserialize the tree to get it into plugins, using whatever format - and dtb is the obvious one.
What you're really after here is access to some of the internal metadata that dtc maintains about the tree: line numbers at least, possibly other things.
I think we really need to pin down *what* parts of this information we need to expose to the plugins. The data model for the information that's going back and forth is more important than exactly how we encode the data across the boundary.
Quoted 66 lines
I also removed the
EXPORT_FUNCTIONmacro. Plugins now have to implement certain prototypes, defined indtc-plugin.h. This allows plugins to be generated by tools.
===========This is one possible implementation of a plugin interface for DTC.
A plugin interface would allow us to add checks in languages other than C. Specifically, it would allow DTC and DT Schema (which is written in Python) to be integrated.
It would also allow for better debugging of dts files. For example, DT Schema would be able to print dts source line information, without us having to add source line annotations to yaml files.
In the future, plugins will be allowed to modify the live tree and pass it back for further processing, but the API doesn't support that yet.
There's a question of whether we should relicense some headers to dual BSD to be able call Python code.
Any thoughts would be much appreciated.
Thanks,
Andrei.Changes in v3:
- live tree API (dt.handdt.c)
- additional functionality indtc.h
- plugins have to implement prototypes
- improved documentationChanges in v2:
- improved documentation
- plugins must register with the build system
- the "validate_fn_t" hook can return a status
- define "structreserve_info" in "dtc-plugin.h"
- specify that minor versions are compatible
- check ifplugin_diris NULL, just in case
- better variable names inregister_plugin_infoAndrei Ziureaev (4):
dtc: Add marker type functionality todtc.h
dtc: Add a live tree API
dtc: Add plugin documentation and examples
dtc: Add a plugin interfaceDocumentation/manual.txt | 146 ++++++++++++++++++++++++++++ Makefile | 29 +++++- Makefile.dtc | 1 + dt.c | 158 +++++++++++++++++++++++++++++++ dt.h | 63 ++++++++++++ dtc-plugin.h | 76 +++++++++++++++ dtc.c | 142 ++++++++++++++++++++++++++- dtc.h | 57 +++++++++++ plugins/example/Makefile.example | 27 ++++++ plugins/example/example.c | 33 +++++++ treesource.c | 8 +- 11 files changed, 734 insertions(+), 6 deletions(-) create mode 100644 dt.c create mode 100644 dt.h create mode 100644 dtc-plugin.h create mode 100644 plugins/example/Makefile.example create mode 100644 plugins/example/example.c
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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 6 lines · David Gibson
Quoted 4 lines · Andrei Ziureaev
I added a simple live tree API. There's no longer a need to move any definitions. The live tree struct is hidden from plugins, so it's not an ABI. The API doesn't allow plugins to modify the live tree yet, but that will probably change later.
Quoted 6 lines
Hrm. So. Before we get into any of the details of implementation, I think we need to be clear on what it means to expose the "live tree". The live tree in dtc was never designed to be an exposed structure, so we need to think about that carefully before we do expose it, because we now have to consider stability of it across releases which we never did before.
Thanks for the comments.
Unlike in previous versions, in this version I'm passing opaque pointers between DTC and the plugins. So,
"struct dt_info" and all the other related structs are not an ABI, but the new live tree "library" is. The signatures in "dt.h" need to be designed carefully.
Quoted 5 lines
AFAICT the fact the tree is "live" (i.e. a pointer-based random access representation) isn't really the relevant point here. We could easily enough serialize/deserialize the tree to get it into plugins, using whatever format - and dtb is the obvious one.
Yes, we could use any format, such as dtb, yaml or json, but there should be access to line numbers and it should be fast.
Quoted 9 lines
What you're really after here is access to some of the internal metadata that dtc maintains about the tree: line numbers at least, possibly other things.
I think we really need to pin down *what* parts of this information we need to expose to the plugins. The data model for the information that's going back and forth is more important than exactly how we encode the data across the boundary.
The way I came up with this live tree API is I looked at Rob's code that converts the tree to Python structures and calls DT Schema
(https://github.com/robherring/dtc/blob/lib-plugin/yamlchecks.c),
and I tried to see what data it needs to access. Turns out, it needs read-only access to at least:
- the file name, line number, node name and property name
- the value of the property (strings and ints)
- if the value is an int, its width and whether it's a phandle
So those are the functions I defined in "dt.h". I've added some docs to them, so I should probably send a v4 soon.
Quoted 68 lines
Quoted 67 lines
I also removed the
EXPORT_FUNCTIONmacro. Plugins now have to implement certain prototypes, defined indtc-plugin.h. This allows plugins to be generated by tools.
===========This is one possible implementation of a plugin interface for DTC.
A plugin interface would allow us to add checks in languages other than C. Specifically, it would allow DTC and DT Schema (which is written in Python) to be integrated.
It would also allow for better debugging of dts files. For example, DT Schema would be able to print dts source line information, without us having to add source line annotations to yaml files.
In the future, plugins will be allowed to modify the live tree and pass it back for further processing, but the API doesn't support that yet.
There's a question of whether we should relicense some headers to dual BSD to be able call Python code.
Any thoughts would be much appreciated.
Thanks,
Andrei.Changes in v3:
- live tree API (dt.handdt.c)
- additional functionality indtc.h
- plugins have to implement prototypes
- improved documentationChanges in v2:
- improved documentation
- plugins must register with the build system
- the "validate_fn_t" hook can return a status
- define "structreserve_info" in "dtc-plugin.h"
- specify that minor versions are compatible
- check ifplugin_diris NULL, just in case
- better variable names inregister_plugin_infoAndrei Ziureaev (4):
dtc: Add marker type functionality todtc.h
dtc: Add a live tree API
dtc: Add plugin documentation and examples
dtc: Add a plugin interfaceDocumentation/manual.txt | 146 ++++++++++++++++++++++++++++ Makefile | 29 +++++- Makefile.dtc | 1 + dt.c | 158 +++++++++++++++++++++++++++++++ dt.h | 63 ++++++++++++ dtc-plugin.h | 76 +++++++++++++++ dtc.c | 142 ++++++++++++++++++++++++++- dtc.h | 57 +++++++++++ plugins/example/Makefile.example | 27 ++++++ plugins/example/example.c | 33 +++++++ treesource.c | 8 +- 11 files changed, 734 insertions(+), 6 deletions(-)create mode 100644
dt.c
create mode 100644dt.h
create mode 100644dtc-plugin.h
create mode 100644 plugins/example/Makefile.example create mode 100644plugins/example/example.c