|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 05/12] xen/arm: add support for cache coloring configuration via device-tree
This commit adds the "colors" Device Tree attribute that can be used for
DomUs and Dom0less color configurations. The syntax is the same used
for every color config.
Signed-off-by: Carlo Nonato <carlo.nonato@xxxxxxxxxxxxxxx>
Signed-off-by: Marco Solieri <marco.solieri@xxxxxxxxxxxxxxx>
---
docs/misc/arm/cache-coloring.rst | 45 +++++++++++++++++++++++++++
docs/misc/arm/device-tree/booting.txt | 4 +++
xen/arch/arm/coloring.c | 17 ++++++++++
xen/arch/arm/domain_build.c | 9 ++++++
xen/arch/arm/include/asm/coloring.h | 3 ++
5 files changed, 78 insertions(+)
diff --git a/docs/misc/arm/cache-coloring.rst b/docs/misc/arm/cache-coloring.rst
index 345d97cb56..763acd2d3f 100644
--- a/docs/misc/arm/cache-coloring.rst
+++ b/docs/misc/arm/cache-coloring.rst
@@ -111,5 +111,50 @@ LLC way size (as previously discussed) and Dom0 colors can
be set using the
appropriate command line parameters. See the relevant documentation in
"docs/misc/xen-command-line.pandoc".
+DomUs colors can be set either in the xl configuration file (relative
+documentation at "docs/man/xl.cfg.pod.5.in") or via Device Tree, also for
+Dom0less configurations, as in the following example:
+
+.. raw:: html
+
+ <pre>
+ xen,xen-bootargs = "console=dtuart dtuart=serial0 dom0_mem=1G
dom0_max_vcpus=1 sched=null llc-way-size=64K xen-colors=0-1 dom0-colors=2-6";
+ xen,dom0-bootargs "console=hvc0 earlycon=xen earlyprintk=xen
root=/dev/ram0"
+
+ dom0 {
+ compatible = "xen,linux-zimage" "xen,multiboot-module";
+ reg = <0x0 0x1000000 0x0 15858176>;
+ };
+
+ dom0-ramdisk {
+ compatible = "xen,linux-initrd" "xen,multiboot-module";
+ reg = <0x0 0x2000000 0x0 20638062>;
+ };
+
+ domU0 {
+ #address-cells = <0x1>;
+ #size-cells = <0x1>;
+ compatible = "xen,domain";
+ memory = <0x0 0x40000>;
+ colors = "4-8,10,11,12";
+ cpus = <0x1>;
+ vpl011 = <0x1>;
+
+ module@2000000 {
+ compatible = "multiboot,kernel", "multiboot,module";
+ reg = <0x2000000 0xffffff>;
+ bootargs = "console=ttyAMA0";
+ };
+
+ module@30000000 {
+ compatible = "multiboot,ramdisk", "multiboot,module";
+ reg = <0x3000000 0xffffff>;
+ };
+ };
+ </pre>
+
+Please refer to the relative documentation in
+"docs/misc/arm/device-tree/booting.txt".
+
Note that if no color configuration is provided for domains, they fallback to
the default one, which corresponds simply to all available colors.
\ No newline at end of file
diff --git a/docs/misc/arm/device-tree/booting.txt
b/docs/misc/arm/device-tree/booting.txt
index 98253414b8..82e8dd89c8 100644
--- a/docs/misc/arm/device-tree/booting.txt
+++ b/docs/misc/arm/device-tree/booting.txt
@@ -162,6 +162,10 @@ with the following properties:
An integer specifying the number of vcpus to allocate to the guest.
+- colors
+ A string specifying the color configuration for the guest. Refer to
+ "docs/misc/arm/cache_coloring.rst" for syntax.
+
- vpl011
An empty property to enable/disable a virtual pl011 for the guest to
diff --git a/xen/arch/arm/coloring.c b/xen/arch/arm/coloring.c
index 40a07617cc..87e20b952e 100644
--- a/xen/arch/arm/coloring.c
+++ b/xen/arch/arm/coloring.c
@@ -252,8 +252,11 @@ int domain_coloring_init(struct domain *d,
if ( config->from_guest )
copy_from_guest(d->arch.colors, config->colors,
config->num_colors);
else
+ {
memcpy(d->arch.colors, config->colors.p,
sizeof(unsigned int) * config->num_colors);
+ xfree(config->colors.p);
+ }
}
if ( !d->arch.colors )
@@ -283,6 +286,20 @@ void domain_dump_coloring_info(struct domain *d)
print_colors(d->arch.colors, d->arch.num_colors);
}
+void prepare_color_domain_config(struct xen_arch_domainconfig *config,
+ const char *colors_str)
+{
+ unsigned int num;
+
+ config->colors.p = xzalloc_array(unsigned int, max_colors);
+ if ( !config->colors.p )
+ panic("Unable to allocate cache colors\n");
+
+ if ( parse_color_config(colors_str, config->colors.p, &num) )
+ panic("Error parsing the color configuration\n");
+ config->num_colors = (uint16_t)num;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 4d4cb692fc..979b9c8906 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -34,6 +34,7 @@
#include <xen/serial.h>
#ifdef CONFIG_CACHE_COLORING
+#include <asm/coloring.h>
#define XEN_DOM0_CREATE_FLAGS CDF_privileged
#else
#define XEN_DOM0_CREATE_FLAGS CDF_privileged | CDF_directmap
@@ -3275,6 +3276,7 @@ void __init create_domUs(void)
struct dt_device_node *node;
const struct dt_device_node *cpupool_node,
*chosen = dt_find_node_by_path("/chosen");
+ const char * __maybe_unused colors_str;
BUG_ON(chosen == NULL);
dt_for_each_child_node(chosen, node)
@@ -3354,6 +3356,13 @@ void __init create_domUs(void)
d_cfg.cpupool_id = pool_id;
}
+#ifdef CONFIG_CACHE_COLORING
+ if ( dt_find_property(node, "xen,static-mem", NULL) )
+ panic("static-mem is not valid when cache coloring is enabled\n");
+ if ( !dt_property_read_string(node, "colors", &colors_str) )
+ prepare_color_domain_config(&d_cfg.arch, colors_str);
+#endif
+
/*
* The variable max_init_domid is initialized with zero, so here it's
* very important to use the pre-increment operator to call
diff --git a/xen/arch/arm/include/asm/coloring.h
b/xen/arch/arm/include/asm/coloring.h
index 967031ae04..b7fa323870 100644
--- a/xen/arch/arm/include/asm/coloring.h
+++ b/xen/arch/arm/include/asm/coloring.h
@@ -36,4 +36,7 @@ int domain_coloring_init(struct domain *d,
void domain_coloring_free(struct domain *d);
void domain_dump_coloring_info(struct domain *d);
+void prepare_color_domain_config(struct xen_arch_domainconfig *config,
+ const char *colors_str);
+
#endif /* !__ASM_ARM_COLORING_H__ */
--
2.34.1
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |