ftrace2bconf.sh writes the CPU mask without quotes. For a mask selecting
CPUs 0 and 32, the output is:
ftrace.cpumask = 00000001,00000001
Bootconfig reads the two comma-separated words as separate array values.
When bconf2ftrace.sh applies the saved settings, it writes those values
on separate lines instead of restoring the original CPU mask.
Quote the mask so the commas remain part of a single value.
Fixes: 2b86062a34a8 ("tools/bootconfig: Add a script to generates bootconfig
from ftrace")
Signed-off-by: Eduardo Mucelli Rezende Oliveira <[email protected]>
---
This is my first kernel contribution, so I'd appreciate any feedback.
Tested with the exporter, bootconfig parser and generated replay commands
using tracefs fixtures for 00000001,00000001, 0f,ffffffff and 1.
The masks containing commas fail before the fix and pass afterwards;
the single-word mask passes in both cases.
tools/bootconfig/scripts/ftrace2bconf.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh
b/tools/bootconfig/scripts/ftrace2bconf.sh
index 8eed445c2..f8f288f90 100755
--- a/tools/bootconfig/scripts/ftrace2bconf.sh
+++ b/tools/bootconfig/scripts/ftrace2bconf.sh
@@ -238,7 +238,7 @@ instance_options() { # [instance-name]
fi
val=`cat $INSTANCE/tracing_cpumask`
if [ `echo $val | sed -e s/f//g`x != x ]; then
- emit_kv $PREFIX.cpumask = $val
+ emit_kv $PREFIX.cpumask = "\"$val\""
fi
val=`cat $INSTANCE/tracing_on`
if [ "$val" = "0" ]; then
base-commit: c03c1a14507dfaf8b856c2608f9ac216021fc222
--
2.53.0
