power: fix environment detection
authorAnatoly Burakov <anatoly.burakov@intel.com>
Tue, 14 Jul 2020 10:30:01 +0000 (11:30 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 21 Jul 2020 23:35:39 +0000 (01:35 +0200)
Anything coming from sysfs has a newline at the end. Cut it off before
comparing the strings.

Fixes: 20ab67608a39 ("power: add environment capability probing")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
Tested-by: Lihong Ma <lihongx.ma@intel.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
lib/librte_power/power_common.c

index 59023d9..67e3318 100644 (file)
@@ -17,6 +17,7 @@ cpufreq_check_scaling_driver(const char *driver_name)
        unsigned int lcore_id = 0; /* always check core 0 */
        char fullpath[PATH_MAX];
        char readbuf[PATH_MAX];
+       size_t end_idx;
        char *s;
        FILE *f;
 
@@ -39,6 +40,13 @@ cpufreq_check_scaling_driver(const char *driver_name)
        if (s == NULL)
                return 0;
 
+       /* when read from sysfs, driver name has an extra newline at the end */
+       end_idx = strnlen(readbuf, sizeof(readbuf));
+       if (end_idx > 0 && readbuf[end_idx - 1] == '\n') {
+               end_idx--;
+               readbuf[end_idx] = '\0';
+       }
+
        /* does the driver name match? */
        if (strncmp(readbuf, driver_name, sizeof(readbuf)) != 0)
                return 0;